DO NOT MERGE Material theme
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2a0e70..d4579ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -181,7 +181,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"
@@ -385,7 +385,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" />
@@ -500,7 +500,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">
@@ -588,7 +588,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" />
@@ -598,7 +598,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" />
@@ -1162,7 +1162,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"
@@ -1196,7 +1196,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" />
@@ -1229,7 +1229,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" />
@@ -1250,7 +1250,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">
@@ -1273,7 +1273,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" />
@@ -1283,7 +1283,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" />
@@ -1395,7 +1395,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" />
@@ -1404,7 +1404,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>
@@ -1416,7 +1416,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>
@@ -1511,7 +1511,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">
<intent-filter android:priority="10">
@@ -1610,7 +1610,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" />
@@ -1620,7 +1620,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" />
@@ -1630,7 +1630,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" />