psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lockscreen Colors: add back Weather color options [2/2]

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
SuperDroidBond
2020-10-13 23:46:25 +05:30
committed by Hưng Phan
parent 7f3e49bcd8
commit de292e0788
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/lock_colors.xml
View File

@@ -48,7 +48,7 @@
android:key="lockscreen_indication_text_color" android:key="lockscreen_indication_text_color"
android:title="@string/lockscreen_indication_text_color" android:title="@string/lockscreen_indication_text_color"
android:defaultValue="0xffffffff" /> android:defaultValue="0xffffffff" />
<!--
<net.margaritov.preference.colorpicker.ColorPickerPreference <net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="lockscreen_weather_temp_color" android:key="lockscreen_weather_temp_color"
android:title="@string/lockscreen_weather_temp_color" android:title="@string/lockscreen_weather_temp_color"
@@ -63,7 +63,7 @@
android:key="lockscreen_weather_icon_color" android:key="lockscreen_weather_icon_color"
android:title="@string/lockscreen_weather_icon_color" android:title="@string/lockscreen_weather_icon_color"
android:defaultValue="0xffffffff" /> android:defaultValue="0xffffffff" />
-->
</PreferenceScreen> </PreferenceScreen>

23
src/com/cherish/settings/fragments/LockColors.java
View File

