Merge "Material theme" (08a7d554) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+18 −18

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

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

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

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

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

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

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

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

		<receiver android:name=".bluetooth.BluetoothPairingRequest">
		@@ -1274,7 +1274,7 @@
		android:label="@string/bluetooth_connection_permission_request"
		android:excludeFromRecents="true"
		android:permission="android.permission.BLUETOOTH_ADMIN"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Material.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" />
		@@ -1284,7 +1284,7 @@

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

		<activity android:name="AllowBindAppWidgetActivity"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
		android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
		android:finishOnCloseSystemDialogs="true"
		android:excludeFromRecents="true">
		<intent-filter>
		@@ -1417,7 +1417,7 @@
		<!-- Special picker for keyguard widgets -->
		<activity android:name="KeyguardAppWidgetPickActivity"
		android:label="@string/widget_picker_title"
		android:theme="@android:style/Theme.Quantum.Wallpaper.NoTitleBar"
		android:theme="@android:style/Theme.Material.Wallpaper.NoTitleBar"
		android:permission="android.permission.BIND_KEYGUARD_APPWIDGET"
		android:finishOnCloseSystemDialogs="true">
		<intent-filter>
		@@ -1512,7 +1512,7 @@
		android:immersive="true"
		android:launchMode="singleTop"
		android:excludeFromRecents="true"
		android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
		android:theme="@android:style/Theme.Material.Light.NoActionBar"
		android:configChanges="keyboard\|keyboardHidden\|uiMode"
		android:windowSoftInputMode="adjustResize"
		android:screenOrientation="nosensor">
		@@ -1612,7 +1612,7 @@
		<activity android:name=".nfc.PaymentDefaultDialog"
		android:label="@string/nfc_payment_set_default_label"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1622,7 +1622,7 @@
		<activity android:name=".SmsDefaultDialog"
		android:label="@string/sms_application_title"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1632,7 +1632,7 @@
		<activity android:name=".ActiveNetworkScorerDialog"
		android:label="@string/network_scorer_application"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
		android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.net.scoring.CHANGE_ACTIVE" />
		<category android:name="android.intent.category.DEFAULT" />

res/drawable/data_usage_bar.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,18 +16,18 @@

		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@android:id/background">
		<nine-patch android:src="@*android:drawable/progress_qntm_alpha"
		android:tint="@color/quantum_empty_color_light" />
		<nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
		android:tint="@color/material_empty_color_light" />
		</item>
		<item android:id="@android:id/secondaryProgress">
		<scale android:scaleWidth="100%">
		<nine-patch android:src="@*android:drawable/progress_qntm_alpha"
		<nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
		android:tint="?android:attr/colorControlActivated" />
		</scale>
		</item>
		<item android:id="@android:id/progress">
		<scale android:scaleWidth="100%">
		<nine-patch android:src="@*android:drawable/progress_primary_qntm_alpha"
		<nine-patch android:src="@*android:drawable/progress_primary_mtrl_alpha"
		android:tint="?android:attr/colorControlActivated" />
		</scale>
		</item>

res/drawable/switch_inner.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,21 +16,21 @@

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_enabled="false" android:state_checked="true">
		<bitmap android:src="@*android:drawable/btn_switch_to_off_qntm_000"
		<bitmap android:src="@*android:drawable/btn_switch_to_off_mtrl_000"
		android:tint="?android:attr/colorControlNormal"
		android:alpha="?android:attr/disabledAlpha" />
		</item>
		<item android:state_enabled="false">
		<bitmap android:src="@*android:drawable/btn_switch_to_on_qntm_000"
		<bitmap android:src="@*android:drawable/btn_switch_to_on_mtrl_000"
		android:tint="?android:attr/colorControlNormal"
		android:alpha="?android:attr/disabledAlpha" />
		</item>
		<item android:state_checked="true">
		<bitmap android:src="@*android:drawable/btn_switch_to_off_qntm_000"
		<bitmap android:src="@*android:drawable/btn_switch_to_off_mtrl_000"
		android:tint="@color/switch_accent_color" />
		</item>
		<item>
		<bitmap android:src="@*android:drawable/btn_switch_to_on_qntm_000"
		<bitmap android:src="@*android:drawable/btn_switch_to_on_mtrl_000"
		android:tint="?android:attr/colorControlNormal" />
		</item>
		</selector>

res/drawable/switch_track.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,11 +16,11 @@

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_checked="true">
		<nine-patch android:src="@*android:drawable/switch_track_qntm_alpha"
		<nine-patch android:src="@*android:drawable/switch_track_mtrl_alpha"
		android:tint="@color/switch_accent_color" />
		</item>
		<item>
		<nine-patch android:src="@*android:drawable/switch_track_qntm_alpha"
		<nine-patch android:src="@*android:drawable/switch_track_mtrl_alpha"
		android:tint="?android:attr/colorControlNormal" />
		</item>
		</selector>

res/layout/battery_history_chart.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,6 @@
		android:shadowDx="2"
		android:shadowDy="2"
		app:barPrimaryColor="?android:attr/colorControlActivated"
		app:barPredictionColor="@color/quantum_empty_color_light"
		app:barPredictionColor="@color/material_empty_color_light"
		app:chartMinHeight="@dimen/battery_history_chart_height">
		</com.android.settings.fuelgauge.BatteryHistoryChart>