From 0979fe036fb57815181f677c5165fc37b91fe6c5 Mon Sep 17 00:00:00 2001 From: spezi77 Date: Sun, 1 Aug 2021 21:13:16 +0900 Subject: [PATCH] Cherish: Rounded corners: Cleanup and improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix reset corner radius to default fw value * Remove commented code for Content Padding, which is not going to happen in A11 Signed-off-by: Hưng Phan --- res/xml/cherish_settings_misc.xml | 9 --------- .../settings/fragments/MiscSettings.java | 17 ----------------- 2 files changed, 26 deletions(-) diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml index 03e108e..8002e1d 100644 --- a/res/xml/cherish_settings_misc.xml +++ b/res/xml/cherish_settings_misc.xml @@ -183,15 +183,6 @@ android:defaultValue="5" settings:units="dp" android:persistent="false" /> - - diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java index bbe0b0d..9a0433a 100644 --- a/src/com/cherish/settings/fragments/MiscSettings.java +++ b/src/com/cherish/settings/fragments/MiscSettings.java @@ -47,7 +47,6 @@ public class MiscSettings extends SettingsPreferenceFragment implements private static final String SMART_PIXELS = "smart_pixels"; 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_ROUNDED_FWVALS = "sysui_rounded_fwvals"; private static final String KEY_PULSE_BRIGHTNESS = "ambient_pulse_brightness"; private static final String KEY_DOZE_BRIGHTNESS = "ambient_doze_brightness"; @@ -100,16 +99,6 @@ public class MiscSettings extends SettingsPreferenceFragment implements mCustomStatusbarPaddingEnd.setValue(customStatusbarPaddingEnd); mCustomStatusbarPaddingEnd.setOnPreferenceChangeListener(this); - // Rounded Content Padding - //mContentPadding = (CustomSeekBarPreference) findPreference(SYSUI_ROUNDED_CONTENT_PADDING); - //int resourceIdPadding = res.getIdentifier("com.android.systemui:dimen/rounded_corner_content_padding", null, - // null); - //int contentPadding = Settings.Secure.getIntForUser(ctx.getContentResolver(), - // Settings.Secure.SYSUI_ROUNDED_CONTENT_PADDING, - // (int) (res.getDimension(resourceIdPadding) / density), UserHandle.USER_CURRENT); - //mContentPadding.setValue(contentPadding); - //mContentPadding.setOnPreferenceChangeListener(this); - // Rounded use Framework Values mRoundedFwvals = (SecureSettingSwitchPreference) findPreference(SYSUI_ROUNDED_FWVALS); mRoundedFwvals.setOnPreferenceChangeListener(this); @@ -153,10 +142,6 @@ public class MiscSettings extends SettingsPreferenceFragment implements Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SYSUI_ROUNDED_SIZE, (int) objValue, UserHandle.USER_CURRENT); return true; - //} else if (preference == mContentPadding) { - // Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SYSUI_ROUNDED_CONTENT_PADDING, - // (int) objValue, UserHandle.USER_CURRENT); - // return true; } else if (preference == mRoundedFwvals) { restoreCorners(); return true; @@ -196,9 +181,7 @@ public class MiscSettings extends SettingsPreferenceFragment implements } int resourceIdRadius = (int) ctx.getResources().getDimension(com.android.internal.R.dimen.rounded_corner_radius); - //int resourceIdPadding = res.getIdentifier("com.android.systemui:dimen/rounded_corner_content_padding", null, null); mCornerRadius.setValue((int) (resourceIdRadius / density)); - //mContentPadding.setValue((int) (res.getDimension(resourceIdPadding) / density)); } @Override