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

Commit f87dd261 authored by Shen Lin's avatar Shen Lin Committed by Automerger Merge Worker
Browse files

Fix dark navigationBar background in some telephony settings pages am: e34d7138 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2251077



Change-Id: I723e8e2457a5cb3af611c543cb563adb886a9114
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e0d299a e34d7138

AndroidManifest.xml

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