Merge "App info > storage updates" into mnc-dev
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a0dd581..76fc04f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -30,6 +30,8 @@
</style>
<style name="SetupWizardTheme" parent="SuwThemeMaterial">
+ <!-- For all Alert Dialogs -->
+ <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -50,6 +52,8 @@
</style>
<style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
+ <!-- For all Alert Dialogs -->
+ <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -160,6 +164,10 @@
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
+ <style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
+ <item name="android:windowSoftInputMode">adjustResize</item>
+ </style>
+
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 7ab44ca..39866c9 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -61,7 +61,7 @@
android:fragment="com.android.settings.applications.RunningServices" />
<SwitchPreference
- android:key="tweak_ui"
+ android:key="tuner_ui"
android:persistent="false"
android:title="@string/system_ui_settings" />
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4d89bf5..314e70a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -97,7 +97,7 @@
*/
public static final String PREF_SHOW = "show";
- private static final ComponentName SYSUI_TWEAK = new ComponentName("com.android.systemui",
+ private static final ComponentName SYSUI_TUNER = new ComponentName("com.android.systemui",
"com.android.systemui.tuner.TunerActivity");
private static final String ENABLE_ADB = "enable_adb";
@@ -115,7 +115,7 @@
private static final String BUGREPORT = "bugreport";
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 TWEAK_UI_KEY = "tweak_ui";
+ private static final String TUNER_UI_KEY = "tuner_ui";
private static final String DEBUG_APP_KEY = "debug_app";
private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
@@ -264,7 +264,7 @@
private Dialog mAdbKeysDialog;
private boolean mUnavailable;
- private SwitchPreference mTweakUiPref;
+ private SwitchPreference mTunerUiPref;
@Override
protected int getMetricsCategory() {
@@ -398,7 +398,7 @@
mAllPrefs.add(mShowAllANRs);
mResetSwitchPrefs.add(mShowAllANRs);
- mTweakUiPref = findAndInitSwitchPref(TWEAK_UI_KEY);
+ mTunerUiPref = findAndInitSwitchPref(TUNER_UI_KEY);
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
@@ -1079,15 +1079,15 @@
}
private void updateTweakUi() {
- updateSwitchPreference(mTweakUiPref, getActivity().getPackageManager()
- .getComponentEnabledSetting(SYSUI_TWEAK)
+ updateSwitchPreference(mTunerUiPref, getActivity().getPackageManager()
+ .getComponentEnabledSetting(SYSUI_TUNER)
== PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
- mTweakUiPref.setOnPreferenceChangeListener(this);
+ mTunerUiPref.setOnPreferenceChangeListener(this);
}
private void writeTweakUi(Object newValue) {
Boolean enabled = (Boolean) newValue;
- getActivity().getPackageManager().setComponentEnabledSetting(SYSUI_TWEAK,
+ getActivity().getPackageManager().setComponentEnabledSetting(SYSUI_TUNER,
enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
@@ -1693,7 +1693,7 @@
} else if (preference == mSimulateColorSpace) {
writeSimulateColorSpace(newValue);
return true;
- } else if (preference == mTweakUiPref) {
+ } else if (preference == mTunerUiPref) {
writeTweakUi(newValue);
return true;
}