OSDN Git Service

Fix some bluetooth theming issues.
authorAndrew Sapperstein <asapperstein@google.com>
Wed, 29 Jun 2016 21:53:57 +0000 (14:53 -0700)
committerAndrew Sapperstein <asapperstein@google.com>
Thu, 30 Jun 2016 17:01:59 +0000 (10:01 -0700)
The ic_lockscreen_ime wasn't being appropriately colored due to
the (now deleted) override of the assets defined in SettingsLib
that were hardcoded teal. By deleting these, the vector drawable
that's tinted with the accent color is used.

Also fixes the pairing dialog to use DeviceDefault themes.

Fixes: 29837825

Change-Id: I66cd57c00f1eec00346d7d10a86cd9be79d6cf5c

AndroidManifest.xml
res/drawable-hdpi/ic_lockscreen_ime.png [deleted file]
res/drawable-mdpi/ic_lockscreen_ime.png [deleted file]
res/drawable-xhdpi/ic_lockscreen_ime.png [deleted file]
res/drawable-xxhdpi/ic_lockscreen_ime.png [deleted file]
res/drawable-xxxhdpi/ic_lockscreen_ime.png [deleted file]

index 04a9e84..1340880 100644 (file)
                   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" />
diff --git a/res/drawable-hdpi/ic_lockscreen_ime.png b/res/drawable-hdpi/ic_lockscreen_ime.png
deleted file mode 100644 (file)
index 70d35bf..0000000
Binary files a/res/drawable-hdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_lockscreen_ime.png b/res/drawable-mdpi/ic_lockscreen_ime.png
deleted file mode 100644 (file)
index 3216776..0000000
Binary files a/res/drawable-mdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_ime.png b/res/drawable-xhdpi/ic_lockscreen_ime.png
deleted file mode 100644 (file)
index 02cc3af..0000000
Binary files a/res/drawable-xhdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_lockscreen_ime.png b/res/drawable-xxhdpi/ic_lockscreen_ime.png
deleted file mode 100644 (file)
index f23b0e7..0000000
Binary files a/res/drawable-xxhdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_lockscreen_ime.png b/res/drawable-xxxhdpi/ic_lockscreen_ime.png
deleted file mode 100644 (file)
index 2eb8a92..0000000
Binary files a/res/drawable-xxxhdpi/ic_lockscreen_ime.png and /dev/null differ