From 416e15f03f9a47285a3aeb727e2f96e4d84759fb Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Fri, 23 Jul 2021 15:19:01 +0900
Subject: [PATCH] Cherish: Allow devices to hide black fill-in for display
 cutout [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                        |  2 ++
 res/xml/cherish_settings_theme.xml                    |  7 +++++++
 src/com/cherish/settings/fragments/ThemeSettings.java | 11 +++++++++++
 3 files changed, 20 insertions(+)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index d6d4dcc..02894e2 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1049,6 +1049,8 @@
     <string name="display_cutout_style_hide">Hide</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="display_hide_notch_title">Hide display cutout</string>
+    <string name="display_hide_notch_summary">Disable black fill-in for display cutout</string>
 	
 	<!-- Rounded corners -->
     <string name="corners_category">Corners</string>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index c89909b..a839052 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -173,6 +173,13 @@
         android:dialogTitle="@string/panel_bg_dialog_title"
         android:entries="@array/panel_bg_titles"
         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
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 4381132..6744f40 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -57,6 +57,7 @@ import com.android.internal.util.cherish.ThemesUtils;
 import com.android.internal.util.cherish.CherishUtils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.cherish.settings.preferences.SystemSettingListPreference;
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 import net.margaritov.preference.colorpicker.ColorPickerPreference;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -79,6 +80,7 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
 	static final int DEFAULT = 0xff1a73e8;
 	private static final String QS_PANEL_COLOR = "qs_panel_color";
 	private static final String SWITCH_STYLE = "switch_style";
+	private static final String HIDE_NOTCH = "display_hide_notch";
 	
     private SystemSettingListPreference mSwitchStyle;
     private ColorPickerPreference mQsPanelColor;
@@ -95,6 +97,7 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
     private ListPreference mQsHeaderStyle;
     private ListPreference mQsTileStyle;
 	private ListPreference mGesbar;
+	private SystemSettingSwitchPreference mHideNotch;
 	
 	private IntentFilter mIntentFilter;
     private static FontPickerPreferenceController mFontPickerPreference;
@@ -150,10 +153,18 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
 
         PreferenceScreen prefScreen = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
+		final Resources res = getResources();
 		
 		mIntentFilter = new IntentFilter();
         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);
         int switchStyle = Settings.System.getInt(resolver,Settings.System.SWITCH_STYLE, 2);
         int switchIndex = mSwitchStyle.findIndexOfValue(String.valueOf(switchStyle));