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

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

Browse Source
This commit is contained in:
Jason Monk
2015-07-22 19:29:59 +00:00
committed by Android (Google) Code Review
parent 32b96646ee b1d9536e58
commit 838c843217
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_prefs.xml
View File

@@ -60,11 +60,6 @@
android:summary="@string/runningservices_settings_summary" android:summary="@string/runningservices_settings_summary"
android:fragment="com.android.settings.applications.RunningServices" /> 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" <PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category"> android:title="@string/debug_debugging_category">

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

@@ -101,9 +101,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
*/ */
public static final String PREF_SHOW = "show"; 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 ENABLE_ADB = "enable_adb";
private static final String CLEAR_ADB_KEYS = "clear_adb_keys"; private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
private static final String ENABLE_TERMINAL = "enable_terminal"; private static final String ENABLE_TERMINAL = "enable_terminal";
@@ -270,8 +267,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private Dialog mAdbKeysDialog; private Dialog mAdbKeysDialog;
private boolean mUnavailable; private boolean mUnavailable;
private SwitchPreference mTunerUiPref;
@Override @Override
protected int getMetricsCategory() { protected int getMetricsCategory() {
return MetricsLogger.DEVELOPMENT; return MetricsLogger.DEVELOPMENT;
@@ -407,8 +402,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
mAllPrefs.add(mShowAllANRs); mAllPrefs.add(mShowAllANRs);
mResetSwitchPrefs.add(mShowAllANRs); mResetSwitchPrefs.add(mShowAllANRs);
mTunerUiPref = findAndInitSwitchPref(TUNER_UI_KEY);
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY); Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) { if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking); mAllPrefs.add(hdcpChecking);
@@ -608,7 +601,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
updateMobileDataAlwaysOnOptions(); updateMobileDataAlwaysOnOptions();
updateSimulateColorSpace(); updateSimulateColorSpace();
updateUSBAudioOptions(); updateUSBAudioOptions();
updateTweakUi();
} }
private void resetDangerousOptions() { 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() { private void updateUSBAudioOptions() {
updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(), updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(),
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0); Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0);
@@ -1766,9 +1743,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} else if (preference == mSimulateColorSpace) { } else if (preference == mSimulateColorSpace) {
writeSimulateColorSpace(newValue); writeSimulateColorSpace(newValue);
return true; return true;
} else if (preference == mTunerUiPref) {
writeTweakUi(newValue);
return true;
} }
return false; return false;
} }