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

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

Browse Source 
* commit '8b2c19b5780bc2dedb51982b2a40c573e1c86157':
  Reword NuPlayer developer settings to say AwesomePlayer
This commit is contained in:
Lajos Molnar
2014-11-24 18:12:16 +00:00
committed by Android Git Automerger
parent ee47e0219e 8b2c19b578
commit 0a03478cea
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -4793,10 +4793,10 @@
<!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] --> <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
<string name="enable_opengl_traces_title">Enable OpenGL traces</string> <string name="enable_opengl_traces_title">Enable OpenGL traces</string>
<!-- UI debug setting: force use of NuPlayer [CHAR LIMIT=25] --> <!-- UI debug setting: force use of AwesomePlayer [CHAR LIMIT=25] -->
<string name="use_nuplayer">Use NuPlayer (experimental)</string> <string name="use_awesomeplayer">Use AwesomePlayer (deprecated)</string>
<!-- UI debug setting: force use of NuPlayer summary [CHAR LIMIT=50] --> <!-- UI debug setting: force use of AwesomePlayer summary [CHAR LIMIT=50] -->
<string name="use_nuplayer_summary">Use NuPlayer instead of AwesomePlayer</string> <string name="use_awesomeplayer_summary">Use AwesomePlayer instead of NuPlayer for most media playback</string>
<!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] --> <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
<string name="usb_audio_disable_routing">Disable USB audio routing</string> <string name="usb_audio_disable_routing">Disable USB audio routing</string>

6
res/xml/development_prefs.xml
View File

@@ -258,9 +258,9 @@
android:title="@string/media_category"> android:title="@string/media_category">
<SwitchPreference <SwitchPreference
android:key="use_nuplayer" android:key="use_awesomeplayer"
android:title="@string/use_nuplayer" android:title="@string/use_awesomeplayer"
android:summary="@string/use_nuplayer_summary"/> android:summary="@string/use_awesomeplayer_summary"/>
<SwitchPreference <SwitchPreference
android:key="usb_audio" android:key="usb_audio"

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

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