Merge "Add SystemUI Tuner Control" into mnc-dev

This commit is contained in:
Jason Monk
2015-05-12 15:03:40 +00:00
committed by Android (Google) Code Review
3 changed files with 35 additions and 0 deletions

View File

@@ -6591,4 +6591,7 @@
<!-- Link to an apps notification settings [CHAR LIMIT=50] --> <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
<string name="app_notification_preferences">App notification preferences</string> <string name="app_notification_preferences">App notification preferences</string>
<!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
<string name="system_ui_settings">Show SystemUI Tuner</string>
</resources> </resources>

View File

@@ -60,6 +60,11 @@
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="tweak_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">

View File

@@ -97,6 +97,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
*/ */
public static final String PREF_SHOW = "show"; public static final String PREF_SHOW = "show";
private static final ComponentName SYSUI_TWEAK = 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";
@@ -112,6 +115,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private static final String BUGREPORT = "bugreport"; private static final String BUGREPORT = "bugreport";
private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power"; private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power";
private static final String OPENGL_TRACES_PROPERTY = "debug.egl.trace"; private static final String OPENGL_TRACES_PROPERTY = "debug.egl.trace";
private static final String TWEAK_UI_KEY = "tweak_ui";
private static final String DEBUG_APP_KEY = "debug_app"; private static final String DEBUG_APP_KEY = "debug_app";
private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger"; private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
@@ -260,6 +264,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private Dialog mAdbKeysDialog; private Dialog mAdbKeysDialog;
private boolean mUnavailable; private boolean mUnavailable;
private SwitchPreference mTweakUiPref;
@Override @Override
protected int getMetricsCategory() { protected int getMetricsCategory() {
return MetricsLogger.DEVELOPMENT; return MetricsLogger.DEVELOPMENT;
@@ -392,6 +398,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
mAllPrefs.add(mShowAllANRs); mAllPrefs.add(mShowAllANRs);
mResetSwitchPrefs.add(mShowAllANRs); mResetSwitchPrefs.add(mShowAllANRs);
mTweakUiPref = findAndInitSwitchPref(TWEAK_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);
@@ -593,6 +601,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
updateSimulateColorSpace(); updateSimulateColorSpace();
updateUseNuplayerOptions(); updateUseNuplayerOptions();
updateUSBAudioOptions(); updateUSBAudioOptions();
updateTweakUi();
} }
private void resetDangerousOptions() { private void resetDangerousOptions() {
@@ -1069,6 +1078,21 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
} }
private void updateTweakUi() {
updateSwitchPreference(mTweakUiPref, getActivity().getPackageManager()
.getComponentEnabledSetting(SYSUI_TWEAK)
== PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
mTweakUiPref.setOnPreferenceChangeListener(this);
}
private void writeTweakUi(Object newValue) {
Boolean enabled = (Boolean) newValue;
getActivity().getPackageManager().setComponentEnabledSetting(SYSUI_TWEAK,
enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
}
private void updateUseNuplayerOptions() { private void updateUseNuplayerOptions() {
updateSwitchPreference( updateSwitchPreference(
mUseAwesomePlayer, SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false)); mUseAwesomePlayer, SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false));
@@ -1669,6 +1693,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} else if (preference == mSimulateColorSpace) { } else if (preference == mSimulateColorSpace) {
writeSimulateColorSpace(newValue); writeSimulateColorSpace(newValue);
return true; return true;
} else if (preference == mTweakUiPref) {
writeTweakUi(newValue);
return true;
} }
return false; return false;
} }