Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev

Browse Source
This commit is contained in:
Nicolas Prévot
2016-05-18 11:21:44 +00:00
committed by Android (Google) Code Review
parent 982fd04335 1dbbe7d664
commit bbd26bc023
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1178,6 +1178,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mKeyguardIndicationController.setStatusBarKeyguardViewManager( mKeyguardIndicationController.setStatusBarKeyguardViewManager(
mStatusBarKeyguardViewManager); mStatusBarKeyguardViewManager);
mFingerprintUnlockController.setStatusBarKeyguardViewManager(mStatusBarKeyguardViewManager); mFingerprintUnlockController.setStatusBarKeyguardViewManager(mStatusBarKeyguardViewManager);
mIconPolicy.setStatusBarKeyguardViewManager(mStatusBarKeyguardViewManager);
mRemoteInputController.addCallback(mStatusBarKeyguardViewManager); mRemoteInputController.addCallback(mStatusBarKeyguardViewManager);
if (FORCE_REMOTE_INPUT_HISTORY) { if (FORCE_REMOTE_INPUT_HISTORY) {
@@ -4067,12 +4068,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
mScrimController.setKeyguardShowing(true); mScrimController.setKeyguardShowing(true);
mIconPolicy.setKeyguardShowing(true);
} else { } else {
mScrimController.setKeyguardShowing(false); mScrimController.setKeyguardShowing(false);
mIconPolicy.setKeyguardShowing(false);
} }
mIconPolicy.notifyKeyguardShowingChanged();
mNotificationPanel.setBarState(mState, mKeyguardFadingAway, goingToFullShade); mNotificationPanel.setBarState(mState, mKeyguardFadingAway, goingToFullShade);
updateDozingState(); updateDozingState();
updatePublicMode(); updatePublicMode();

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
View File

@@ -80,6 +80,7 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
private final StatusBarIconController mIconController; private final StatusBarIconController mIconController;
private final RotationLockController mRotationLockController; private final RotationLockController mRotationLockController;
private final DataSaverController mDataSaver; private final DataSaverController mDataSaver;
private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
// Assume it's all good unless we hear otherwise. We don't always seem // Assume it's all good unless we hear otherwise. We don't always seem
// to get broadcasts that it *is* there. // to get broadcasts that it *is* there.
@@ -95,7 +96,6 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
private boolean mManagedProfileIconVisible = false; private boolean mManagedProfileIconVisible = false;
private boolean mManagedProfileInQuietMode = false; private boolean mManagedProfileInQuietMode = false;
private boolean mKeyguardVisible = true;
private BluetoothController mBluetooth; private BluetoothController mBluetooth;
public PhoneStatusBarPolicy(Context context, StatusBarIconController iconController, public PhoneStatusBarPolicy(Context context, StatusBarIconController iconController,
@@ -192,6 +192,11 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
mDataSaver.addListener(this); mDataSaver.addListener(this);
} }
public void setStatusBarKeyguardViewManager(
StatusBarKeyguardViewManager statusBarKeyguardViewManager) {
mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
}
public void setZenMode(int zen) { public void setZenMode(int zen) {
mZen = zen; mZen = zen;
updateVolumeZen(); updateVolumeZen();
@@ -385,10 +390,9 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
private void updateManagedProfile() { private void updateManagedProfile() {
if (DEBUG) Log.v(TAG, "updateManagedProfile: mManagedProfileFocused: " if (DEBUG) Log.v(TAG, "updateManagedProfile: mManagedProfileFocused: "
+ mManagedProfileFocused + mManagedProfileFocused);
+ " mKeyguardVisible: " + mKeyguardVisible);
final boolean showIcon; final boolean showIcon;
if (mManagedProfileFocused && !mKeyguardVisible) { if (mManagedProfileFocused && !mStatusBarKeyguardViewManager.isShowing()) {
showIcon = true; showIcon = true;
mIconController.setIcon(mSlotManagedProfile, mIconController.setIcon(mSlotManagedProfile,
R.drawable.stat_sys_managed_profile_status, R.drawable.stat_sys_managed_profile_status,
@@ -446,8 +450,7 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
updateManagedProfile(); updateManagedProfile();
} }
public void setKeyguardShowing(boolean visible) { public void notifyKeyguardShowingChanged() {
mKeyguardVisible = visible;
updateManagedProfile(); updateManagedProfile();
} }