Merge "Fix some bluetooth theming issues." into nyc-mr1-dev

2016-06-30 17:17:19 +00:00
parent 57824d5aaa 294469e09a
commit 6e1336bff1
6 changed files with 1 additions and 1 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1992,7 +1992,7 @@
                  android:label="@string/bluetooth_pairing_request"
                  android:excludeFromRecents="true"
                  android:windowSoftInputMode="stateVisible|adjustResize"
-                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
            <intent-filter android:priority="1">
                <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                <category android:name="android.intent.category.DEFAULT" />
--- a/res/drawable-hdpi/ic_lockscreen_ime.png
+++ b/res/drawable-hdpi/ic_lockscreen_ime.png
--- a/res/drawable-mdpi/ic_lockscreen_ime.png
+++ b/res/drawable-mdpi/ic_lockscreen_ime.png
--- a/res/drawable-xhdpi/ic_lockscreen_ime.png
+++ b/res/drawable-xhdpi/ic_lockscreen_ime.png
--- a/res/drawable-xxhdpi/ic_lockscreen_ime.png
+++ b/res/drawable-xxhdpi/ic_lockscreen_ime.png
--- a/res/drawable-xxxhdpi/ic_lockscreen_ime.png
+++ b/res/drawable-xxxhdpi/ic_lockscreen_ime.png