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

am 13bd3ed4: am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev

Browse Source 
* commit '13bd3ed4796fae13f0daaa8ce062fdd8effec737':
  Add multi user volume management
This commit is contained in:
Eric Laurent
2012-09-20 13:00:55 -07:00
committed by Android Git Automerger
parent fadd42395f 13bd3ed479
commit 2bb7e677b6
3 changed files with 78 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/provider/Settings.java
View File

@@ -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: