Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev

2 files changed, 23 insertions, 12 deletions

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java
index 759068d..8c1dfe1 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java
@@ -45,6 +45,9 @@ class KeyguardMultiUserAvatar extends FrameLayout {
     private boolean mInit = true;
     private KeyguardMultiUserSelectorView mUserSelector;
 
+    boolean mPressedStateLocked = false;
+    boolean mTempPressedStateHolder = false;
+
     public static KeyguardMultiUserAvatar fromXml(int resId, Context context,
             KeyguardMultiUserSelectorView userSelector, UserInfo info) {
         KeyguardMultiUserAvatar icon = (KeyguardMultiUserAvatar)
@@ -135,25 +138,33 @@ class KeyguardMultiUserAvatar extends FrameLayout {
         }
     }
 
-    boolean mLockDrawableState = false;
-
-    public void lockDrawableState() {
-        mLockDrawableState = true;
+    public void lockPressedState() {
+        mPressedStateLocked = true;
     }
 
-    public void resetDrawableState() {
-        mLockDrawableState = false;
+    public void resetPressedState() {
+        mPressedStateLocked = false;
         post(new Runnable() {
             @Override
             public void run() {
-                refreshDrawableState();
+                KeyguardMultiUserAvatar.this.setPressed(mTempPressedStateHolder);
             }
         });
     }
 
-    protected void drawableStateChanged() {
-        if (!mLockDrawableState) {
-            super.drawableStateChanged();
+    @Override
+    public void setPressed(boolean pressed) {
+        if (!mPressedStateLocked) {
+            super.setPressed(pressed);
+            if (pressed) {
+                mUserImage.setColorFilter(Color.argb(0, INACTIVE_COLOR,
+                        INACTIVE_COLOR, INACTIVE_COLOR));
+            } else if (!mActive) {
+                mUserImage.setColorFilter(Color.argb(INACTIVE_ALPHA, INACTIVE_COLOR,
+                        INACTIVE_COLOR, INACTIVE_COLOR));
+            }
+        } else {
+            mTempPressedStateHolder = pressed;
         }
     }
 
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java
index e4096b9..3b45c22 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java
@@ -111,7 +111,7 @@ public class KeyguardMultiUserSelectorView extends FrameLayout implements View.O
             return;
         } else {
             // Reset the previously active user to appear inactive
-            avatar.lockDrawableState();
+            avatar.lockPressedState();
             mCallback.hideSecurityView(FADE_OUT_ANIMATION_DURATION);
             mActiveUserAvatar.setActive(false, true,  SWITCH_ANIMATION_DURATION, new Runnable() {
                 @Override
@@ -120,7 +120,7 @@ public class KeyguardMultiUserSelectorView extends FrameLayout implements View.O
                         ActivityManagerNative.getDefault().switchUser(avatar.getUserInfo().id);
                         WindowManagerGlobal.getWindowManagerService().lockNow();
                         // Set the new active user, and make it appear active
-                        avatar.resetDrawableState();
+                        avatar.resetPressedState();
                         mCallback.showSecurityView();
                         mActiveUserAvatar = avatar;
                         mActiveUserAvatar.setActive(true, false, 0, null);