Merge "Quantum.Light for all Settings activities" (56c17b4d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+30 −30

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@
		</activity>

		<activity android:name=".wifi.WifiSettingsForSetupWizardXL"
		android:theme="@android:style/Theme.Holo.NoActionBar"
		android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
		android:screenOrientation="behind"
		android:clearTaskOnLaunch="true"
		android:windowSoftInputMode="adjustResize"
		@@ -205,7 +205,7 @@
		</activity>

		<activity android:name=".wifi.WifiInfo"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings$WifiSettingsActivity">
		<intent-filter>
		@@ -216,7 +216,7 @@
		</activity>

		<activity android:name=".wifi.WifiConfigInfo"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings$WifiSettingsActivity">
		<intent-filter>
		@@ -227,7 +227,7 @@
		</activity>

		<activity android:name=".wifi.WifiAPITest"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge">
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
		@@ -236,7 +236,7 @@
		</activity>

		<activity android:name=".wifi.WifiStatusTest"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge">
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
		@@ -297,7 +297,7 @@
		</activity-alias>

		<activity android:name=".bluetooth.DevicePickerActivity"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:label="@string/device_picker"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		@@ -385,7 +385,7 @@

		<activity android:name="DateTimeSettingsSetupWizard"
		android:label="@string/date_and_time"
		android:theme="@android:style/Theme.Holo.NoActionBar"
		android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
		android:screenOrientation="behind">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -500,7 +500,7 @@

		<activity android:name=".inputmethod.UserDictionaryAddWordActivity"
		android:label="@string/user_dict_settings_title"
		android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
		android:theme="@android:style/Theme.Quantum.Light.Dialog.NoActionBar"
		android:windowSoftInputMode="stateVisible"
		android:noHistory="true"
		android:excludeFromRecents="true">
		@@ -599,7 +599,7 @@
		</activity-alias>

		<activity android:name="Settings$DeviceInfoSettingsActivity"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:label="@string/device_info_settings"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		@@ -617,7 +617,7 @@

		<activity android:name="SettingsLicenseActivity"
		android:label="@string/settings_license_activity_title"
		android:theme="@android:style/Theme.Holo.Panel"
		android:theme="@android:style/Theme.Quantum.Light.Panel"
		android:configChanges="orientation\|screenSize">
		<intent-filter>
		<action android:name="android.settings.LICENSE" />
		@@ -627,7 +627,7 @@

		<activity android:name="SettingsSafetyLegalActivity"
		android:label="@string/settings_safetylegal_activity_title"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.settings.SAFETY" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -891,7 +891,7 @@
		</activity>

		<activity android:name="SetFullBackupPassword"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:exported="false">
		</activity>

		@@ -935,7 +935,7 @@

		<activity android:name="DeviceAdminAdd"
		android:label="@string/device_admin_add_title"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		<action android:name="android.app.action.ADD_DEVICE_ADMIN" />
		@@ -945,7 +945,7 @@

		<activity android:name="IccLockSettings"
		android:label="@string/sim_lock_settings"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:process="com.android.phone">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -1077,7 +1077,7 @@
		<!-- Runs in the phone process since it needs access to the Phone object -->
		<activity android:name=".deviceinfo.Status"
		android:label="@string/device_status_activity_title"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
		android:process="com.android.phone">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -1104,7 +1104,7 @@
		</activity>

		<activity android:name=".deviceinfo.MiscFilesHandler"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"/>

		<activity android:name="ApnEditor"
		android:label="@string/apn_edit">
		@@ -1205,7 +1205,7 @@
		</activity-alias>

		<activity android:name=".AppPicker" android:label="@string/select_application"
		android:theme="@android:style/Theme.Holo.Dialog" />
		android:theme="@android:style/Theme.Quantum.Light.Dialog" />

		<activity android:name="Settings$UsbSettingsActivity"
		android:label="@string/storage_title_usb"
		@@ -1239,7 +1239,7 @@
		<activity android:name=".bluetooth.BluetoothPairingDialog"
		android:label="@string/bluetooth_pairing_request"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1272,7 +1272,7 @@
		android:label="@string/bluetooth_permission_request"
		android:excludeFromRecents="true"
		android:permission="android.permission.BLUETOOTH"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
		<action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
		@@ -1293,7 +1293,7 @@
		android:label="@string/bluetooth_pairing_request"
		android:excludeFromRecents="true"
		android:permission="android.permission.BLUETOOTH"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		</activity>

		<receiver android:name=".bluetooth.BluetoothPairingRequest">
		@@ -1316,7 +1316,7 @@
		android:label="@string/bluetooth_connection_permission_request"
		android:excludeFromRecents="true"
		android:permission="android.permission.BLUETOOTH_ADMIN"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
		<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
		@@ -1326,7 +1326,7 @@

		<activity android:name="ActivityPicker"
		android:label="@string/activity_picker_label"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
		android:finishOnCloseSystemDialogs="true">
		<intent-filter>
		<action android:name="android.intent.action.PICK_ACTIVITY" />
		@@ -1438,7 +1438,7 @@
		<!-- Standard picker for widgets -->
		<activity android:name="AppWidgetPickActivity"
		android:label="@string/widget_picker_title"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
		android:finishOnCloseSystemDialogs="true">
		<intent-filter>
		<action android:name="android.appwidget.action.APPWIDGET_PICK" />
		@@ -1447,7 +1447,7 @@
		</activity>

		<activity android:name="AllowBindAppWidgetActivity"
		android:theme="@*android:style/Theme.Holo.Dialog.Alert"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
		android:finishOnCloseSystemDialogs="true"
		android:excludeFromRecents="true">
		<intent-filter>
		@@ -1459,7 +1459,7 @@
		<!-- Special picker for keyguard widgets -->
		<activity android:name="KeyguardAppWidgetPickActivity"
		android:label="@string/widget_picker_title"
		android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"
		android:theme="@android:style/Theme.Quantum.Wallpaper.NoTitleBar"
		android:permission="android.permission.BIND_KEYGUARD_APPWIDGET"
		android:finishOnCloseSystemDialogs="true">
		<intent-filter>
		@@ -1548,13 +1548,13 @@
		<activity android:name="com.android.settings.accounts.ChooseAccountActivity"
		android:label="@string/header_add_an_account"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
		android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"/>

		<activity android:name=".CryptKeeper"
		android:immersive="true"
		android:launchMode="singleTop"
		android:excludeFromRecents="true"
		android:theme="@android:style/Theme.Holo.NoActionBar"
		android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
		android:configChanges="keyboard\|keyboardHidden\|uiMode"
		android:windowSoftInputMode="adjustResize">
		<intent-filter android:priority="10">
		@@ -1653,7 +1653,7 @@
		<activity android:name=".nfc.PaymentDefaultDialog"
		android:label="@string/nfc_payment_set_default_label"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1663,7 +1663,7 @@
		<activity android:name=".SmsDefaultDialog"
		android:label="@string/sms_application_title"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1673,7 +1673,7 @@
		<activity android:name=".ActiveNetworkScorerDialog"
		android:label="@string/network_scorer_application"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.net.scoring.CHANGE_ACTIVE" />
		<category android:name="android.intent.category.DEFAULT" />

res/values/styles.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@
		</style>


		<style name="TextAppearance" parent="android:TextAppearance">
		<style name="TextAppearance" parent="android:TextAppearance.Quantum">
		</style>

		<style name="TextAppearance.info_label">
		@@ -75,7 +75,7 @@
		<item name="android:textStyle">normal</item>
		</style>

		<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance">
		<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Quantum">
		<item name="android:gravity">center</item>
		<item name="android:singleLine">true</item>
		<item name="android:textStyle">bold</item>
		@@ -86,7 +86,7 @@
		<item name="android:windowContentOverlay">@null</item>
		</style>

		<style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
		<style name="Theme.CreateShortCut" parent="android:Theme.Quantum.Light.DialogWhenLarge">
		</style>

		<style name="PreferenceHeaderPanelSinglePane">
		@@ -205,18 +205,18 @@
		<item name="android:windowIsFloating">true</item>
		</style>

		<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Holo.NoActionBar">
		<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar">
		<item name="android:background">#ff000000</item>
		</style>

		<style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
		<style name="SecurityPreferenceButtonContainer" parent="@android:style/Widget.Quantum.Light.SegmentedButton">
		<item name="android:layout_width">match_parent</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:weightSum">2</item>
		<item name="android:dividerPadding">8dip</item>
		</style>

		<style name="SecurityPreferenceButton" parent="@android:style/Widget.Holo.Button.Borderless">
		<style name="SecurityPreferenceButton" parent="@android:style/Widget.Quantum.Light.Button.Borderless">
		<item name="android:layout_width">0dip</item>
		<item name="android:layout_weight">1</item>
		<item name="android:layout_height">wrap_content</item>
		@@ -242,11 +242,11 @@
		<item name="android:widgetLayout">@layout/preference_inputmethod_widget</item>
		</style>

		<style name="TextAppearance.Switch" parent="@*android:style/TextAppearance.Holo.Widget.Switch">
		<style name="TextAppearance.Switch" parent="@*android:style/TextAppearance.Quantum.Widget.Switch">
		<item name="android:textAllCaps">true</item>
		</style>

		<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.DeviceDefault.Small">
		<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Quantum.Small">
		<item name="android:textAllCaps">true</item>
		<item name="android:textStyle">bold</item>
		</style>

res/values/themes.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -21,40 +21,40 @@
		<attr name="setup_divider_color" format="reference" />
		<attr name="wifi_signal" format="reference" />

		<style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar">
		<style name="SetupWizardWifiTheme" parent="android:Theme.Quantum.NoActionBar">
		<item name="android:windowSoftInputMode">adjustPan</item>
		<item name="@android:preferencePanelStyle">@android:style/PreferencePanel.Dialog</item>
		<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
		<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
		<item name="ic_wps">@drawable/ic_wps_dark</item>
		<item name="setup_divider_color">@color/setup_divider_color_dark</item>
		<item name="wifi_signal">@drawable/wifi_signal_dark</item>
		</style>

		<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Holo.Light.NoActionBar">
		<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Quantum.Light.NoActionBar">
		<item name="android:windowSoftInputMode">adjustPan</item>
		<item name="@android:preferencePanelStyle">@android:style/PreferencePanel.Dialog</item>
		<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
		<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
		<item name="ic_wps">@drawable/ic_wps_light</item>
		<item name="setup_divider_color">@color/setup_divider_color_light</item>
		<item name="wifi_signal">@drawable/wifi_signal_light</item>
		</style>

		<style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
		<style name="Theme.WifiDialog" parent="@*android:style/Theme.Quantum.Dialog.Alert">
		<item name="android:windowSoftInputMode">adjustResize</item>
		<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
		<item name="ic_wps">@drawable/ic_wps_dark</item>
		<item name="wifi_signal">@drawable/wifi_signal_dark</item>
		</style>

		<style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Holo.Light.Dialog.Alert">
		<style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		<item name="android:windowSoftInputMode">adjustResize</item>
		<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
		<item name="ic_wps">@drawable/ic_wps_light</item>
		<item name="wifi_signal">@drawable/wifi_signal_light</item>
		</style>