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

Commit b02198da authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev 

am: 6a6d63be

Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
parents 1cdcaa8c 6a6d63be

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        <item name="android:paddingBottom">-16dp</item>

    </style>

    <style name="Keyguard.ImageButton.NumPadEnter" parent="@android:style/Widget.ImageButton">

        <item name="android:tint">?attr/bgProtectTextColor</item>

        <item name="android:tint">@color/background_protected</item>

    </style>

    <style name="Widget.TextView.NumPadKey.Klondike" parent="Widget.TextView.NumPadKey">

        <item name="android:textSize">12sp</item>

packages/SystemUI/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ 
        <item name="darkIconTheme">@style/DualToneDarkTheme</item>

        <item name="bgProtectTextColor">?android:attr/textColorPrimaryInverse</item>

        <item name="bgProtectSecondaryTextColor">?android:attr/textColorSecondaryInverse</item>

        <item name="android:colorControlHighlight">?android:attr/textColorSecondaryInverse</item>

        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

    </style>

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+3 −1
Original line number Diff line number Diff line
@@ -4596,11 +4596,13 @@ public class StatusBar extends SystemUI implements DemoMode, 
            try {

                mOverlayManager.setEnabled("com.android.systemui.theme.lightwallpaper",

                        useDarkText, mCurrentUserId);

                mStatusBarWindowManager.setKeyguardDark(useDarkText);

            } catch (RemoteException e) {

                Log.w(TAG, "Can't change theme", e);

            }

        }



        // Make sure we have the correct navbar/statusbar colors.

        mStatusBarWindowManager.setKeyguardDark(useDarkText);

    }



    private void updateDozingState() {