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

Commit 838c8432 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Remove tuner from development settings" into mnc-dev

parents 32b96646 b1d9536e

res/xml/development_prefs.xml

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 
        android:summary="@string/runningservices_settings_summary"

        android:fragment="com.android.settings.applications.RunningServices" />



    <SwitchPreference

        android:key="tuner_ui"

        android:persistent="false"

        android:title="@string/system_ui_settings" />



    <PreferenceCategory android:key="debug_debugging_category"

            android:title="@string/debug_debugging_category">

src/com/android/settings/DevelopmentSettings.java

+0 −26
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
     */

    public static final String PREF_SHOW = "show";



    private static final ComponentName SYSUI_TUNER = new ComponentName("com.android.systemui",

            "com.android.systemui.tuner.TunerActivity");



    private static final String ENABLE_ADB = "enable_adb";

    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";

    private static final String ENABLE_TERMINAL = "enable_terminal";
@@ -270,8 +267,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private Dialog mAdbKeysDialog;

    private boolean mUnavailable;



    private SwitchPreference mTunerUiPref;



    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.DEVELOPMENT;
@@ -407,8 +402,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        mAllPrefs.add(mShowAllANRs);

        mResetSwitchPrefs.add(mShowAllANRs);



        mTunerUiPref = findAndInitSwitchPref(TUNER_UI_KEY);



        Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);

        if (hdcpChecking != null) {

            mAllPrefs.add(hdcpChecking);
@@ -608,7 +601,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        updateMobileDataAlwaysOnOptions();

        updateSimulateColorSpace();

        updateUSBAudioOptions();

        updateTweakUi();

    }



    private void resetDangerousOptions() {
@@ -1153,21 +1145,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        }

    }



    private void updateTweakUi() {

        updateSwitchPreference(mTunerUiPref, getActivity().getPackageManager()

                .getComponentEnabledSetting(SYSUI_TUNER)

                == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);

        mTunerUiPref.setOnPreferenceChangeListener(this);

    }



    private void writeTweakUi(Object newValue) {

        Boolean enabled = (Boolean) newValue;

        getActivity().getPackageManager().setComponentEnabledSetting(SYSUI_TUNER,

                enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                        : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                        PackageManager.DONT_KILL_APP);

    }



    private void updateUSBAudioOptions() {

        updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(),

                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0);
@@ -1766,9 +1743,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        } else if (preference == mSimulateColorSpace) {

            writeSimulateColorSpace(newValue);

            return true;

        } else if (preference == mTunerUiPref) {

            writeTweakUi(newValue);

            return true;

        }

        return false;

    }