From 294469e09ad392de952ee875f91b472425ab9464 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Wed, 29 Jun 2016 14:53:57 -0700
Subject: [PATCH] Fix some bluetooth theming issues.

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                        |   2 +-
 res/drawable-hdpi/ic_lockscreen_ime.png    | Bin 285 -> 0 bytes
 res/drawable-mdpi/ic_lockscreen_ime.png    | Bin 175 -> 0 bytes
 res/drawable-xhdpi/ic_lockscreen_ime.png   | Bin 254 -> 0 bytes
 res/drawable-xxhdpi/ic_lockscreen_ime.png  | Bin 327 -> 0 bytes
 res/drawable-xxxhdpi/ic_lockscreen_ime.png | Bin 412 -> 0 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 res/drawable-hdpi/ic_lockscreen_ime.png
 delete mode 100644 res/drawable-mdpi/ic_lockscreen_ime.png
 delete mode 100644 res/drawable-xhdpi/ic_lockscreen_ime.png
 delete mode 100644 res/drawable-xxhdpi/ic_lockscreen_ime.png
 delete mode 100644 res/drawable-xxxhdpi/ic_lockscreen_ime.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 04a9e842b83..13408805080 100644
--- 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" />
diff --git a/res/drawable-hdpi/ic_lockscreen_ime.png b/res/drawable-hdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 70d35bf8e279dfdc7297830c942c1882e24a0e2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z>;rs4Tp6aeQ-YRt&v^(mN~9#n
zFPK3rsUy+io%xAlKYujrE<bYkpqa@c|3?>q@|B)0jv*GO-%hsXYfunyVZXkA$B&!8
z=U-)Oov=YsCG6KK%{arOJRg`DmM!F2yL0Zk={kQOEDaP<(?2_FOND2M(n+Q;29<}p
zD_2}TwTH`C{oz`_z7w2+stXrY>^veEsd+DA>K7l?dnr~^eP8dbetF?pb(?ZQTR}^I
aG2<Ey)qlSxvR?!`g2B_(&t;ucLK6UIfN?nh

diff --git a/res/drawable-mdpi/ic_lockscreen_ime.png b/res/drawable-mdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 3216776def011c92d1d61ff05a19a49223b37124..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wxd5LKSB9zWcu@Vt)^$LYoFzei
z!3^H_?s`3X@Z@QI7PmN1(A?9-F+}2Wa>4=$j<YRH!V2m_$7ZrUIn%-{kj|veERk4r
uBCzdPVneXT9IqLxRyy>t^aMNYT+Z03=kUWw@TDNo2nJ7AKbLh*2~7Zkbv9!F

diff --git a/res/drawable-xhdpi/ic_lockscreen_ime.png b/res/drawable-xhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 02cc3afd776730e64b537c73ce5835905a713b58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sW&u7St_)M#$v}%V?*0dwAXpOQ
z7tA2H=Ji@-*|##QK7IJOPW_$g;zX8jK*=;u7sn8f<H-pUtje4QMuyx%3}<xKaD2^q
z)8xWX#<zn_%yAKedJMC8q129tQY@V;Q?eR16ijq>KAfS!+ZV8CI@^~wb|EGoCPZ<3
z5L({IxvsH)zQor*Oeb7b4=(Ct-?>7DRT<=&wN|DoleV1!G8sHw{an^LB{Ts5Ya3Qj

diff --git a/res/drawable-xxhdpi/ic_lockscreen_ime.png b/res/drawable-xxhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index f23b0e78d271a501fbd485f12ea71279a816d8d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 327
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKNPtg>E5p=ws-u0&zHJ4XFI^Jk
z7tFwxe)`?1G*;<zXCyf;7UrG!^6B%(V@I+x*nd3Rz;YU>tliVaF(l&f+iR9w4Gsb>
zf!}NIZ+&0yf6yT#@Inz&>#vDw`ZM`XZIVbn<FoB?)hC1V{D&3`A7z@l<kra|#_n8J
zQKoRM6Gs<%IhyjBa!nHd%X+K+eT~2`jw8)aWIrl!&TLv2#=Y>pgYLgybDOGUq(n>}
wU0AZ<<`oH3v;OS|_t}I_n|$z`L~?@mpJx|lbe+D=26PgGr>mdKI;Vst0J}PaV*mgE

diff --git a/res/drawable-xxxhdpi/ic_lockscreen_ime.png b/res/drawable-xxxhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 2eb8a927644adecc88738143684d00b10a12efce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#*1AIbU8K$<=8htf2JPx!@p(MyJ
zm_fVm%InL$TC9`*Okmr&efkv5N&VM8fBMq(TVuyImaE^_-?do=RC~hH#W5t~-rE}|
zxeghKv_8C1(os5ZZSecw_De-#Im}(3%v;p<dHs>2KMmd<vp6o1+_Q0h_LQG7Jx^UD
zzn*C?%#E!N@psCpw>o^L{A}_ertSKhdgj=_sF}BXOV9zSo%)*s4~TJ#aNS63+{?7#
zw-QUvf!F2p>(m?+L>UAbr9b@77i45A12UO38Q=M`a4cbwVVU($nQx!h2QH0`2Lc&G
zoA2cN{mM)|{Ey-JA<6CaJCDWfSg6k$TfVk3d+qDB@AqCy=`lQZLwq;$vya=SzfPX(
Q3G@?#r>mdKI;Vst04c4k8UO$Q