From 18765d7094fb85ebc7b529cbddee7513a455fa8e Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Sat, 1 Mar 2014 10:34:19 -0500 Subject: [PATCH] rename heads up global setting: app part Bug: 13208692 Depends-On: Ia020e4d63552ab4b8cbb8a37622c36776800a790 Change-Id: I73755ea40d7e741e9036a245bd9c70c976aeef1a --- src/com/android/settings/DisplaySettings.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 06bd3b03adb..efd47059583 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -38,9 +38,6 @@ import android.provider.Settings; 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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 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); }