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

Cherish: Cleanup RGB Gradient Picker

Browse Source 
Revert "Cherish:Introduce RGB Gradient Picker [2/2]"

This reverts commit b6057bf285.

Revert "Cherish: Introduce RGB Accenter [2/2]"

This reverts commit 22b278cc53.

Revert "Revert "Cherish:Add a toggle for the new QS tint [2/2]""

This reverts commit f1acece8c1.
This commit is contained in:
Hưng Phan
2020-05-29 21:45:42 +07:00
committed by Hung Phan
parent 316e1eda31
commit fb845ece3b
6 changed files with 12 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values-vi/cherish_strings.xml
View File

@@ -239,14 +239,6 @@
<string name="theme_type_du_pitchblack">Đen tuyền</string>
<string name="theme_type_dark_grey">Màu xám đen</string>
<string name="theme_type_material_ocean">Material Ocean</string>
<!-- RGB Accenter -->
<string name="theme_rgb_title">Màu nhấn RGB| Chủ đề Gradient</string>
<string name="themes_hub_title">Chủ đề</string>
<string name="themes_hub_summary">Chủ đề màu nhấn Gradients</string>
<string name="accent_color">Chọn màu nhấn</string>
<string name="accent_summary">Tự làm Gradient</string>
<string name="gradient_color">Chọn Gradient</string>
<string name="gradient_summary">Làm hiệu ứng Gradient</string>
<!-- Power menu and dialogs opacity -->
<string name="lockscreen_secure_power_title">Menu nguồn an toàn</string>
<string name="lockscreen_secure_power_menu_title">Khóa menu nguồn</string>

9
res/values/cherish_strings.xml
View File

@@ -272,15 +272,6 @@
<string name="theme_type_dark_grey">Dark Grey</string>
<string name="theme_type_material_ocean">Material Ocean</string>
<!-- RGB Accenter -->
<string name="theme_rgb_title">RGB Accent | Gradient Theming</string>
<string name="themes_hub_title">Themes</string>
<string name="themes_hub_summary">Accents-Gradients-Themes</string>
<string name="accent_color">Accent picker</string>
<string name="accent_summary">Gradient Maker</string>
<string name="gradient_color">Gradient picker</string>
<string name="gradient_summary">Gradient effect maker</string>
<!-- Power menu and dialogs opacity -->
<string name="lockscreen_secure_power_title">Secure power menu</string>
<string name="lockscreen_secure_power_menu_title">Secure power menu</string>

10
res/xml/cherish_settings_gaming_mode.xml
View File

@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<preferencesScreen
<PreferencesScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/gaming_mode_title">
@@ -59,15 +59,15 @@
android:summary="@string/gaming_mode_dynamic_summary"
android:defaultValue="false" />
<preferencesCategory
<PreferenceCategory
android:title="@string/gaming_mode_app_picker_title"
android:key="gamingmode_applications">
<preferences
<Preference
android:key="add_gamingmode_packages"
android:icon="@drawable/ic_menu_add_white"
android:title="@string/add_gaming_mode_package_title" />
</preferencesCategory>
</PreferenceCategory>
</preferencesScreen>
</PreferencesScreen>

7
res/xml/cherish_settings_quicksettings.xml
View File

@@ -20,6 +20,13 @@
<PreferenceCategory
android:title="@string/qs_category">
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="qs_panel_bg_use_new_tint"
android:icon="@drawable/ic_accent_picker"
android:title="@string/qs_bg_use_new_tint"
android:summary="@string/qs_bg_use_new_tint_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="qs_blur"

22
res/xml/cherish_settings_theme.xml
View File

@@ -42,28 +42,6 @@
android:entryValues="@array/switch_style_values" />
</PreferenceCategory>
<PreferenceCategory
android:key="system_rgb_category"
android:title="@string/theme_rgb_title">
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="accent_color"
android:icon="@drawable/ic_accent_picker"
android:title="@string/accent_color"
android:summary="@string/accent_summary"
android:defaultValue="0xffffff"
android:persistent="false" />
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="gradient_color"
android:icon="@drawable/ic_accent_picker"
android:title="@string/gradient_color"
android:summary="@string/gradient_summary"
android:defaultValue="0xffffff"
android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory
android:key="rounded_corners_category"

48
src/com/cherish/settings/fragments/ThemeSettings.java
View File

@@ -44,18 +44,12 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
OnPreferenceChangeListener {
private static final String PREF_THEME_SWITCH = "theme_switch";
private static final String ACCENT_COLOR = "accent_color";
private static final String ACCENT_COLOR_PROP = "persist.sys.theme.accentcolor";
private static final String GRADIENT_COLOR = "gradient_color";
private static final String GRADIENT_COLOR_PROP = "persist.sys.theme.gradientcolor";
private static final String SYSUI_ROUNDED_SIZE = "sysui_rounded_size";
private static final String SYSUI_ROUNDED_CONTENT_PADDING = "sysui_rounded_content_padding";
private static final String SYSUI_STATUS_BAR_PADDING = "sysui_status_bar_padding";
private static final String SYSUI_ROUNDED_FWVALS = "sysui_rounded_fwvals";
private static final String SWITCH_STYLE = "switch_style";
private ColorPickerPreference mThemeColor;
private ColorPickerPreference mGradientColor;
private UiModeManager mUiModeManager;
private IOverlayManager mOverlayService;
private ListPreference mThemeSwitch;
@@ -128,8 +122,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
mUiModeManager = getContext().getSystemService(UiModeManager.class);
setupThemeSwitchPref();
setupAccentPref();
setupGradientPref();
}
@Override
@@ -204,26 +196,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
break;
}
try {
mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
} catch (RemoteException ignored) {
}
}else if (preference == mThemeColor) {
int color = (Integer) objValue;
String hexColor = String.format("%08X", (0xFFFFFFFF & color));
SystemProperties.set(ACCENT_COLOR_PROP, hexColor);
try {
mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
} catch (RemoteException ignored) {
}
} else if (preference == mGradientColor) {
int color = (Integer) objValue;
String hexColor = String.format("%08X", (0xFFFFFFFF & color));
SystemProperties.set(GRADIENT_COLOR_PROP, hexColor);
try {
mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
@@ -286,26 +258,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
}
}
}
private void setupAccentPref() {
mThemeColor = (ColorPickerPreference) findPreference(ACCENT_COLOR);
String colorVal = SystemProperties.get(ACCENT_COLOR_PROP, "-1");
int color = "-1".equals(colorVal)
? Color.WHITE
: Color.parseColor("#" + colorVal);
mThemeColor.setNewPreviewColor(color);
mThemeColor.setOnPreferenceChangeListener(this);
}
private void setupGradientPref() {
mGradientColor = (ColorPickerPreference) findPreference(GRADIENT_COLOR);
String colorVal = SystemProperties.get(GRADIENT_COLOR_PROP, "-1");
int color = "-1".equals(colorVal)
? Color.WHITE
: Color.parseColor("#" + colorVal);
mGradientColor.setNewPreviewColor(color);
mGradientColor.setOnPreferenceChangeListener(this);
}
private void restoreCorners() {
Resources res = null;