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

Disable heads up when DISABLE_NOTIFICATION_ALERT

Browse Source 
When notification alerts are disabled also turn off heads up. This
will fall back to the old behavior, which can allow the fullscreen
intent to be triggered instead.

Bug: 14157742
Change-Id: I4b6e3d9383894b1674d600c374ff8968ca53513e
This commit is contained in:
Jason Monk
2014-07-31 12:42:25 -04:00
committed by Dan Sandler
parent 96caa68279
commit f701954d4e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,7 @@ public abstract class BaseStatusBar extends SystemUI implements
private Locale mLocale;
protected boolean mUseHeadsUp = false;
protected boolean mHeadsUpTicker = false;
protected boolean mDisableNotificationAlerts = false;
protected IDreamManager mDreamManager;
PowerManager mPowerManager;

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

@@ -367,7 +367,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
@Override
public void onChange(boolean selfChange) {
boolean wasUsing = mUseHeadsUp;
mUseHeadsUp = ENABLE_HEADS_UP && Settings.Global.HEADS_UP_OFF != Settings.Global.getInt(
mUseHeadsUp = ENABLE_HEADS_UP && !mDisableNotificationAlerts
&& Settings.Global.HEADS_UP_OFF != Settings.Global.getInt(
mContext.getContentResolver(), Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
Settings.Global.HEADS_UP_OFF);
mHeadsUpTicker = mUseHeadsUp && 0 != Settings.Global.getInt(
@@ -1930,6 +1931,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
animateStatusBarShow(mNotificationIconArea, animate);
}
}
if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) != 0) {
mDisableNotificationAlerts =
(state & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) != 0;
mHeadsUpObserver.onChange(true);
}
}
/**