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

Commit 8a3a964d authored by Jason Monk's avatar Jason Monk
Browse files

Show Cast Tile when trusted 

Add a trusted state to the KeyguardMonitor and update uses of it
to treat trusted as if it weren't secure.

Bug: 19709691
Change-Id: Ic46818b6c27e0bd093c7c3af904388fcb870c4c4
parent 6236a820

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { 


    @Override

    protected void handleUpdateState(BooleanState state, Object arg) {

        state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing());

        state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing() && !mKeyguard.isTrusted());

        state.label = mContext.getString(R.string.quick_settings_cast_title);

        state.value = false;

        state.autoMirrorDrawable = false;

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mAccessibilityController = new AccessibilityController(mContext);

        mKeyguardBottomArea.setAccessibilityController(mAccessibilityController);

        mNextAlarmController = new NextAlarmController(mContext);

        mKeyguardMonitor = new KeyguardMonitor();

        mKeyguardMonitor = new KeyguardMonitor(mContext);

        if (UserSwitcherController.isUserSwitcherAvailable(UserManager.get(mContext))) {

            mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor);

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java

+58 −2
Original line number Diff line number Diff line
@@ -16,21 +16,59 @@ 


package com.android.systemui.statusbar.policy;



import android.app.ActivityManager;

import android.content.Context;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.settings.CurrentUserTracker;



import java.util.ArrayList;



public final class KeyguardMonitor {

public final class KeyguardMonitor extends KeyguardUpdateMonitorCallback {



    private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>();



    private final Context mContext;

    private final CurrentUserTracker mUserTracker;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;



    private int mCurrentUser;

    private boolean mShowing;

    private boolean mSecure;

    private boolean mTrusted;



    private boolean mListening;



    public KeyguardMonitor(Context context) {

        mContext = context;

        mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);

        mUserTracker = new CurrentUserTracker(mContext) {

            @Override

            public void onUserSwitched(int newUserId) {

                mCurrentUser = newUserId;

                updateTrustedState();

            }

        };

    }



    public void addCallback(Callback callback) {

        mCallbacks.add(callback);

        if (mCallbacks.size() != 0 && !mListening) {

            mListening = true;

            mCurrentUser = ActivityManager.getCurrentUser();

            updateTrustedState();

            mKeyguardUpdateMonitor.registerCallback(this);

            mUserTracker.startTracking();

        }

    }



    public void removeCallback(Callback callback) {

        mCallbacks.remove(callback);

        if (mCallbacks.remove(callback) && mCallbacks.size() == 0 && mListening) {

            mListening = false;

            mKeyguardUpdateMonitor.removeCallback(this);

            mUserTracker.stopTracking();

        }

    }



    public boolean isShowing() {
@@ -41,10 +79,28 @@ public final class KeyguardMonitor { 
        return mSecure;

    }



    public boolean isTrusted() {

        return mTrusted;

    }



    public void notifyKeyguardState(boolean showing, boolean secure) {

        if (mShowing == showing && mSecure == secure) return;

        mShowing = showing;

        mSecure = secure;

        notifyKeyguardChanged();

    }



    @Override

    public void onTrustChanged(int userId) {

        updateTrustedState();

        notifyKeyguardChanged();

    }



    private void updateTrustedState() {

        mTrusted = mKeyguardUpdateMonitor.getUserHasTrust(mCurrentUser);

    }



    private void notifyKeyguardChanged() {

        for (Callback callback : mCallbacks) {

            callback.onKeyguardChanged();

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+2 −1
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ public class UserSwitcherController { 
        @Override

        public int getCount() {

            boolean secureKeyguardShowing = mController.mKeyguardMonitor.isShowing()

                    && mController.mKeyguardMonitor.isSecure();

                    && mController.mKeyguardMonitor.isSecure()

                    && !mController.mKeyguardMonitor.isTrusted();

            if (!secureKeyguardShowing) {

                return mController.mUsers.size();

            }