Merge SP1A.201207.001

Change-Id: I1cca277b923fed07896ee2e268c8da7df72eedce

1 files changed, 12 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
index db3d616fbcda..a4967f79ec7a 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
@@ -33,6 +33,7 @@ import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.keyguard.EmergencyButton.EmergencyButtonCallback;
 import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
+import com.android.settingslib.Utils;
 import com.android.systemui.R;
 
 import java.util.List;
@@ -198,6 +199,7 @@ public class KeyguardPatternViewController
 
     @Override
     protected void onViewAttached() {
+        super.onViewAttached();
         mLockPatternView.setOnPatternListener(new UnlockPatternListener());
         mLockPatternView.setSaveEnabled(false);
         mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(
@@ -253,6 +255,16 @@ public class KeyguardPatternViewController
     }
 
     @Override
+    public void reloadColors() {
+        super.reloadColors();
+        mMessageAreaController.reloadColors();
+        int textColor = Utils.getColorAttr(mLockPatternView.getContext(),
+                android.R.attr.textColorPrimary).getDefaultColor();
+        int errorColor = Utils.getColorError(mLockPatternView.getContext()).getDefaultColor();
+        mLockPatternView.setColors(textColor, textColor, errorColor);
+    }
+
+    @Override
     public void onPause() {
         super.onPause();