diff options
| author | Eric Laurent <elaurent@google.com> | 2012-09-20 11:18:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-20 11:18:17 -0700 |
| commit | f9fac2c5fe3f304ee866b1afc3191d36835e96bd (patch) | |
| tree | 34a472708a40071f8642a4b6c741e297c9b2c16b /core/java/android/provider/Settings.java | |
| parent | 4dd3c3797060b35c8e6ebbbdd164c17c6db7b5ec (diff) | |
| parent | bc0fab1fc2db832ef86d8a33466ec4d68b103ca0 (diff) | |
| download | frameworks_base-f9fac2c5fe3f304ee866b1afc3191d36835e96bd.zip frameworks_base-f9fac2c5fe3f304ee866b1afc3191d36835e96bd.tar.gz frameworks_base-f9fac2c5fe3f304ee866b1afc3191d36835e96bd.tar.bz2 | |
Merge "Add multi user volume management" into jb-mr1-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index bb118b2..cc9abff 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -934,6 +934,7 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.POWER_SOUNDS_ENABLED); MOVED_TO_GLOBAL.add(Settings.Global.STAY_ON_WHILE_PLUGGED_IN); MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SLEEP_POLICY); + MOVED_TO_GLOBAL.add(Settings.Global.MODE_RINGER); } private static void lazyInitCache() { @@ -1497,6 +1498,12 @@ public final class Settings { @Deprecated public static final int WIFI_SLEEP_POLICY_NEVER = Global.WIFI_SLEEP_POLICY_NEVER; + /** + * @deprecated Use {@link android.provider.Settings.Global#MODE_RINGER} instead + */ + @Deprecated + public static final String MODE_RINGER = Global.MODE_RINGER; + //TODO: deprecate static IP constants /** * Whether to use static IP and other static network attributes. @@ -1666,13 +1673,6 @@ public final class Settings { public static final String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities"; - - /** - * Ringer mode. This is used internally, changing this value will not - * change the ringer mode. See AudioManager. - */ - public static final String MODE_RINGER = "mode_ringer"; - /** * Determines which streams are affected by ringer mode changes. The * stream type's bit should be set to 1 if it should be muted when going @@ -5738,7 +5738,11 @@ public final class Settings { */ public static final String WTF_IS_FATAL = "wtf_is_fatal"; - + /** + * Ringer mode. This is used internally, changing this value will not + * change the ringer mode. See AudioManager. + */ + public static final String MODE_RINGER = "mode_ringer"; // Populated lazily, guarded by class object: |