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

am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev

Browse Source 
* commit '8f52135f2c555ae0a13393b60ed0552ee9e149da':
  Allow apps from managed profles to close notification shade.
This commit is contained in:
Kenny Guy
2014-12-02 10:21:53 +00:00
committed by Android Git Automerger
parent fcb948526f 8f52135f2c
commit c4f32bb743
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -689,6 +689,12 @@ public abstract class BaseStatusBar extends SystemUI implements
} }
} }
protected boolean isCurrentProfile(int userId) {
synchronized (mCurrentProfiles) {
return mCurrentProfiles.get(userId) != null;
}
}
@Override @Override
public String getCurrentMediaNotificationKey() { public String getCurrentMediaNotificationKey() {
return null; return null;

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

@@ -922,7 +922,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
filter.addAction("fake_artwork"); filter.addAction("fake_artwork");
} }
filter.addAction(ACTION_DEMO); filter.addAction(ACTION_DEMO);
context.registerReceiver(mBroadcastReceiver, filter); context.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null);
// listen for USER_SETUP_COMPLETE setting (per-user) // listen for USER_SETUP_COMPLETE setting (per-user)
resetUserSetupObserver(); resetUserSetupObserver();
@@ -3096,6 +3096,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
if (DEBUG) Log.v(TAG, "onReceive: " + intent); if (DEBUG) Log.v(TAG, "onReceive: " + intent);
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) { if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
if (isCurrentProfile(getSendingUserId())) {
int flags = CommandQueue.FLAG_EXCLUDE_NONE; int flags = CommandQueue.FLAG_EXCLUDE_NONE;
String reason = intent.getStringExtra("reason"); String reason = intent.getStringExtra("reason");
if (reason != null && reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) { if (reason != null && reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) {
@@ -3103,6 +3104,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
animateCollapsePanels(flags); animateCollapsePanels(flags);
} }
}
else if (Intent.ACTION_SCREEN_OFF.equals(action)) { else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
mScreenOn = false; mScreenOn = false;
notifyNavigationBarScreenOn(false); notifyNavigationBarScreenOn(false);