Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e34d7138 authored by Shen Lin's avatar Shen Lin
Browse files

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
parent 6a1a54a9

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+9 −7
Original line number Diff line number Diff line
@@ -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>

        <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>

    <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="Theme.Telecom.DialerSettings">

        <item name="android:listDivider">@null</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">