From 75d27bc52eb0e66c7fb829056fce59a8662c5bba Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 18 May 2011 12:19:55 +0900
Subject: [PATCH] Add new imeFullscreenBackground for Theme.InputMethod.Holo

This change also removes unnecessary background from ExtractEditText

Bug: 4431328
Change-Id: I1b35ddd388fe11cac9b7f9dd3f990b6c4d889185
---
 .../keyboard_textfield_selected.9.png         | Bin 955 -> 0 bytes
 .../keyboard_textfield_selected.9.png         | Bin 574 -> 0 bytes
 .../keyboard_textfield_selected.9.png         | Bin 782 -> 0 bytes
 core/res/res/drawable/extract_edit_text.xml   |  21 ------------------
 .../res/layout/input_method_extract_view.xml  |   1 -
 core/res/res/values/colors.xml                |   1 +
 core/res/res/values/themes.xml                |   2 +-
 7 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png
 delete mode 100644 core/res/res/drawable-ldpi/keyboard_textfield_selected.9.png
 delete mode 100644 core/res/res/drawable-mdpi/keyboard_textfield_selected.9.png
 delete mode 100644 core/res/res/drawable/extract_edit_text.xml

diff --git a/core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png b/core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png
deleted file mode 100644
index 61db22c6ab5c0ddca3a744513378b2392b65a1b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 955
zcmV;s14R6ZP)<h;3K|Lk000e1NJLTq004;q002V>1^@s6s8=Q%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#T}ebiRCwC#oxN@oK@^4W?2l0_%O<G+
zMWUbp37!Cn1|b@18cLe@0eB3`6sATLh=Ql!8Hk9GNCc50gQWyWViWJOvySa`GP~>D
zP@tLbNLC!n-r~-ubI+Y@#ww0uL31gkl9I%VN@QxHA?bFzkb;cr^?E8upFI3UHIP9Q
z??@q$KZn!<<!S=S@H>@2C6FBNQwd~>tQkm7a1vx<#LGhR^I~KP+p=}zxqRt7kg*CW
zn6+LJ$<4zLa`)>iQRlPi0wjjLlI?5HWbgVDS!=b#_kF#8kUo$lb4#-3`VmEu?5{kQ
z;PgoD>~7{yHy0R52>RB!FRcWSMx&8J;&~pGwM-h2@pvrlc3XB%9?9*UO=BtvGQeap
zlT&{s1tbi^86-G~T~4AQnXYT>Uomo!?<A6LPp22qfCNDRAQox{NCLp*r{O(H#bzf-
zUeFhqLNa}h>}xj~klFegIG8(0WO5RU=)`n$Hjt!F5}DtV<0RT<ycuCkHueKzb`mMi
zB*-mb;;N8j9Rw$F!$}GuG1-g)650*z232b}k*VD%oW!+u6IIP5igrULDa#~4;T$l+
zbb~JCBtQZrwIIoY0VEc;n9TYXXOhUgPlDW0x=&Jdx>3Ri>{7d_wJm@C0zd*J1Xm!b
zw@(5jZb8D|Zcr&OH8P3dB($3hB+J?nvKEpe4#*@xQl3fl$v!_ea1xwE^4pC*`f0GC
zVj#guq)sM5ZmDu6iE$F=+D+ws68!-nA(PCVgb^4>3KSF(1SD=iGHV`noTLhE$X+MO
zy|ajuq8*!T3f7xUf|D$lNz7yciA#{wa+2xkH$Va;-0h4?HE|M^A7pS6hnz%JZ8t)@
zq1}`?i7*1YHv+4wkT3$fHv$(yq7>5&kmR4ZSsGjs?FJ{oNiwHG*T^KuHEL=)NtQT-
zlaNWsB&OF@u9FD=!RLgNEdE~6Nxb8Mj7FpM`)>5N86f+l*LC{ENYUu1dL~)jekX(V
zd+8Ar&1Q2UqaZuliw0yk97@06m$j`o)t%((r?+z8iR|8bDx=mqRkc*%?>$-l{9aZ+
zzLq#|=Uo$Z@IsMNkx`wOXTjC;DF(_Hkf0?Y;r=vK28jX^R3P;)c2@NnCzSHP9d$3g
dZ}C@v0RSefNE0~<If4KH002ovPDHLkV1h<}qxS#+

diff --git a/core/res/res/drawable-ldpi/keyboard_textfield_selected.9.png b/core/res/res/drawable-ldpi/keyboard_textfield_selected.9.png
deleted file mode 100644
index d6478fb0cd39c3a8e13aed321e1a522bcc611357..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmV-E0>S->P)<h;3K|Lk000e1NJLTq002e+001Kh1^@s6DHnWg00009a7bBm000Y#
z000Y#0XNCZtpET4@JU2LRA_<in!Sn?Q4oc{x_#+c7j%q710yvtG%@fM%#D2qA42ds
zd;(*cN7!gnVMljyKoDeTmKEn1-0s^ywvB;oH`Jc&)>KgSan2pOXOP4~w46aCqM7mG
z?dzoswTL;)%p$<c2iv)4S)3vO-%n>AV@Wcg0khu$P#rzw<mo$p-nxgG%{JO~N)qw%
z8_!PPaD2I?2S$e!?XP#9bA0~^tJTUCn5(P1T%5n)(ZyM=*I=4spe##wVA8Hd%|QT4
zV1A`0!zhY^5P~Z(Ap{J|9H4g0p#ftdL-7IzsCN#T1B^tef#L~F+BbAK3>||JLU0<T
z3CEZvAl|_IgJT>=37fiOJV(h!9MeR}F&JT)1B^JvYm_wVn9jq#SH~Q%9)}3%#xZHv
zp<@iy4+z3B80)<zOLt6Nko-nTYB|6F3{JtACAa()jF8JHrLSxK2_~z)W4t=1s~#AE
z+t&^nkV#-_22GSaI!03F01cRs+g#o;dDqa^V)~%p<PwbaIV3PQjseu+Fa%@DjqbqM
z1Q_8rN}`(_tOustpHWp6Wm&obBZ;c2i2E-ijw#aN_W6eW`&WEkKb~X8*;M}c#CrP?
zinbO3in1-NcN^Gku6wrmRrZe&AjYvy-?H|%+et0r4?X`;lM74YH*SB;301)jG5`Po
M07*qoM6N<$g33|-1poj5

