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

Cherish: Allow devices to hide black fill-in for display cutout [2/2]

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Pranav Vashi
2021-07-23 15:19:01 +09:00
committed by Hưng Phan
parent be61d2e2ad
commit 416e15f03f
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/cherish_strings.xml
View File

@@ -1049,6 +1049,8 @@
<string name="display_cutout_style_hide">Hide</string> <string name="display_cutout_style_hide">Hide</string>
<string name="stock_statusbar_in_hide">Stock statusbar height</string> <string name="stock_statusbar_in_hide">Stock statusbar height</string>
<string name="stock_statusbar_in_hide_summary">Use default statusbar height in Hide</string> <string name="stock_statusbar_in_hide_summary">Use default statusbar height in Hide</string>
<string name="display_hide_notch_title">Hide display cutout</string>
<string name="display_hide_notch_summary">Disable black fill-in for display cutout</string>
<!-- Rounded corners --> <!-- Rounded corners -->
<string name="corners_category">Corners</string> <string name="corners_category">Corners</string>

7
res/xml/cherish_settings_theme.xml
View File

@@ -173,6 +173,13 @@
android:dialogTitle="@string/panel_bg_dialog_title" android:dialogTitle="@string/panel_bg_dialog_title"
android:entries="@array/panel_bg_titles" android:entries="@array/panel_bg_titles"
android:entryValues="@array/panel_bg_values" /> android:entryValues="@array/panel_bg_values" />
<!-- Hide notch fill -->
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="display_hide_notch"
android:title="@string/display_hide_notch_title"
android:summary="@string/display_hide_notch_summary"
android:defaultValue="false" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory

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

@@ -57,6 +57,7 @@ import com.android.internal.util.cherish.ThemesUtils;
import com.android.internal.util.cherish.CherishUtils; import com.android.internal.util.cherish.CherishUtils;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.cherish.settings.preferences.SystemSettingListPreference; import com.cherish.settings.preferences.SystemSettingListPreference;
import com.cherish.settings.preferences.SystemSettingSwitchPreference;
import net.margaritov.preference.colorpicker.ColorPickerPreference; import net.margaritov.preference.colorpicker.ColorPickerPreference;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -79,6 +80,7 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
static final int DEFAULT = 0xff1a73e8; static final int DEFAULT = 0xff1a73e8;
private static final String QS_PANEL_COLOR = "qs_panel_color"; private static final String QS_PANEL_COLOR = "qs_panel_color";
private static final String SWITCH_STYLE = "switch_style"; private static final String SWITCH_STYLE = "switch_style";
private static final String HIDE_NOTCH = "display_hide_notch";
private SystemSettingListPreference mSwitchStyle; private SystemSettingListPreference mSwitchStyle;
private ColorPickerPreference mQsPanelColor; private ColorPickerPreference mQsPanelColor;
@@ -95,6 +97,7 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
private ListPreference mQsHeaderStyle; private ListPreference mQsHeaderStyle;
private ListPreference mQsTileStyle; private ListPreference mQsTileStyle;
private ListPreference mGesbar; private ListPreference mGesbar;
private SystemSettingSwitchPreference mHideNotch;
private IntentFilter mIntentFilter; private IntentFilter mIntentFilter;
private static FontPickerPreferenceController mFontPickerPreference; private static FontPickerPreferenceController mFontPickerPreference;
@@ -150,10 +153,18 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
PreferenceScreen prefScreen = getPreferenceScreen(); PreferenceScreen prefScreen = getPreferenceScreen();
ContentResolver resolver = getActivity().getContentResolver(); ContentResolver resolver = getActivity().getContentResolver();
final Resources res = getResources();
mIntentFilter = new IntentFilter(); mIntentFilter = new IntentFilter();
mIntentFilter.addAction("com.android.server.ACTION_FONT_CHANGED"); mIntentFilter.addAction("com.android.server.ACTION_FONT_CHANGED");
mHideNotch = (SystemSettingSwitchPreference) prefScreen.findPreference(HIDE_NOTCH);
boolean mHideNotchSupported = res.getBoolean(
com.android.internal.R.bool.config_showHideNotchSettings);
if (!mHideNotchSupported) {
prefScreen.removePreference(mHideNotch);
}
mSwitchStyle = (SystemSettingListPreference)findPreference(SWITCH_STYLE); mSwitchStyle = (SystemSettingListPreference)findPreference(SWITCH_STYLE);
int switchStyle = Settings.System.getInt(resolver,Settings.System.SWITCH_STYLE, 2); int switchStyle = Settings.System.getInt(resolver,Settings.System.SWITCH_STYLE, 2);
int switchIndex = mSwitchStyle.findIndexOfValue(String.valueOf(switchStyle)); int switchIndex = mSwitchStyle.findIndexOfValue(String.valueOf(switchStyle));