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

am 83ddb523: Merge "Disable heads up when DISABLE_NOTIFICATION_ALERT" into lmp-dev

Browse Source 
* commit '83ddb523cb888cc9f2ac0d33d086f939af2adef0':
  Disable heads up when DISABLE_NOTIFICATION_ALERT
This commit is contained in:
Jason Monk
2014-08-05 17:31:41 +00:00
committed by Android Git Automerger
parent 0060fe8fda 966e258396
commit e0249e9fd1
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);
}
}
/**