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

Commit 0a6cc59e 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 am: f87dd261 

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



Change-Id: I9fcd5548f6b61d05aba9d12fe37261eb2ee6e784
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f988a485 f87dd261

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