commit e34d7138f197af79c132e9808f99d82e627ccb73
author Shen Lin <shhenlin@gmail.com> Wed Oct 12 16:11:24 2022 +0800
committer Shen Lin <shhenlin@gmail.com> Wed Nov 30 02:01:40 2022 +0000
tree 1058d2b5a84facaaf10d3093e03d5771ca09ebb8
parent 6a1a54a9269f3438ffaee47fc4e861a72cb1c8d8

Fix dark navigationBar background in some telephony settings pages

Style changes:

- Organize styles.xml, make Theme.Telecom.DialerSettings as a base settings theme, and declare navigationBarColor transparent.

- Align EnableAccount\BlockedNumbers\CallSettingsWithoutDividerTheme extending this base settings theme.

Affected pages:
EnableAccountPreferenceActivity\RespondViaSmsSettings\BlockedNumbersActivity

Bug: b/253168764 b/236809093
Test: Manual UI test in normal and dark mode

Change-Id: Iced178b2edfeb5a6f8d2bb6048b353e38981fb97

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d376b6a..b43be0f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -276,7 +276,7 @@
         <activity android:name=".settings.EnableAccountPreferenceActivity"
              android:label="@string/enable_account_preference_title"
              android:configChanges="orientation|screenSize|keyboardHidden"
-             android:theme="@style/Theme.Telecom.DialerSettings"
+             android:theme="@style/Theme.Telecom.EnableAccount"
              android:process=":ui"
              android:exported="true">
             <intent-filter>

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 53e1bcb..c8b24d3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,19 +29,21 @@
    <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">
         <item name="android:forceDarkAllowed">true</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="Theme.Telecom.EnableAccount" parent="Theme.Telecom.DialerSettings">
+        <item name="android:actionOverflowButtonStyle">
+            @style/TelecomDialerSettingsActionOverflowButtonStyle
+        </item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowContentOverlay">@null</item>
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.DialerSettings">
         <item name="android:listDivider">@null</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
 
     <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">