summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2014-03-01 10:34:51 -0500
committerChris Wren <cwren@android.com>2014-03-03 10:15:53 -0500
commit10d82dfbfb4bcc0899bd1e8dc04e97c2ea39a752 (patch)
tree458f36f871e1f7331cc7774321533c2332e6e71c /packages
parentc18cd393f65146fac03a9bdfa45380a69460ee98 (diff)
downloadframeworks_base-10d82dfbfb4bcc0899bd1e8dc04e97c2ea39a752.zip
frameworks_base-10d82dfbfb4bcc0899bd1e8dc04e97c2ea39a752.tar.gz
frameworks_base-10d82dfbfb4bcc0899bd1e8dc04e97c2ea39a752.tar.bz2
rename heads up global setting: base part
Bug: 13208692 Change-Id: Ia020e4d63552ab4b8cbb8a37622c36776800a790
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index d3f68cf..6718de1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -313,7 +313,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
public void onChange(boolean selfChange) {
boolean wasUsing = mUseHeadsUp;
mUseHeadsUp = ENABLE_HEADS_UP && Settings.Global.HEADS_UP_OFF != Settings.Global.getInt(
- mContext.getContentResolver(), Settings.Global.HEADS_UP,
+ mContext.getContentResolver(), Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
Settings.Global.HEADS_UP_OFF);
mHeadsUpTicker = mUseHeadsUp && 0 != Settings.Global.getInt(
mContext.getContentResolver(), SETTING_HEADS_UP_TICKER, 0);
@@ -377,7 +377,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
mHeadsUpObserver.onChange(true); // set up
if (ENABLE_HEADS_UP) {
mContext.getContentResolver().registerContentObserver(
- Settings.Global.getUriFor(Settings.Global.HEADS_UP), true,
+ Settings.Global.getUriFor(Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED), true,
mHeadsUpObserver);
mContext.getContentResolver().registerContentObserver(
Settings.Global.getUriFor(SETTING_HEADS_UP_TICKER), true,