diff --git a/core/res/res/drawable-mdpi/keyboard_textfield_selected.9.png b/core/res/res/drawable-mdpi/keyboard_textfield_selected.9.png
deleted file mode 100644
index 6e703af76f49f71298b42b06ec25007445280b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq003J6001or1^@s6!A%!M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ut`KgRCwC#o4=0JKoG`f9sf~sk#Z+a
zCn0KT3JN4DpydrHX)Y~K0N2vcP~;hS2nt$2LPAuC8VPX_2zQF@WPKhd8&4cZSx1Ra
z7T+gL93`<7{rqKSc0Ex^l2Fs6luEyLq8j(T8Fs(lZyxc6X)qWlH+%BvA86E|3^t9v
zfkbVv!`~O_<0Oq9knCJP)9`ZG(VqkJ&iD9`KHYdi@$nt<eV<&{<$@%O6Y$L?n+vTq
zO{Y@|!;t(RAL#Dz4V`#@`K{w+XGf#ONgsPpsdxJUbvhmLJdawf)&ej<uLsUYh8;x_
zT^=3L`!6v)9=$F}Bk^T^g>K%XcDqeM5M-`)90x=##l|$ehPUn$eSWzLJDKJ`hi<pK
zaI|qX9Bt=t=EO(l#~dYBCtVxNoUH}@)Xf~`D#6+I;=Ik=3`5B^ceZ%Z0G0t&bGYG_
zRDmsvBV@IWusv)Jz~0W)fDPFH8EmbW^Ns|K0$Hsak?eG-vlDb9d+A1!4Qa$IVx+^N
zYVJ1tHl~qczDCZj*7`|)TEp4b>ui}@iUktR-p<*x1&#&mVnFt=Wt76!8nE{PdnIS{
zSit!yVAtYop1(LhRf#;Icp_8{ws~HfMhH_Qds^XaD3H)DSCfE!ZLqOosZoFp*nkZI
zc7tKdaVlt=4rDz)chd=gz8lb`unk}tkUebP&tAuE23u@@m=Bwqmw;Ujwh87($^tfz
zzVbAbp6?N2Gs@o8hMzU;IF1*$!!Uwo51S!RCX<X`5jO9xy2YM^hq=e&@zT{Q!Up`+
zA}EL9nI9jEy<P^}Y2_~*ynP-HAHE0}sF~9?E(hfG&`tVaXM4ZC(#gBCIOXciKbE;S
z`yb@+nL-uZvkqU)(}?Q>Mje{L4gjJKsVaRm-y8<Am7Hx|$gTt!0G=p-v&QCpNdN!<
M07*qoM6N<$f<5D7S^xk5

diff --git a/core/res/res/drawable/extract_edit_text.xml b/core/res/res/drawable/extract_edit_text.xml
deleted file mode 100644
index c7f66f6b199fe..0000000000000
--- a/core/res/res/drawable/extract_edit_text.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/keyboard_textfield_selected" />
-    <item android:drawable="@drawable/textfield_disabled" />
-</selector>
-
diff --git a/core/res/res/layout/input_method_extract_view.xml b/core/res/res/layout/input_method_extract_view.xml
index 689ba7bf524f5..7d59d02dc9d65 100644
--- a/core/res/res/layout/input_method_extract_view.xml
+++ b/core/res/res/layout/input_method_extract_view.xml
@@ -31,7 +31,6 @@
             android:gravity="top"
             android:minLines="1"
             android:inputType="text"
-            android:background="@android:drawable/extract_edit_text"
         >
     </android.inputmethodservice.ExtractEditText>
 
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 39d232915b643..6529fe1e292ac 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -77,6 +77,7 @@
     <drawable name="dialog_holo_light_frame">@drawable/dialog_full_holo_light</drawable>
     
     <drawable name="input_method_fullscreen_background">#fff9f9f9</drawable>
+    <drawable name="input_method_fullscreen_background_holo">@drawable/screen_background_holo_dark</drawable>
 
     <!-- For date picker widget -->
     <drawable name="selected_day_background">#ff0092f4</drawable>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index aa9ddff7c0b59..0a614b2dd0b9e 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -681,7 +681,7 @@
          and a few custom attributes. -->
     <style name="Theme.Holo.InputMethod" parent="Theme.Holo.Panel">
         <item name="android:windowAnimationStyle">@android:style/Animation.InputMethod</item>
-        <item name="android:imeFullscreenBackground">@android:drawable/input_method_fullscreen_background</item>
+        <item name="android:imeFullscreenBackground">@android:drawable/input_method_fullscreen_background_holo</item>
         <item name="android:imeExtractEnterAnimation">@android:anim/input_method_extract_enter</item>
         <item name="android:imeExtractExitAnimation">@android:anim/input_method_extract_exit</item>
     </style>