From 2fe592d49b20826f998e26cbc63ed0c0deff46c1 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Sat, 17 May 2014 03:11:59 +0200
Subject: [PATCH] Add trust indicator to keyguard

Changes the unlock icon to an open lock
when the keyguard will not ask for credentials.

Bug: 14295559
Change-Id: If34a5ec9e23b2d22813860faee125e6b2d700643
---
 .../keyguard/KeyguardUpdateMonitor.java       |   7 +++
 .../KeyguardUpdateMonitorCallback.java        |   5 ++
 .../res/drawable-xhdpi/ic_lock_open_24dp.png  | Bin 0 -> 1007 bytes
 .../drawable-xxxhdpi/ic_lock_open_24dp.png    | Bin 0 -> 828 bytes
 .../res/layout/keyguard_bottom_area.xml       |   1 +
 .../phone/KeyguardBottomAreaView.java         |  50 ++++++++++++++++++
 6 files changed, 63 insertions(+)
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_lock_open_24dp.png
 create mode 100644 packages/SystemUI/res/drawable-xxxhdpi/ic_lock_open_24dp.png

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 0bcd91668fdab..fef971cc3e8a0 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -213,6 +213,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     @Override
     public void onTrustChanged(boolean enabled, int userId) {
         mUserHasTrust.put(userId, enabled);
+
+        for (int i = 0; i < mCallbacks.size(); i++) {
+            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
+            if (cb != null) {
+                cb.onTrustChanged(userId);
+            }
+        }
     }
 
     private boolean isTrustDisabled(int userId) {
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
index 76206f7ede02b..bcdf18fefc521 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
@@ -179,4 +179,9 @@ public class KeyguardUpdateMonitorCallback {
      * {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}.
      */
     public void onScreenTurnedOff(int why) { }
+
+    /**
+     * Called when trust changes for a user.
+     */
+    public void onTrustChanged(int userId) { }
 }
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_lock_open_24dp.png b/packages/SystemUI/res/drawable-xhdpi/ic_lock_open_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..467d55822552813c55bd0efb2f13008f27c08e0d
GIT binary patch
literal 1007
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr
zx4R3&|Mvbf`++>p0*}aI1_o|n5N2eUHAe!d;)SP+V@SoVx3f=Y3p>gjx4$*vT7=31
z4a*L>mU}I7AuNu2JiR;kZMrHxJ&O(epj0LDi~ogdNSB264~GvyTum$2_HUjN6}`4S
zWI~S9<&Oc}Y4@#XzFDvRd1ml#>&frctv6e5p4)UZ$<VitJ7nhKgSYNqO6b#ie$vyu
zJ8gz$SRiBSRL!=f%50k_zdZ2b|1_!UrHg+Rwk?hLDB5MVeaYjpOUEPLe2`9U+f(v}
z_fwC0-}-<v#u~D+3ddW*YFd*z8DIV=P&bI{w&K<aST1U`pw&{kV0X>IlYO7vDqL@W
zzjJ%i$L^Z%ELoo>#qLXg|7`1f+06NK8n*w|DN@;TOm+Tig=@WDCN|AQ^(ku~+i|g{
zvgB1+o!=PoRj-;wP4&@t!}nc<%4K&w&o2<4@l3X~^~bSqH%h(d<&^}Q9}CNE6ka#~
z_z&6L@09Xm_FFEW>pc7Ty7wO(7TsFB?pFL|@gFw?A9z3dHFtHJ+b^cOLFKmROfJeZ
z-`$j?);`DKkK%q$R-Q!GB^#M8MKrz%SlA}KVV!B@Et3lOn>jz2Hrw*Q(|fNuqs#up
z`74jLMNTghvFkn(u3<N$BVMq3eLzo{zJaoqfvjl0_mT$Z{hiz^I}dNmW4)F%=dyLk
zmC0IGbA)>2l@p)MKN993rLE8_I^h_XM>6Y@mvbE^Yb}>Z>bPvPRCD<X^ZxoLw@yv`
z{>M=zPf&2jquZCZuHm@DpYwWQCFAGUjcV2ztTLxRYk&Nu_x0-mmxP*(k9WQtpDDgW
zy6VfkkLSBpGUwkFz7=)yi-bWvYfzl?Y;g;bsxJk*swV8=4t0*Mp4NIhLs0#}4F>H_
z^XO%D(r=$TKG;~;xp$FO|NqtdbYst-3UQkF^W+?-haXyuT)RS6Jj&QE+*oU_1$Qqf
zbQm+ub~iM-?tPFQ$x(S+B>KVR6$f&@`%c-K{z>grM`!**HL?F|XP%Boh*bH<U;KZ?
zjE}zcuh-=7_EFxITz7lv(WH$L|HA(<6j$$ClKx!^m}MALOI#yLQW8s2t&)pUffR$0
zfuV`6fvK*MVThrrm5GIwsfo6Mk(Gf#c;DeOC>nC}Q!>*kacfY!TwMUvz~JfX=d#Wz
Gp$Py{D75?l

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_lock_open_24dp.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_lock_open_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7d2a9a938fd748e2da38e2a70d537c2f86f63a5
GIT binary patch
literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^r04KOxS
z<Ifua00O{CL_t(|+U=XWYg17i$3KZBt+7ZzQ96hYLN}p<iXe!aw1oP=QN+p3T~Tlm
z9fke_x`;{<(+WNiTuMPOwe>MeskPNQq(aF}XnGu~VD2mTadOYS_4oZv$vNl8_mg{`
z$q9%=BHilYA{FMTv+*bD%v0e4J?S?;#5C(Dk634#q4b*H#f+!*f1}F2G}=GQav=K(
zMT^_%GQW+nz~=wPEQPe#FEAe3zCy7;e>&!z$w>AUie>uD1Kjnr*QCZGi_~cP3~0kT
z=P_Nr;8a_^VP4U4t$W9${Sx0Dh8nzNw`=V^ymp<D_NS@)EOFGg#buZ0V5}PrP<IT<
z107qPa6vd^2H=*X^BfP<?ur9o%FN=mV6$;EaN8-zpf|A1J7zQSjU6F6pS>GhifSVt
z8Q`St^%!e`+b;3O_Rjg_pTHB_XLvAF>k(V)ugL>^Y%}mBbo=&GLp^)vwwi4@OMDE(
z)v6vJ<^b08q{)+U34j0yfB<Agqg1gx&b2zDMV)t)^_nj-*LCCecu!H6{eFHXZeO8T
z(S`8Yh<%0PgPy*x48}-&fLWseGo9?^Is#bq8l3wqw#Nn72vDbcQk_<+T!0j2m6NT6
z00@8p2!H?xfB<9=ph1Px3^K?WCTN)44@QZ{wyPWk#}6Vw!wA4t*G$*50`R~y*CYJ^
z`p*LmcGC1HEAT7y`7ZJEz@(>rX!1P$v(P=?();P3h4%Vp8_+!l@?8MV_(FErxAaK*
zyHLe9+p{c8qa`elvOZQrU$#tq8tvtwXW6)kyP{E+|7)(9Ze(XKl=;n^LSgZgG9^lk
zQo)LxC-Fh7Tk_qg00@8p2!H?xfB^iz02&VU4Wj_f_yC`b0?frvQ8s#8Wmw0jP&H=%
zt)9nNWW|X6ANu~NnDI-0o7%i~nS^yq|FuhzNF)+%Rs9BYd%mPb%CKwz0000<MNUMn
GLSTYJ$A>Zi

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 194829dc31ce3..2ec3766a722dc 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -56,6 +56,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <ImageView
+        android:id="@+id/lock_icon"
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:layout_gravity="bottom|center_horizontal"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index 58b3f2e3d6b78..5e9ce21d08450 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -36,7 +36,11 @@ import android.view.accessibility.AccessibilityManager;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 
+import com.android.internal.widget.LockPatternUtils;
+import com.android.keyguard.KeyguardUpdateMonitor;
+import com.android.keyguard.KeyguardUpdateMonitorCallback;
 import com.android.systemui.R;
 
 /**
@@ -52,10 +56,14 @@ public class KeyguardBottomAreaView extends FrameLayout
 
     private SwipeAffordanceView mCameraButton;
     private SwipeAffordanceView mPhoneButton;
+    private ImageView mLockIcon;
 
     private PowerManager mPowerManager;
     private ActivityStarter mActivityStarter;
 
+    private LockPatternUtils mLockPatternUtils;
+    private KeyguardUpdateMonitor mKeyguardUpdateMonitor;
+
     public KeyguardBottomAreaView(Context context) {
         super(context);
     }
@@ -78,12 +86,17 @@ public class KeyguardBottomAreaView extends FrameLayout
         super.onFinishInflate();
         mCameraButton = (SwipeAffordanceView) findViewById(R.id.camera_button);
         mPhoneButton = (SwipeAffordanceView) findViewById(R.id.phone_button);
+        mLockIcon = (ImageView) findViewById(R.id.lock_icon);
         mCameraButton.setAffordanceListener(this);
         mPhoneButton.setAffordanceListener(this);
+        mLockPatternUtils = new LockPatternUtils(getContext());
+        mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(getContext());
+        KeyguardUpdateMonitor.getInstance(getContext()).registerCallback(mCallback);
         watchForDevicePolicyChanges();
         watchForAccessibilityChanges();
         updateCameraVisibility();
         updatePhoneVisibility();
+        updateTrust();
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
     }
 
@@ -185,4 +198,41 @@ public class KeyguardBottomAreaView extends FrameLayout
             launchPhone();
         }
     }
+
+    @Override
+    protected void onVisibilityChanged(View changedView, int visibility) {
+        super.onVisibilityChanged(changedView, visibility);
+        if (changedView == this && visibility == VISIBLE) {
+            updateTrust();
+        }
+    }
+
+    private void updateTrust() {
+        if (getVisibility() != VISIBLE) {
+            return;
+        }
+        int user = mLockPatternUtils.getCurrentUser();
+        boolean trust = !mLockPatternUtils.isSecure() ||
+                mKeyguardUpdateMonitor.getUserHasTrust(user);
+
+        int iconRes = trust ? R.drawable.ic_lock_open_24dp : R.drawable.ic_lock_24dp;
+        mLockIcon.setImageResource(iconRes);
+    }
+
+    final KeyguardUpdateMonitorCallback mCallback = new KeyguardUpdateMonitorCallback() {
+        @Override
+        public void onScreenTurnedOn() {
+            updateTrust();
+        }
+
+        @Override
+        public void onUserSwitchComplete(int userId) {
+            updateTrust();
+        }
+
+        @Override
+        public void onTrustChanged(int userId) {
+            updateTrust();
+        }
+    };
 }