diff options
| author | Lei Yu <jackqdyulei@google.com> | 2017-03-24 20:01:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-24 20:01:23 +0000 |
| commit | d3505c76cdc70664b5f730eb7bb1e20351a2af4d (patch) | |
| tree | 7f1a6238f2060082f4b791b2b46862db3350c499 | |
| parent | 6075d46e8543979a095b6499704b30d13da58fee (diff) | |
| parent | 71a0574141c63162533ba08fab5223957479425a (diff) | |
| download | packages_apps_Settings-d3505c76cdc70664b5f730eb7bb1e20351a2af4d.tar.gz packages_apps_Settings-d3505c76cdc70664b5f730eb7bb1e20351a2af4d.tar.bz2 packages_apps_Settings-d3505c76cdc70664b5f730eb7bb1e20351a2af4d.zip | |
Merge "Change dialog theme for dialog activity."
| -rw-r--r-- | AndroidManifest.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f580644421..81b2524f8f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -692,7 +692,7 @@ <activity android:name=".inputmethod.UserDictionaryAddWordActivity" android:label="@string/user_dict_settings_title" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar" android:windowSoftInputMode="stateVisible" android:noHistory="true" android:excludeFromRecents="true"> @@ -1186,7 +1186,7 @@ </activity> <activity android:name=".notification.ZenModeVoiceActivity" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar" android:label="@string/zen_mode_settings_title"> <intent-filter> <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" /> @@ -1965,7 +1965,7 @@ <activity android:name=".bluetooth.BluetoothPairingDialog" android:excludeFromRecents="true" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"> <intent-filter android:priority="1"> <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> <category android:name="android.intent.category.DEFAULT" /> @@ -1997,14 +1997,14 @@ android:excludeFromRecents="true" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"> </activity> <activity android:name=".RemoteBugreportActivity" android:excludeFromRecents="true" android:exported="true" android:permission="android.permission.DUMP" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"> <intent-filter> <action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" /> <category android:name="android.intent.category.DEFAULT" /> @@ -2734,7 +2734,7 @@ </activity> <activity android:name=".sim.SimPreferenceDialog" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar" android:excludeFromRecents="true"> </activity> @@ -2763,7 +2763,7 @@ </activity> <activity android:name=".sim.SimDialogActivity" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" + android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar" android:label="@string/sim_settings_title" android:excludeFromRecents="true"> <intent-filter> |