From e45fae2141c984fe7bb6923f6ef5c5c85023852e Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 27 Nov 2024 19:37:18 +0530
Subject: [PATCH] Fix settings dual pane in tablets

---
 res/color-night/accent_select_primary_text.xml | 18 ------------------
 .../accent_select_secondary_text.xml           | 18 ------------------
 .../settings_two_pane_background_color.xml     | 18 ------------------
 res/color/accent_select_background.xml         |  2 +-
 .../settings_two_pane_background_color.xml     |  2 +-
 ...HighlightableTopLevelPreferenceAdapter.java |  4 ----
 6 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 res/color-night/accent_select_primary_text.xml
 delete mode 100644 res/color-night/accent_select_secondary_text.xml
 delete mode 100644 res/color-night/settings_two_pane_background_color.xml

diff --git a/res/color-night/accent_select_primary_text.xml b/res/color-night/accent_select_primary_text.xml
deleted file mode 100644
index 049ddf63678..00000000000
--- a/res/color-night/accent_select_primary_text.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorPrimaryInverse" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/accent_select_secondary_text.xml b/res/color-night/accent_select_secondary_text.xml
deleted file mode 100644
index 6b7b4f27dcf..00000000000
--- a/res/color-night/accent_select_secondary_text.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorSecondaryInverse" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/settings_two_pane_background_color.xml b/res/color-night/settings_two_pane_background_color.xml
deleted file mode 100644
index 86aa0ed1855..00000000000
--- a/res/color-night/settings_two_pane_background_color.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500" android:lStar="5" />
-</selector>
\ No newline at end of file
diff --git a/res/color/accent_select_background.xml b/res/color/accent_select_background.xml
index 5dab7230532..fbbd8da462b 100644
--- a/res/color/accent_select_background.xml
+++ b/res/color/accent_select_background.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_accent2_500" android:lStar="80" />
+    <item android:color="@*android:color/accent_device_default" android:alpha="0.20" />
 </selector>
\ No newline at end of file
diff --git a/res/color/settings_two_pane_background_color.xml b/res/color/settings_two_pane_background_color.xml
index 6cb8e703077..d3f0a3958d6 100644
--- a/res/color/settings_two_pane_background_color.xml
+++ b/res/color/settings_two_pane_background_color.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500" android:lStar="87" />
+    <item android:color="?android:attr/colorBackground" />
 </selector>
\ No newline at end of file
diff --git a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
index 15167aca1db..13c53480054 100644
--- a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
+++ b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
@@ -232,10 +232,6 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
         v.setBackgroundResource(RES_HIGHLIGHTED_BACKGROUND);
         ((TextView) v.findViewById(android.R.id.title)).setTextColor(mTitleColorHighlight);
         ((TextView) v.findViewById(android.R.id.summary)).setTextColor(mSummaryColorHighlight);
-        final Drawable drawable = ((ImageView) v.findViewById(android.R.id.icon)).getDrawable();
-        if (drawable != null) {
-            drawable.setTint(mIconColorHighlight);
-        }
     }
 
     private void removeHighlightBackground(PreferenceViewHolder holder) {
-- 
GitLab