Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e9832e..cfb5753 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3385,17 +3385,17 @@
<!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
<string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
<!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
- <string name="oem_unlock_enable">Enable OEM unlock</string>
+ <string name="oem_unlock_enable">OEM unlocking</string>
<!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
- <string name="oem_unlock_enable_summary">Allow the device to be OEM unlocked</string>
+ <string name="oem_unlock_enable_summary">Allow the bootloader to be unlocked</string>
<!-- Message to enter device PIN to enable OEM unlock -->
<string name="oem_unlock_enable_pin_prompt">Enter your PIN</string>
<!-- Explanation to enter device pin to enable OEM unlock -->
<string name="oem_unlock_enable_pin_description">Enter your device PIN to enable OEM unlock</string>
<!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
- <string name="confirm_enable_oem_unlock_title">Warning</string>
- <!-- Confirmation dialog message to ensure user wishes to enable OEM unlock and disable theft protection features -->
- <string name="confirm_enable_oem_unlock_text">Enabling OEM unlock disables theft protection features on this device and may void your warranty. Continue?</string>
+ <string name="confirm_enable_oem_unlock_title">Allow OEM unlocking?</string>
+ <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+ <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</string>
<!-- Setting Checkbox title whether to show options for wireless display certification -->
@@ -4785,10 +4785,10 @@
<!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
<string name="enable_opengl_traces_title">Enable OpenGL traces</string>
- <!-- UI debug setting: force use of NuPlayer [CHAR LIMIT=25] -->
- <string name="use_nuplayer">Use NuPlayer (experimental)</string>
- <!-- UI debug setting: force use of NuPlayer summary [CHAR LIMIT=50] -->
- <string name="use_nuplayer_summary">Use NuPlayer instead of AwesomePlayer</string>
+ <!-- UI debug setting: force use of AwesomePlayer [CHAR LIMIT=25] -->
+ <string name="use_awesomeplayer">Use AwesomePlayer (deprecated)</string>
+ <!-- UI debug setting: force use of AwesomePlayer summary [CHAR LIMIT=50] -->
+ <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] -->
<string name="usb_audio_disable_routing">Disable USB audio routing</string>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 2fb3033..f31d556 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -251,9 +251,9 @@
android:title="@string/media_category">
<SwitchPreference
- android:key="use_nuplayer"
- android:title="@string/use_nuplayer"
- android:summary="@string/use_nuplayer_summary"/>
+ android:key="use_awesomeplayer"
+ android:title="@string/use_awesomeplayer"
+ android:summary="@string/use_awesomeplayer_summary"/>
<SwitchPreference
android:key="usb_audio"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4af2baf..a001fd7 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -116,7 +116,7 @@
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 @@
private ListPreference mSimulateColorSpace;
- private SwitchPreference mUseNuplayer;
+ private SwitchPreference mUseAwesomePlayer;
private SwitchPreference mUSBAudio;
private SwitchPreference mImmediatelyDestroyActivities;
@@ -344,7 +344,7 @@
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 @@
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();
}
@@ -1291,7 +1291,7 @@
new AlertDialog.Builder(getActivity())
.setTitle(R.string.confirm_enable_oem_unlock_title)
.setMessage(R.string.confirm_enable_oem_unlock_text)
- .setPositiveButton(R.string.yes, onConfirmListener)
+ .setPositiveButton(R.string.enable_text, onConfirmListener)
.setNegativeButton(android.R.string.cancel, null)
.create()
.show();
@@ -1450,8 +1450,8 @@
writeWifiAggressiveHandoverOptions();
} else if (preference == mWifiAllowScansWithTraffic) {
writeWifiAllowScansWithTrafficOptions();
- } else if (preference == mUseNuplayer) {
- writeUseNuplayerOptions();
+ } else if (preference == mUseAwesomePlayer) {
+ writeUseAwesomePlayerOptions();
} else if (preference == mUSBAudio) {
writeUSBAudioOptions();
} else {