diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-18 14:55:33 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-06-18 14:55:33 -0700 |
| commit | 046b65c6493b159417e64101a7aab361f9577c26 (patch) | |
| tree | 756a691aee498d53dcf75e9717ac14c27035aee3 /AndroidManifest.xml | |
| parent | cc61932a1cd785e6ba12798d64b548c90e09b69b (diff) | |
| download | android_packages_apps_Bluetooth-046b65c6493b159417e64101a7aab361f9577c26.tar.gz android_packages_apps_Bluetooth-046b65c6493b159417e64101a7aab361f9577c26.tar.bz2 android_packages_apps_Bluetooth-046b65c6493b159417e64101a7aab361f9577c26.zip | |
DO NOT MERGE: Remove DayNight theme
Bug: 21854466
Change-Id: I85b8e78d0e6adf3ad2046c803ea45aba9eb2c3ca
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b54610b28..042d381b8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -120,7 +120,7 @@ </receiver> <activity android:name=".opp.BluetoothOppLauncherActivity" android:process="@string/process" - android:theme="@android:style/Theme.Material.DayNight.Dialog" + android:theme="@android:style/Theme.Material.Light.Dialog" android:label="@string/bt_share_picker_label" android:enabled="@bool/profile_supported_opp"> <intent-filter> @@ -160,30 +160,30 @@ <activity android:name=".opp.BluetoothOppBtEnableActivity" android:process="@string/process" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@android:style/Theme.Material.Light.Dialog.Alert" android:enabled="@bool/profile_supported_opp"> </activity> <activity android:name=".opp.BluetoothOppBtErrorActivity" android:process="@string/process" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"> + android:theme="@android:style/Theme.Material.Light.Dialog.Alert"> </activity> <activity android:name=".opp.BluetoothOppBtEnablingActivity" android:process="@string/process" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@android:style/Theme.Material.Light.Dialog.Alert" android:enabled="@bool/profile_supported_opp"> </activity> <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity" android:process="@string/process" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@android:style/Theme.Material.Light.Dialog.Alert" android:enabled="@bool/profile_supported_opp"> </activity> <activity android:name=".opp.BluetoothOppTransferActivity" android:process="@string/process" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@android:style/Theme.Material.Light.Dialog.Alert" android:enabled="@bool/profile_supported_opp"> </activity> <activity android:name=".opp.BluetoothOppTransferHistory" @@ -196,7 +196,7 @@ <activity android:name=".pbap.BluetoothPbapActivity" android:process="@string/process" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@android:style/Theme.Material.Light.Dialog.Alert" android:enabled="@bool/profile_supported_pbap"> <intent-filter> <category android:name="android.intent.category.DEFAULT" /> |