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

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

Browse Source 
automerge: 0108d98

* commit '0108d9836971d9f40bf7856d1858ecc4b153e511':
  Explicitly specify user for public mode
This commit is contained in:
Adrian Roos
2014-11-21 18:04:23 +00:00
committed by android-build-merger
parent 83f2f47950 0108d98369
commit 034b9092fb
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);
}
} }