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

Commit 38dfba03 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Add trust indicator to keyguard"

parents eac222a0 2fe592d4

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+7 −0
Original line number Diff line number Diff line
@@ -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) {

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java

+5 −0
Original line number Diff line number Diff line
@@ -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) { }

}

packages/SystemUI/res/drawable-xhdpi/ic_lock_open_24dp.png

0 → 100644
+1007 B
Loading image diff...

packages/SystemUI/res/drawable-xxxhdpi/ic_lock_open_24dp.png

0 → 100644
+828 B
Loading image diff...

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"