From f7b7bab3dc0bf6b543aaabbc49eac510a3ab6549 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 12 Jul 2017 12:09:54 -0700
Subject: [PATCH 1/3] Correct navbar colors after rebooting

System UI visibility flags shouldn't be set based on overlay
states. Overlays may persist across reboots leading to
situations where the navbar might be white when the rest of
the UI is black.

Change-Id: Id3d1e935c1f02a76491a92e521565468602719d5
Fixes: 63138897
Test: reboot, swipe up, look at navbar
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 20c2ad66ec588..f7f1774e58132 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4595,11 +4595,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() {

From ce8466e3dfce2812d775eb2fb423d0eeaa2b6a2a Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 12 Jul 2017 14:34:13 -0700
Subject: [PATCH 2/3] Ripple colors should match sysui theme.

Change-Id: Ica428dbcb6b8832ef67c91fbf2424c178c222d0d
Fixes: 62887093
Test: visual
---
 packages/SystemUI/res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index e375a21f0b08c..b61c5b55ee126 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -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>
 

From 007baf37a2255a8dbc371e1a5384e4ca86edfb87 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 12 Jul 2017 15:44:42 -0700
Subject: [PATCH 3/3] Check mark color after successful auth

Bouncer check mark color should never change
during auth, always respecting the theme.

Change-Id: Ie4fd89a32addbc106242aa239d01cb30f3cab5b3
Fixes: 62887909
Test: Visual
---
 packages/SystemUI/res-keyguard/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index 795f20ee814ed..9eceeb40d6d5c 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -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>