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

Commit 682abdf1 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151f am: 1ea58e50"

parents 4514f936 7d8f86f3

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
        <item name="android:layout_gravity">center_horizontal|bottom</item>

    </style>



    <style name="PasswordTheme" parent="@android:style/Theme.DeviceDefault">

    <style name="PasswordTheme" parent="systemui_theme">

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

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

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

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

+3 −0
Original line number Diff line number Diff line
@@ -1322,6 +1322,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if (mBrightnessMirrorController != null) {

            mBrightnessMirrorController.onOverlayChanged();

        }

        if (mStatusBarKeyguardViewManager != null) {

            mStatusBarKeyguardViewManager.onOverlayChanged();

        }

    }



    protected void reevaluateStyles() {

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

+4 −0
Original line number Diff line number Diff line
@@ -416,6 +416,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mBouncer.hide(true /* destroyView */);

    }



    public void onOverlayChanged() {

        mBouncer.hide(true /* destroyView */);

    }



    private void animateScrimControllerKeyguardFadingOut(long delay, long duration,

            boolean skipFirstFrame) {

        animateScrimControllerKeyguardFadingOut(delay, duration, null /* endRunnable */,