diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-28 23:15:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-28 23:15:42 +0000 |
| commit | a46650530ffca36a7a062f4f1e159cc0421364ce (patch) | |
| tree | 3a92c1aedb28af3062b021722e4f6456a2dc023c /res | |
| parent | d37e0b6a4561047a0d8ff1f4f5b495644198a996 (diff) | |
| parent | 6b2f7c44711bfa936741de47fb505f0464f8e05e (diff) | |
| download | packages_apps_Settings-a46650530ffca36a7a062f4f1e159cc0421364ce.zip packages_apps_Settings-a46650530ffca36a7a062f4f1e159cc0421364ce.tar.gz packages_apps_Settings-a46650530ffca36a7a062f4f1e159cc0421364ce.tar.bz2 | |
Merge "Add temporary developer setting to use NuPlayer as default media player"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/xml/development_prefs.xml | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8c07fdf..90a37bf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4344,6 +4344,9 @@ <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] --> <string name="debug_hw_drawing_category">Hardware accelerated rendering</string> + <!-- Preference category for media development settings. [CHAR LIMIT=50] --> + <string name="media_category">Media</string> + <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] --> <string name="debug_monitoring_category">Monitoring</string> @@ -4392,6 +4395,11 @@ <!-- 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: show layout bounds information [CHAR LIMIT=25] --> <string name="debug_layout">Show layout bounds</string> <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] --> diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 50d7075..2a9e125 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -222,6 +222,16 @@ </PreferenceCategory> + <PreferenceCategory android:key="media_category" + android:title="@string/media_category"> + + <CheckBoxPreference + android:key="use_nuplayer" + android:title="@string/use_nuplayer" + android:summary="@string/use_nuplayer_summary"/> + + </PreferenceCategory> + <PreferenceCategory android:key="debug_monitoring_category" android:title="@string/debug_monitoring_category"> |