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

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

Merge "Password field colors" into oc-dr1-dev 

am: e21a151f

Change-Id: I1b0ba8bb0cfcc5a5b7002242f134873682decf7b
parents d88cfb53 e21a151f

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
@@ -1320,6 +1320,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 */,