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

resolved conflicts for merge of 769ba03b to master

Browse Source 
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
This commit is contained in:
Colin Cross
2015-07-23 21:43:07 -07:00
parent e9f9ea3aff 769ba03b8f
commit dab025bdff
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,9 +102,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";
@@ -275,8 +272,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private Dialog mAdbKeysDialog;
private boolean mUnavailable;
private SwitchPreference mTunerUiPref;
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVELOPMENT;
@@ -412,8 +407,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);
@@ -634,7 +627,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
updateMobileDataAlwaysOnOptions();
updateSimulateColorSpace();
updateUSBAudioOptions();
updateTweakUi();
}
private void resetDangerousOptions() {
@@ -1179,21 +1171,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);
@@ -1792,9 +1769,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} else if (preference == mSimulateColorSpace) {
writeSimulateColorSpace(newValue);
return true;
} else if (preference == mTunerUiPref) {
writeTweakUi(newValue);
return true;
}
return false;
}