@@ -54,9 +54,9 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
private static final String LOCKSCREEN_CLOCK_COLOR = "lockscreen_clock_color"; private static final String LOCKSCREEN_CLOCK_COLOR = "lockscreen_clock_color";
private static final String LOCKSCREEN_CLOCK_DATE_COLOR = "lockscreen_clock_date_color"; private static final String LOCKSCREEN_CLOCK_DATE_COLOR = "lockscreen_clock_date_color";
private static final String LOCKSCREEN_OWNER_INFO_COLOR = "lockscreen_owner_info_color"; private static final String LOCKSCREEN_OWNER_INFO_COLOR = "lockscreen_owner_info_color";
/* private static final String LOCKSCREEN_WEATHER_TEMP_COLOR = "lockscreen_weather_temp_color"; private static final String LOCKSCREEN_WEATHER_TEMP_COLOR = "lockscreen_weather_temp_color";
private static final String LOCKSCREEN_WEATHER_CITY_COLOR = "lockscreen_weather_city_color"; private static final String LOCKSCREEN_WEATHER_CITY_COLOR = "lockscreen_weather_city_color";
private static final String LOCKSCREEN_WEATHER_ICON_COLOR = "lockscreen_weather_icon_color";*/ private static final String LOCKSCREEN_WEATHER_ICON_COLOR = "lockscreen_weather_icon_color";
static final int DEFAULT = 0xffffffff; static final int DEFAULT = 0xffffffff;
static final int TRANSPARENT = 0x99FFFFFF; static final int TRANSPARENT = 0x99FFFFFF;
@@ -69,9 +69,9 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
private ColorPickerPreference mLockscreenClockColorPicker; private ColorPickerPreference mLockscreenClockColorPicker;
private ColorPickerPreference mLockscreenClockDateColorPicker; private ColorPickerPreference mLockscreenClockDateColorPicker;
private ColorPickerPreference mLockscreenOwnerInfoColorPicker; private ColorPickerPreference mLockscreenOwnerInfoColorPicker;
/*private ColorPickerPreference mWeatherRightTextColorPicker; private ColorPickerPreference mWeatherRightTextColorPicker;
private ColorPickerPreference mWeatherLeftTextColorPicker; private ColorPickerPreference mWeatherLeftTextColorPicker;
private ColorPickerPreference mWeatherIconColorPicker;*/ private ColorPickerPreference mWeatherIconColorPicker;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -132,7 +132,7 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
hexColor = String.format("#%08x", (0xffffffff & intColor)); hexColor = String.format("#%08x", (0xffffffff & intColor));
mLockscreenOwnerInfoColorPicker.setSummary(hexColor); mLockscreenOwnerInfoColorPicker.setSummary(hexColor);
mLockscreenOwnerInfoColorPicker.setNewPreviewColor(intColor); mLockscreenOwnerInfoColorPicker.setNewPreviewColor(intColor);
/*
mWeatherRightTextColorPicker = (ColorPickerPreference) findPreference(LOCKSCREEN_WEATHER_TEMP_COLOR); mWeatherRightTextColorPicker = (ColorPickerPreference) findPreference(LOCKSCREEN_WEATHER_TEMP_COLOR);
mWeatherRightTextColorPicker.setOnPreferenceChangeListener(this); mWeatherRightTextColorPicker.setOnPreferenceChangeListener(this);
intColor = Settings.System.getInt(getContentResolver(), intColor = Settings.System.getInt(getContentResolver(),
@@ -156,7 +156,7 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
hexColor = String.format("#%08x", (0x99FFFFFF & intColor)); hexColor = String.format("#%08x", (0x99FFFFFF & intColor));
mWeatherIconColorPicker.setSummary(hexColor); mWeatherIconColorPicker.setSummary(hexColor);
mWeatherIconColorPicker.setNewPreviewColor(intColor); mWeatherIconColorPicker.setNewPreviewColor(intColor);
*/
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@@ -210,7 +210,7 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(), Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
Settings.System.LOCKSCREEN_OWNER_INFO_COLOR, intHex); Settings.System.LOCKSCREEN_OWNER_INFO_COLOR, intHex);
return true; return true;
/* } else if (preference == mWeatherRightTextColorPicker) { } else if (preference == mWeatherRightTextColorPicker) {
String hex = ColorPickerPreference.convertToARGB( String hex = ColorPickerPreference.convertToARGB(
Integer.valueOf(String.valueOf(newValue))); Integer.valueOf(String.valueOf(newValue)));
preference.setSummary(hex); preference.setSummary(hex);
@@ -233,7 +233,7 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
int intHex = ColorPickerPreference.convertToColorInt(hex); int intHex = ColorPickerPreference.convertToColorInt(hex);
Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(), Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
Settings.System.LOCK_SCREEN_WEATHER_ICON_COLOR, intHex); Settings.System.LOCK_SCREEN_WEATHER_ICON_COLOR, intHex);
return true;*/ return true;
} }
return false; return false;
} }
@@ -295,7 +295,7 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
Settings.System.LOCKSCREEN_OWNER_INFO_COLOR, DEFAULT); Settings.System.LOCKSCREEN_OWNER_INFO_COLOR, DEFAULT);
mLockscreenOwnerInfoColorPicker.setNewPreviewColor(DEFAULT); mLockscreenOwnerInfoColorPicker.setNewPreviewColor(DEFAULT);
mLockscreenOwnerInfoColorPicker.setSummary(R.string.default_string); mLockscreenOwnerInfoColorPicker.setSummary(R.string.default_string);
/*Settings.System.putInt(getContentResolver(), Settings.System.putInt(getContentResolver(),
Settings.System.LOCK_SCREEN_WEATHER_TEMP_COLOR, DEFAULT); Settings.System.LOCK_SCREEN_WEATHER_TEMP_COLOR, DEFAULT);
mWeatherRightTextColorPicker.setNewPreviewColor(DEFAULT); mWeatherRightTextColorPicker.setNewPreviewColor(DEFAULT);
mWeatherRightTextColorPicker.setSummary(R.string.default_string); mWeatherRightTextColorPicker.setSummary(R.string.default_string);
@@ -306,7 +306,7 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
Settings.System.putInt(getContentResolver(), Settings.System.putInt(getContentResolver(),
Settings.System.LOCK_SCREEN_WEATHER_ICON_COLOR, DEFAULT); Settings.System.LOCK_SCREEN_WEATHER_ICON_COLOR, DEFAULT);
mWeatherIconColorPicker.setNewPreviewColor(DEFAULT); mWeatherIconColorPicker.setNewPreviewColor(DEFAULT);
mWeatherIconColorPicker.setSummary(R.string.default_string);*/ mWeatherIconColorPicker.setSummary(R.string.default_string);
} }
@Override @Override
@@ -319,6 +319,3 @@ public class LockColors extends SettingsPreferenceFragment implements Preference
return MetricsProto.MetricsEvent.CHERISH_SETTINGS; return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
} }
} }