Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3245a05 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

Reword NuPlayer developer settings to say AwesomePlayer 

Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c
parent 7090c92f

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -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>

res/xml/development_prefs.xml

+3 −3
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/DevelopmentSettings.java

+8 −8
Original line number Diff line number Diff line
@@ -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 {