PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

Browse Source 
* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
  Reword NuPlayer developer settings to say AwesomePlayer
This commit is contained in:
Lajos Molnar
2014-11-24 18:05:54 +00:00
committed by Android Git Automerger
parent 877e9de67b 5f9ee5e46c
commit 8b2c19b578
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/DevelopmentSettings.java
View File

@@ -116,7 +116,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
private static final String USE_NUPLAYER_KEY = "use_nuplayer";
private static final String USE_AWESOMEPLAYER_KEY = "use_awesomeplayer";
private static final String USB_AUDIO_KEY = "usb_audio";
private static final String USE_AWESOMEPLAYER_PROPERTY = "persist.sys.media.use-awesome";
private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
@@ -223,7 +223,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private ListPreference mSimulateColorSpace;
private SwitchPreference mUseNuplayer;
private SwitchPreference mUseAwesomePlayer;
private SwitchPreference mUSBAudio;
private SwitchPreference mImmediatelyDestroyActivities;
@@ -344,7 +344,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
mUseNuplayer = findAndInitSwitchPref(USE_NUPLAYER_KEY);
mUseAwesomePlayer = findAndInitSwitchPref(USE_AWESOMEPLAYER_KEY);
mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
mImmediatelyDestroyActivities = (SwitchPreference) findPreference(
@@ -1001,12 +1001,12 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private void updateUseNuplayerOptions() {
updateSwitchPreference(
mUseNuplayer, !SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false));
mUseAwesomePlayer, SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false));
}
private void writeUseNuplayerOptions() {
private void writeUseAwesomePlayerOptions() {
SystemProperties.set(
USE_AWESOMEPLAYER_PROPERTY, mUseNuplayer.isChecked() ? "false" : "true");
USE_AWESOMEPLAYER_PROPERTY, mUseAwesomePlayer.isChecked() ? "true" : "false");
pokeSystemProperties();
}
@@ -1450,8 +1450,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
writeWifiAggressiveHandoverOptions();
} else if (preference == mWifiAllowScansWithTraffic) {
writeWifiAllowScansWithTrafficOptions();
} else if (preference == mUseNuplayer) {
writeUseNuplayerOptions();
} else if (preference == mUseAwesomePlayer) {
writeUseAwesomePlayerOptions();
} else if (preference == mUSBAudio) {
writeUSBAudioOptions();
} else {