commit 2ce3443984aa038035ebda2c2d167e0fb8f6b721
author Chris Wren <cwren@android.com> Mon Mar 03 15:26:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 03 15:26:01 2014 +0000
tree 8d6bfc5ad3495a655ca78d798f2b83e04eac1719
parent 7f36c272c4d4a05a04a21f24865d33cf3294a2ab
parent 18765d7094fb85ebc7b529cbddee7513a455fa8e

Merge "rename heads up global setting: app part"

src/com/android/settings/DisplaySettings.java

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 06bd3b0..efd4705 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -38,9 +38,6 @@
 import android.provider.Settings.SettingNotFoundException;
 import android.util.Log;
 
-import com.android.internal.view.RotationPolicy;
-import com.android.settings.DreamSettings;
-
 import java.util.ArrayList;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -112,7 +109,7 @@
             updateHeadsUpMode(resolver);
             mHeadsUp.setOnPreferenceChangeListener(this);
             resolver.registerContentObserver(
-                    Settings.Global.getUriFor(Settings.Global.HEADS_UP),
+                    Settings.Global.getUriFor(Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED),
                     false, new ContentObserver(mHandler) {
                 @Override
                 public void onChange(boolean selfChange) {
@@ -255,11 +252,11 @@
 
     private void updateHeadsUpMode(ContentResolver resolver) {
         mHeadsUp.setChecked(Settings.Global.HEADS_UP_ON == Settings.Global.getInt(resolver,
-                Settings.Global.HEADS_UP, Settings.Global.HEADS_UP_OFF));
+                Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, Settings.Global.HEADS_UP_OFF));
     }
 
     private void setHeadsUpMode(ContentResolver resolver, boolean value) {
-        Settings.Global.putInt(resolver, Settings.Global.HEADS_UP,
+        Settings.Global.putInt(resolver, Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
                 value ? Settings.Global.HEADS_UP_ON : Settings.Global.HEADS_UP_OFF);
     }