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

am 95dc663d: Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev

Browse Source 
* commit '95dc663d1815704c63a5b18c94c3768068f2ff21':
  PowerUI: Post/cancel notification as UserHandle.ALL.
This commit is contained in:
John Spurlock
2014-10-22 16:48:34 +00:00
committed by Android Git Automerger
parent 9921a1dbb6 95dc663d18
commit 0c42c69361
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
View File

@@ -144,7 +144,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
showSaverNotification(); showSaverNotification();
mShowing = SHOWING_SAVER; mShowing = SHOWING_SAVER;
} else { } else {
mNoMan.cancel(TAG_NOTIFICATION, ID_NOTIFICATION); mNoMan.cancelAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, UserHandle.ALL);
mShowing = SHOWING_NOTHING; mShowing = SHOWING_NOTHING;
} }
} }
@@ -165,7 +165,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
if (n.headsUpContentView != null) { if (n.headsUpContentView != null) {
n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE); n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE);
} }
mNoMan.notifyAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, n, UserHandle.CURRENT); mNoMan.notifyAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, n, UserHandle.ALL);
} }
private void showWarningNotification() { private void showWarningNotification() {
@@ -202,7 +202,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
if (n.headsUpContentView != null) { if (n.headsUpContentView != null) {
n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE); n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE);
} }
mNoMan.notifyAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, n, UserHandle.CURRENT); mNoMan.notifyAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, n, UserHandle.ALL);
} }
private void showSaverNotification() { private void showSaverNotification() {
@@ -219,7 +219,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
if (hasSaverSettings()) { if (hasSaverSettings()) {
nb.setContentIntent(pendingActivity(mOpenSaverSettings)); nb.setContentIntent(pendingActivity(mOpenSaverSettings));
} }
mNoMan.notifyAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, nb.build(), UserHandle.CURRENT); mNoMan.notifyAsUser(TAG_NOTIFICATION, ID_NOTIFICATION, nb.build(), UserHandle.ALL);
} }
private void addStopSaverAction(Notification.Builder nb) { private void addStopSaverAction(Notification.Builder nb) {
@@ -340,6 +340,11 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
updateNotification(); updateNotification();
} }
@Override
public void userSwitched() {
updateNotification();
}
private void showStartSaverConfirmation() { private void showStartSaverConfirmation() {
if (mSaverConfirmation != null) return; if (mSaverConfirmation != null) return;
final SystemUIDialog d = new SystemUIDialog(mContext); final SystemUIDialog d = new SystemUIDialog(mContext);
@@ -369,7 +374,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
filter.addAction(ACTION_SHOW_BATTERY_SETTINGS); filter.addAction(ACTION_SHOW_BATTERY_SETTINGS);
filter.addAction(ACTION_START_SAVER); filter.addAction(ACTION_START_SAVER);
filter.addAction(ACTION_STOP_SAVER); filter.addAction(ACTION_STOP_SAVER);
mContext.registerReceiver(this, filter, null, mHandler); mContext.registerReceiverAsUser(this, UserHandle.ALL, filter, null, mHandler);
} }
@Override @Override

4
packages/SystemUI/src/com/android/systemui/power/PowerUI.java
View File

@@ -137,6 +137,7 @@ public class PowerUI extends SystemUI {
filter.addAction(Intent.ACTION_BATTERY_CHANGED); filter.addAction(Intent.ACTION_BATTERY_CHANGED);
filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_OFF);
filter.addAction(Intent.ACTION_SCREEN_ON); filter.addAction(Intent.ACTION_SCREEN_ON);
filter.addAction(Intent.ACTION_USER_SWITCHED);
filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGING); filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGING);
filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED); filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
mContext.registerReceiver(this, filter, null, mHandler); mContext.registerReceiver(this, filter, null, mHandler);
@@ -207,6 +208,8 @@ public class PowerUI extends SystemUI {
mScreenOffTime = SystemClock.elapsedRealtime(); mScreenOffTime = SystemClock.elapsedRealtime();
} else if (Intent.ACTION_SCREEN_ON.equals(action)) { } else if (Intent.ACTION_SCREEN_ON.equals(action)) {
mScreenOffTime = -1; mScreenOffTime = -1;
} else if (Intent.ACTION_USER_SWITCHED.equals(action)) {
mWarnings.userSwitched();
} else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)) { } else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)) {
updateSaverMode(); updateSaverMode();
} else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGING.equals(action)) { } else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGING.equals(action)) {
@@ -256,6 +259,7 @@ public class PowerUI extends SystemUI {
void updateLowBatteryWarning(); void updateLowBatteryWarning();
boolean isInvalidChargerWarningShowing(); boolean isInvalidChargerWarningShowing();
void dump(PrintWriter pw); void dump(PrintWriter pw);
void userSwitched();
} }
} }