Merge "Misc fix on settings themes." (fac57416) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+7 −20

Original line number	Diff line number	Diff line
		@@ -166,8 +166,8 @@
		android:parentActivityName="Settings">
		</activity>

		<activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge">
		<activity android:name="CreateShortcut"
		android:label="@string/settings_shortcut">
		<intent-filter>
		<action android:name="android.intent.action.CREATE_SHORTCUT"/>
		<category android:name="android.intent.category.DEFAULT"/>
		@@ -341,7 +341,6 @@
		</activity>

		<activity android:name=".Settings$WifiInfoActivity"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings$WifiSettingsActivity">
		<intent-filter>
		@@ -354,7 +353,6 @@
		</activity>

		<activity android:name=".wifi.WifiConfigInfo"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings$WifiSettingsActivity">
		<intent-filter>
		@@ -364,8 +362,7 @@
		</intent-filter>
		</activity>

		<activity android:name=".Settings$WifiAPITestActivity"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge">
		<activity android:name=".Settings$WifiAPITestActivity">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
		@@ -375,8 +372,7 @@
		android:value="com.android.settings.wifi.WifiAPITest" />
		</activity>

		<activity android:name=".wifi.WifiStatusTest"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge">
		<activity android:name=".wifi.WifiStatusTest">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
		@@ -460,7 +456,6 @@
		</activity-alias>

		<activity android:name=".bluetooth.DevicePickerActivity"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:label="@string/device_picker"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		@@ -966,7 +961,6 @@
		</activity>

		<activity android:name="Settings$DeviceInfoSettingsActivity"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:label="@string/device_info_settings"
		android:icon="@drawable/ic_settings_about"
		android:taskAffinity="com.android.settings"
		@@ -1391,7 +1385,6 @@
		</activity>

		<activity android:name="SetFullBackupPassword"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:exported="false">
		</activity>

		@@ -1431,7 +1424,6 @@

		<activity android:name="DeviceAdminAdd"
		android:label="@string/device_admin_add_title"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		<action android:name="android.app.action.ADD_DEVICE_ADMIN" />
		@@ -1466,7 +1458,6 @@

		<activity android:name="Settings$IccLockSettingsActivity"
		android:label="@string/sim_lock_settings"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:process="com.android.phone">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -1788,7 +1779,6 @@

		<activity android:name=".Settings$StatusActivity"
		android:label="@string/device_status_activity_title"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings$DeviceInfoSettingsActivity">
		<intent-filter>
		@@ -1803,7 +1793,6 @@
		<!-- Runs in the phone process since it needs access to the Phone object -->
		<activity android:name=".Settings$SimStatusActivity"
		android:label="@string/sim_status_title"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:process="com.android.phone">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -1817,7 +1806,6 @@
		<!-- Runs in the phone process since it needs access to the Phone object -->
		<activity android:name=".Settings$ImeiInformationActivity"
		android:label="@string/imei_information_title"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge"
		android:process="com.android.phone">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -2371,8 +2359,7 @@

		<activity android:name="Settings$ChooseAccountActivity"
		android:label="@string/header_add_an_account"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:theme="@style/Theme.SubSettingsDialogWhenLarge">
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.accounts.ChooseAccountActivity" />
		</activity>

res/layout/preview_seek_bar_view_pager.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@
		android:gravity="start\|center"
		android:text="@string/screen_zoom_preview_title"
		android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
		android:textColor="@color/seek_bar_preference_preview_text"
		android:importantForAccessibility="no" />
		</LinearLayout>

res/values/colors.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,6 @@
		<color name="message_icon_background_outgoing">#4285f4</color>
		<color name="message_icon_text_outgoing">#ffffffff</color>

		<color name="seek_bar_preference_preview_text">#fff</color>

		<color name="importance_disabled_slider_color">@*android:color/material_grey_300</color>
		<color name="importance_secondary_slider_color">#858383</color>

res/values/themes.xml

+1 −14

Original line number	Diff line number	Diff line
		@@ -195,13 +195,6 @@
		<item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
		</style>

		<style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">
		<!-- Redefine the ActionBar style for contentInsetStart -->
		<item name="android:actionBarStyle">@style/Theme.ActionBar</item>

		<item name="preferenceBackgroundColor">@drawable/preference_background</item>
		</style>

		<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
		<item name="android:windowTranslucentStatus">false</item>
		<item name="android:windowTranslucentNavigation">false</item>
		@@ -214,13 +207,6 @@
		<item name="*android:errorColor">@color/unlock_pattern_view_error_color</item>
		</style>

		<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
		<item name="preferenceTheme">@style/PreferenceTheme</item>
		<item name="android:actionBarWidgetTheme">@null</item>
		<item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.ActionBar</item>
		<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>
		@@ -241,6 +227,7 @@
		</style>

		<style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
		<item name="android:windowLightStatusBar">false</item>
		<item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
		<item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
		</style>

src/com/android/settings/SettingsActivity.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -387,15 +387,11 @@ public class SettingsActivity extends SettingsDrawerActivity
		final boolean isSubSettings = this instanceof SubSettings \|\|
		intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, false);

		// If this is a sub settings, then apply the SubSettings Theme for the ActionBar content insets
		// If this is a sub settings, then apply the SubSettings Theme for the ActionBar content
		// insets
		if (isSubSettings) {
		// Check also that we are not a Theme Dialog as we don't want to override them
		final int themeResId = getThemeResId();
		if (themeResId != R.style.Theme_DialogWhenLarge &&
		themeResId != R.style.Theme_SubSettingsDialogWhenLarge) {
		setTheme(R.style.Theme_SubSettings);
		}
		}

		setContentView(mIsShowingDashboard ?
		R.layout.settings_main_dashboard : R.layout.settings_main_prefs);