drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Explicitly specify user for public mode" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2014-11-21 17:56:59 +00:00
committed by Android (Google) Code Review
parent b90a2f9d1a 31b844ba0c
commit 26750711e1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3183,6 +3183,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public void userSwitched(int newUserId) { public void userSwitched(int newUserId) {
if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId); if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId);
animateCollapsePanels(); animateCollapsePanels();
updatePublicMode();
updateNotifications(); updateNotifications();
resetUserSetupObserver(); resetUserSetupObserver();
setControllerUsers(); setControllerUsers();
@ -3674,7 +3675,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
private void updatePublicMode() { private void updatePublicMode() {
setLockscreenPublicMode(mStatusBarKeyguardViewManager.isShowing() setLockscreenPublicMode(mStatusBarKeyguardViewManager.isShowing()
&& mStatusBarKeyguardViewManager.isSecure()); && mStatusBarKeyguardViewManager.isSecure(mCurrentUserId));
} }
private void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) { private void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@ -426,4 +426,8 @@ public class StatusBarKeyguardViewManager {
public boolean isGoingToNotificationShade() { public boolean isGoingToNotificationShade() {
return mPhoneStatusBar.isGoingToNotificationShade(); return mPhoneStatusBar.isGoingToNotificationShade();
} }
public boolean isSecure(int userId) {
return mBouncer.isSecure() || mLockPatternUtils.isSecure(userId);
}
} }