From 1480eb27f5321ef5fc2faeee87c7464e279a4912 Mon Sep 17 00:00:00 2001
From: Mike LeBeau <mlebeau@android.com>
Date: Wed, 20 May 2009 17:22:13 -0700
Subject: [PATCH] Add support to SuggestionsAdapter to query the 'working'
 status of its underlying cursor and update a spinner in the search dialog
 accordingly.

---
 core/java/android/app/SearchDialog.java       |  27 +++++++++++--
 core/java/android/app/SuggestionsAdapter.java |  35 ++++++++++++++++-
 core/res/res/drawable/search_spinner.xml      |  36 ++++++++++++++++++
 .../res/res/drawable/search_spinner_anim1.png | Bin 0 -> 523 bytes
 .../res/drawable/search_spinner_anim10.png    | Bin 0 -> 529 bytes
 .../res/drawable/search_spinner_anim11.png    | Bin 0 -> 525 bytes
 .../res/drawable/search_spinner_anim12.png    | Bin 0 -> 527 bytes
 .../res/res/drawable/search_spinner_anim2.png | Bin 0 -> 525 bytes
 .../res/res/drawable/search_spinner_anim3.png | Bin 0 -> 522 bytes
 .../res/res/drawable/search_spinner_anim4.png | Bin 0 -> 519 bytes
 .../res/res/drawable/search_spinner_anim5.png | Bin 0 -> 521 bytes
 .../res/res/drawable/search_spinner_anim6.png | Bin 0 -> 509 bytes
 .../res/res/drawable/search_spinner_anim7.png | Bin 0 -> 517 bytes
 .../res/res/drawable/search_spinner_anim8.png | Bin 0 -> 533 bytes
 .../res/res/drawable/search_spinner_anim9.png | Bin 0 -> 534 bytes
 core/res/res/layout/search_bar.xml            |   1 +
 16 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 core/res/res/drawable/search_spinner.xml
 create mode 100755 core/res/res/drawable/search_spinner_anim1.png
 create mode 100755 core/res/res/drawable/search_spinner_anim10.png
 create mode 100755 core/res/res/drawable/search_spinner_anim11.png
 create mode 100755 core/res/res/drawable/search_spinner_anim12.png
 create mode 100755 core/res/res/drawable/search_spinner_anim2.png
 create mode 100755 core/res/res/drawable/search_spinner_anim3.png
 create mode 100755 core/res/res/drawable/search_spinner_anim4.png
 create mode 100755 core/res/res/drawable/search_spinner_anim5.png
 create mode 100755 core/res/res/drawable/search_spinner_anim6.png
 create mode 100755 core/res/res/drawable/search_spinner_anim7.png
 create mode 100755 core/res/res/drawable/search_spinner_anim8.png
 create mode 100755 core/res/res/drawable/search_spinner_anim9.png

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 343380cc766e6..1ff56656cd3a5 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -31,6 +31,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -103,6 +104,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
     private Button mGoButton;
     private ImageButton mVoiceButton;
     private View mSearchPlate;
+    private AnimationDrawable mWorkingSpinner;
 
     // interaction with searchable application
     private SearchableInfo mSearchable;
@@ -182,6 +184,8 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
         mGoButton = (Button) findViewById(com.android.internal.R.id.search_go_btn);
         mVoiceButton = (ImageButton) findViewById(com.android.internal.R.id.search_voice_btn);
         mSearchPlate = findViewById(com.android.internal.R.id.search_plate);
+        mWorkingSpinner = (AnimationDrawable) getContext().getResources().
+                getDrawable(com.android.internal.R.drawable.search_spinner);
         
         // attach listeners
         mSearchAutoComplete.addTextChangedListener(mTextWatcher);
@@ -239,7 +243,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
         return doShow(initialQuery, selectInitialQuery, componentName, appSearchData, globalSearch);
     }
     
-    
     /**
      * Called in response to a press of the hard search button in
      * {@link #onKeyDown(int, KeyEvent)}, this method toggles between in-app
@@ -395,6 +398,24 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
         mPreviousComponents = null;
     }
     
+    /**
+     * Sets the search dialog to the 'working' state, which shows a working spinner in the
+     * right hand size of the text field.
+     * 
+     * @param working true to show spinner, false to hide spinner
+     */
+    public void setWorking(boolean working) {
+        if (working) {
+            mSearchAutoComplete.setCompoundDrawablesWithIntrinsicBounds(
+                    null, null, mWorkingSpinner, null);
+            mWorkingSpinner.start();
+        } else {
+            mSearchAutoComplete.setCompoundDrawablesWithIntrinsicBounds(
+                    null, null, null, null);
+            mWorkingSpinner.stop();
+        }
+    }
+    
     /**
      * Closes and gets rid of the suggestions adapter.
      */
@@ -563,8 +584,8 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
         // attach the suggestions adapter, if suggestions are available
         // The existence of a suggestions authority is the proxy for "suggestions available here"
         if (mSearchable.getSuggestAuthority() != null) {
-            mSuggestionsAdapter = new SuggestionsAdapter(getContext(), mSearchable, 
-                    mOutsideDrawablesCache);
+            mSuggestionsAdapter = new SuggestionsAdapter(getContext(), this, mSearchable, 
+                    mOutsideDrawablesCache, mGlobalSearchMode);
             mSearchAutoComplete.setAdapter(mSuggestionsAdapter);
         }
     }
diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java
index 6a02fc930a1c3..2fe9a8da766a4 100644
--- a/core/java/android/app/SuggestionsAdapter.java
+++ b/core/java/android/app/SuggestionsAdapter.java
@@ -25,6 +25,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Bundle;
 import android.server.search.SearchableInfo;
 import android.text.Html;
 import android.text.TextUtils;
@@ -45,12 +46,18 @@ import java.util.WeakHashMap;
  * @hide
  */
 class SuggestionsAdapter extends ResourceCursorAdapter {
+    // The value used to query a cursor whether it is still expecting more input,
+    // so we can correctly display (or not display) the 'working' spinner in the search dialog.
+    public static final String IS_WORKING = "isWorking";
+    
     private static final boolean DBG = false;
     private static final String LOG_TAG = "SuggestionsAdapter";
     
+    private SearchDialog mSearchDialog;
     private SearchableInfo mSearchable;
     private Context mProviderContext;
     private WeakHashMap<String, Drawable> mOutsideDrawablesCache;
+    private boolean mGlobalSearchMode;
 
     // Cached column indexes, updated when the cursor changes. 
     private int mFormatCol;
@@ -61,12 +68,13 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
     private int mIconBitmap1Col;
     private int mIconBitmap2Col;
     
-    public SuggestionsAdapter(Context context, SearchableInfo searchable,
-            WeakHashMap<String, Drawable> outsideDrawablesCache) {
+    public SuggestionsAdapter(Context context, SearchDialog searchDialog, SearchableInfo searchable,
+            WeakHashMap<String, Drawable> outsideDrawablesCache, boolean globalSearchMode) {
         super(context,
                 com.android.internal.R.layout.search_dropdown_item_icons_2line,
                 null,   // no initial cursor
                 true);  // auto-requery
+        mSearchDialog = searchDialog;
         mSearchable = searchable;
         
         // set up provider resources (gives us icons, etc.)
@@ -74,6 +82,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
         mProviderContext = mSearchable.getProviderContext(mContext, activityContext);
         
         mOutsideDrawablesCache = outsideDrawablesCache;
+        mGlobalSearchMode = globalSearchMode;
     }
     
     /**
@@ -118,6 +127,28 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
             mIconBitmap1Col = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1_BITMAP);
             mIconBitmap2Col = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_2_BITMAP);
         }
+        updateWorking();
+    }
+        
+    @Override
+    public void notifyDataSetChanged() {
+        super.notifyDataSetChanged();
+        updateWorking();
+    }
+    
+    /**
+     * Updates the search dialog according to the current working status of the cursor.
+     */
+    private void updateWorking() {
+        if (!mGlobalSearchMode || mCursor == null) return;
+        
+        Bundle request = new Bundle();
+        request.putString(SearchManager.EXTRA_DATA_KEY, IS_WORKING);
+        Bundle response = mCursor.respond(request);
+        if (response.containsKey(IS_WORKING)) {
+            boolean isWorking = response.getBoolean(IS_WORKING);
+            mSearchDialog.setWorking(isWorking);
+        }
     }
     
     /**
diff --git a/core/res/res/drawable/search_spinner.xml b/core/res/res/drawable/search_spinner.xml
new file mode 100644
index 0000000000000..34c163d45098d
--- /dev/null
+++ b/core/res/res/drawable/search_spinner.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<animation-list
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:oneshot="false">
+    <item android:drawable="@drawable/search_spinner_anim1" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim2" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim3" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim4" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim5" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim6" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim7" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim8" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim9" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim10" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim11" android:duration="150" />
+    <item android:drawable="@drawable/search_spinner_anim12" android:duration="150" />
+</animation-list>
+
diff --git a/core/res/res/drawable/search_spinner_anim1.png b/core/res/res/drawable/search_spinner_anim1.png
new file mode 100755
index 0000000000000000000000000000000000000000..e55b60dc6cce81d2390bb2bfb06fcfdbd85c38bc
GIT binary patch
literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUztw}^dRCwB~RXa|@KoDIgjw2@!1fr#a
zE*)hAl(bxen{W*dz!}ogB18k+0U<;LwnM(Wm%NQ8ODx3_BaLQeKW}Gt{MONYK6jx+
zQFH*)#oRsoTlg(a<rurhSPFjxe;V$MH-KHioXdZPd4OJM`UPWk*fte@p+i<#)dH|f
z4<<P#h=~c_FmWn%Yk&Z1LVGx<uT2*4HBbxqgFQL+w!)Ho&{Irwu;31sWBbrP;t$vx
zQ$?&qW|;dzybGTRMToPQAOzF;F2M-uN(6Hgn1R3-V7`3BL!NXJ?CH4er53~q({#%6
zNcxDew{6hWao*pU%Fl?Gbq4)}zSClGSRq3X%0?x$u^MwICGeB0COfwCHTTcL>?Xck
zX;t}Fh7H@4x*5zjakS+AVlic{DXF;Wg%g7<0rvvtWW2*sux?hN+;HtEUZlBvHBxcY
z(}{;=Vn$eI+fdJmEd{Y+(J5O}aY6KuPPsk}-+<JYDVh?LcV4W$hvwC2+WR!ka<XHy
zhL6IOd&|DV!k=US6BB#D)p`r|=f&2`%koLTME7gEn5e|8>=*DWzyQ4$%to<#?Mwgw
N002ovPDHLkV1ffs>jMA)

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim10.png b/core/res/res/drawable/search_spinner_anim10.png
new file mode 100755
index 0000000000000000000000000000000000000000..9611d9733df0b9012a3f48561193e3fea66a0201
GIT binary patch
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvq?ljRCwB)RXa|@KoGSP$B|<J;Ug{p
z1rj$v&>}iIF2o^ds1awNLO>bPLFkca5CjxrD|Qm|#(5h}Rt9WF8qH_NZ)awA$8MHo
zj!mxX)**bX#n9Kq#U;41H~0eR3G|8mtycgRLIl(kh*ZG2oN_aX38BZ3QKqu0Szs*#
zMrueV%1-Dr6j<>yKzBwhY!ty9S%9g<8gL}vFp-6l^US0i1Pma}W)b`Jsj7&%Hf8J*
z^rmD4dnjK@Pgbp62TlnxV9M36sfHK!^$)UReM!??lLk44Z(K6NI@^`^SK1>bpMxL4
z9dHlM*9sZh$@l_zq1FZPv?Ab&KKUyBDn)W_B9<#<_x^$LWy%$44rL9-7WoFgmy+dr
zd@1uo@!&jwajfFxPM(#_E@XC1ZZMP{K3GBh3gu2MJE<YfcPO`XbYNd%rz7wQc(bTX
zIazrnd{O4@$N4=plLrBZ(60mx<}QOI`)lwH?I&HLd8Ql=0+`L`A;I<(n9wu0O?D_h
z6rc=+38z%yJ-i2ZEx-+Bw|SzDDl=MW$q&DPWr%I8b)oO8F*k<q?zdmSw*UhGZxX{~
TM!s1*00000NkvXXu0mjfWlY^Z

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim11.png b/core/res/res/drawable/search_spinner_anim11.png
new file mode 100755
index 0000000000000000000000000000000000000000..426170458ce7ccabcbff5762de2c5bd1ad905c85
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzuSrBfRCwB~RXs}sK@i=G$;FFbg$8Vd
zlqwb?)`F$AwZFz6p}#?}_ZOs07Z6miNTn$8BRO-DobScAI;;ugz=6l^%<R6|nVr3h
z@;rB;L{T({A%-u-e3d4-V9K9hOEAwcABKC&0TDOWfJA!6jX+gPJ{4?%z&r(M&vKN4
z0Es7)R7hg<Otzo(AgxU#gyR^|`j`$T5L#Hm0r!wp*?p&s`3Z(2jCCwHmyf|x)#=3q
z?#nlV?+yBrO2SROGD%3L^#>#)shc7;fFbkge=yR1u&3^3m+%hah;5@&ZUNiCC2Wtg
zuwh?WmpHC3PtUwhfjgkh5ys~NC-gmA5n>-<M<DT;D<+Hf=1cCMg(pmXx<XNT_vv!<
zm$D3HLukSFP@sM_dnxS0Jt&7}9my{W)~~7nJ=X9xSoB&T-BF-tB^;9kEg9O-uMlYy
z*ahY%^&YUoSHh=f-v0QR`p;KW54}k;%-3aaK)+FH{sI!;CVHlP&qIA!Tx376a5P9_
z4s;E4143tXO5c<H=|ec~F?5Wnt9F?7eN2VlLrwVwuy$+kb&CE1z62Nm*)+ZFDRa&=
P00000NkvXXu0mjfobl*P

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim12.png b/core/res/res/drawable/search_spinner_anim12.png
new file mode 100755
index 0000000000000000000000000000000000000000..0602314590aaae8cd5844730545ea4607ce36bc1
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzu}MThRCwB~RJ%?CF%a}!E(uA9cmz5+
zXn>ZM7Kw_2nm^!!_y#0u`qUJZ6e%JFAqpBExyw7uoW^Kzf|Nw8G+OW49`D-Tb<^q8
zg@Eh==NdPF9ibs#1t`qho47!tD7qq<#t%?^prq*`d<EzlfpG?suH7F8WS5>yatI8J
z&2iD#73`_bCB(!TPP@afY37d@RRBxa$DY)ZCL+6lI)&cGf*WXmkN2?0(C_BpOo2==
z_X)d>aTz*d`Uy!$ru8QzBdPmCFgNlCcrufIk0%`md$!!-5(jpPVLC;*FErtMS%eMy
z5`CfketA8-tZSeHw5Z|ySRz8FZ&cLRDki#v1A)Z1ZaG=EFCV*qmPD1%QgodaIKFJk
z{!!LoYzl4odaFJP|KXnQ&kM;P7mTi^=*l{v%R77v7WI}$cM{lxSm`~>@e2Ei6##4~
zrI|D}S7+(z4JcWjvdXE21taM8oN`L_HT(lq{5MgVvYy9m61h(e)1S_+Q4L<u1%%e7
zq@HZ%A8H~quAynJPLU0bomsM<_7#wJ*)>R%*Jc#i{#R0p?9v0ZwqNoszyPO$+y1x)
R8NdJl002ovPDHLkV1h3I>8}6)

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim2.png b/core/res/res/drawable/search_spinner_anim2.png
new file mode 100755
index 0000000000000000000000000000000000000000..05d58e00372dc95f03f68f5f07e859a054b30bed
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzuSrBfRCwB?R69!pK@i@Jm&?N^sGWjE
z8ZEW4O_@4%N`HoxzrafWgtgWdR+3Jz5iEs(67+JKn4I6Ivtbwyxx<0E*?H`@J2N}y
zvn+F#y!R^*E%^FapJ3e(R|?xPY#pp`u^!mH6$4ZQx3N3|w*~l4g*?Ev3E2amV%_@_
z5Oe_ESNb+VluqznrFQ_@%>{&G2Pxc`8wEhkd&+-}Jr~&91bZ4H0c$~QLDms)B|fIx
zhyDzCrVhS@VA=!t&Y>@3U84(}@KXmLs#Bj3c<&030t@uQls8OV-4!R>gV^)gFjXjP
z!jG`M7rbF4PijKOz9~~)7sEIhOWcs43lLS|IFe$<!UP_=a<n91xi$DV@rGGQSGX*_
z>6AlLbR9UapC#(ov`t}`7F8S_!-9aTx_*4v6-igqtVFstb{u_Q)B99z`T_k_CV+<}
zHhp<}%xEUDPNs#Wnnn^gVsk(vGfoZYBY7I30gaF*!31>5z4M<#_Vbq|SkuhrL^aEa
zoT!+Z2K)66#gXO!&S%v;t<=Q3$W|Gk2~OoK$5P)|xvOGJ*nqq-{SsgR3JSo$x7SEv
P00000NkvXXu0mjfUsU2$

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim3.png b/core/res/res/drawable/search_spinner_anim3.png
new file mode 100755
index 0000000000000000000000000000000000000000..69fa9c1e47de76ad5db60fcdbcc87afb3ef211d4
GIT binary patch
literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUztVu*cRCwByRJ%^YKoIl=I}by|yFnC4
zq@bjrpa~^y3K|-EkdWy44!(hp;2UUxh5`u+BqXGWB!)m@W}-Q?7%SK-jcy;e<K4YG
zyEILMtT^ZDSXK~wf_@6UrqBm`7x1;A-#~xO=2mjZT3B|0mWc07_z}J(tR3JSdS@yj
zHf&&7H?9Se7@Opq#%?2LKbH`J7%e<Nea<1Yu!PshxkB#2k4H0{<;;Ml>@8p$sMEH9
ztN|y$q3mPe5;&smpv(Y^=Bph1TTnny8OipH>x?Z||2wEDvYN4X+@wtBSY;$6@O>4m
zkc6DyEpUgt7q+|%d;&wRaE?k;Xp3Q|QAnSRs))NmIhhk->3J0rR+##Bg|gDKE$1D|
zpy(Wx7yDwE$N4pMvAr<REl4<T=LhLm)UK6riFUJlhvB45=Mq&qc_px$I<Q{0eZ)d_
zG}higzc=3BQK<LaM*vGY5Sjn~#jppu8vXzpzD<&ebi`bL%Kj%ove=LX8g^vn6v^lJ
z)GXPbd#FH?A+&Ej%3Q6)lKraCkh1-E5^28n6su~n&jZN2Uf%)?0OW<xdfBIKH2?qr
M07*qoM6N<$f;vL$&Hw-a

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim4.png b/core/res/res/drawable/search_spinner_anim4.png
new file mode 100755
index 0000000000000000000000000000000000000000..9201bacdc2bb1c3d396f02060bd17475b74065a0
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzsYygZRCwB?RZC98Fc6K~q*YTsDu^Wq
zpzMGpn{GG*7eL}9+=m?pKr9g(c5nlPXdw+LZNq!vxf()%R2^wFp0WKhZ^m|9p65YX
zoO4Z>7Uoink1-B4HAU<iu>*`BFdminHY&inFg<8jz)xoS1+fj-0rU*x0kr)qASPp&
zjtNBsF+Ra}jn7OEe*n5Ki9uluH>&`&Y60)D=LUOEe8AVH$cz-R;1$+?Yz%(}duLeO
z!jSd|b64<BF+PIrz`x|qrfTLTBWO@VJeUbxFpJiIjrv1+C4b-X*r=P4G(~J$Gs7(y
z*6)#ueb1!44gG*lXjQY?0?-|pJ!qfw*%T+*EddXM<>Xv|OV_Jj#-cn?cB@ckxBII$
zCDhGYB;yq5nsuBQ)&$&C5?+#q=vtXC!MMD35*BGXmnzdtS8rVnOUm>`lZ@u(nzmJ{
zS#g&!NHCG}aS)h)l6b%QV64f1(}yF02LfdyQ~Njs0*eh;pkha+PLX1MO`BkPr7F*1
z>c3P1^x_ZyV!Z|XmZ7rb|A6%0^$TEq?c)(CmaqX;XZBNo0RYe@$GifFK|cTh002ov
JPDHLkV1l!x+yMXp

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim5.png b/core/res/res/drawable/search_spinner_anim5.png
new file mode 100755
index 0000000000000000000000000000000000000000..f0c7101c0296b3c126590f59d88f5b5a8baff4e7
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybRCwB?RlQEbKnzaWB&8|kuZXD<
zNM%9Ym{131m>GB)-UEq|hhXFdn1O+z5)4QMp+egv1R6f4UnJ`qq^oM_lh5a~&p$cG
z&9clf$#vZ-SO8swbxXFW!dCW<y*AcwSjTg=+93{#VF=W@^+CBt`I|VR`~v$Y?XY58
zP*=``d>~b_INMNi8!_yaI)oy`Z4)e$5{DYv;VW$Vu<ZeP79O27Br>TT4t&ir&o7H0
z|AG(I#eJ|9AcpP{@(I>mmgQC~r2(7j)<m2-7NndNbR|&)#<_}PPiuy}pLdy`iBCwH
zKb8^hfE@zQ0@!^@$}M&;FFI>xO>nve)*-qcKiV3R>IPWSIh`$BFT04Da$2OlM9R|b
z&azF}1v>@qfd|+PTt2miIww&MEgfEf9jLAA3RBfIT_EFuA>VmYGu#w0(u7a1$%c*0
znnLF>qbYQke5S|1jil^weC1<{YjL(sH2E~wiK?lm&6)7LAI3ZkIsXb8k+1$E3r#qs
z=D$NKBHbY4t()^PGS1J&m*I4bNMrs2q`tmV2dwc}npyVE{s}Mu4kF1dAUPHA00000
LNkvXXu0mjf#=+sP

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim6.png b/core/res/res/drawable/search_spinner_anim6.png
new file mode 100755
index 0000000000000000000000000000000000000000..99d1d4e71c8be19e25376d242055d85c07ecd704
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzpGibPRCwB~RIy3}K@h!*m*^!%kc%LK
zD40Tf>(r*UxA%|y2@5O1*2W)D8~p+?8e%S9&g6U#-oa#Z!Ui08%<Rn0+nwE=4U3`(
zTnWQ)4XT0I1a?A~LU0xD@WrsFuxD;=R6*8)ie*ok2&^ldYcbAg!JdG0Z1ZalS+gXQ
z)JbB-Q~64Xm9tF909H$3W)*}MmM~)uat{|uF3V&&m@tAa7fW?cL$h$I*j#guVedjm
z7{4%+XR__AIto0bBr~oDuGDbm)dGLnaK@dG&qg;_7t*Td@W&2G$n*OokoV1!6CE~h
zF!v=hq+3w?LO0T*Z3wx&08cp+*~;hTx8r{-xl3JjDQu@7PqICz9`H&aZxE{0T4o-1
zIrJpFggP>=o0>|sGGC$M4`=+ycA4?l&`vY8Q(G4{cFRZX0O|sGL+nazdJ5dL<Vc^~
z7=c2K-ZtM=tlr(!_zUO*Cj`kvI)J`gcs3$y8nVFrE*4KF-b2oLNw)M3^?gkoLfh-K
zpUwCdIoE+hvIPA=v24E6j*!U5vUjR-e+3u-P6XjrOg4ek00000NkvXXu0mjfRP^5%

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim7.png b/core/res/res/drawable/search_spinner_anim7.png
new file mode 100755
index 0000000000000000000000000000000000000000..8ca3358e9e8909f5abe9a328d75ca5df36067bcb
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzr%6OXRCwB?RlQEbKnzaWG$oCYK&=>%
zm{|CkKw04x*mwd49*Kbm;2BsLm|<gsiJ79dN}?vv@HzPoxu+mqgeA*opZ%TfJ12fs
zRh~`0@An}>?B!UG#l$U`st?#AtP8Ba?bx6NEQW}<E+h~<<aWu!#3#l&hs-LKRnGz&
z88Fg7K$Kq4W+<}!8$iFI5e~|rE?WRKYrv(%Fp;&A>&&DaI4mH|VHx{0Q&r^LThVt@
zS|S-iPbE@%vTdEZ@Epj1DbuH%6k2{g&z)@FP|`HdWI)bg`*O^%&vw=QmG(%<W8U7c
zu|tLex&g68o&<cfLvpDvz>y9J*12D98MEZll>LvACnDP}C36Ku+z!Mk_+1!rbDyIV
zD?iC{<_LHRv8PNAJ(j9z)uH0KrN0LC+iAurGE>3{ki$~@O=52s;zFhZdv_euWAL+-
z9PlHTHltV%x*n&9O~0mo13m}u6Wk-HWcsxBJyc%}J)3g-C*VWsBHzFX^#n0f#NPk)
z4s)^wOq6~^Ktqojtj^lu7jVmY_4uT&U^~P51?#CD`y;>rH>b#^_5~e<00000NkvXX
Hu0mjfY`Nw5

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim8.png b/core/res/res/drawable/search_spinner_anim8.png
new file mode 100755
index 0000000000000000000000000000000000000000..408d7238032a59a550c6b1e63a150cf752f09453
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzw@E}nRCwB~Rk2RPKnzXNG>`@)Pz7Q^
zLSpQK5Hn(BX5bh22`2u84J79B1#B?F(g6e`2-?ylO`+krc~_ZJDy0ZZulCvJ=kwj=
z>gIXw*y6fw4Jtq^f!!1rLvZD9@P)85*xz=pZxKmi0|+_JBoSEPlo5+X0@w*i2b#mP
z3WSD?QWp|6&gh%Y2Wg{}Py(nH!yJ|nYG}ft<VY^ND_Vvfv04oi`ix1jg!|N0g%ifc
zoV&~|k)(nA$eyfPRr^i_QDjEmrBYzc^PK8p&kbC;HaxjH5tm(u87uU8h?D)5JZZT}
zM`oOJtk7Oe;BzwrVx$kCqAcl?_ndzgSz)eQ{sYISX;*aFp~&6)s<?lPP+P!<0C}m)
zQ;O6)Ihbxm!X2m;<?48BRm*sec2jHo>QC-Y@i~R&E5Y~#_8M@G@sqWxb*KZNhuAeg
z(+%K7S~kyD%(pHk**^V;7+*pkb9@2p0-GdvNSZ=FP9KN7cx8p`NRf%$1KWf{{S34?
zZXrijdQ*B25x9bCE7yZc)`UjxfZJbNGUG2m_HPfdHtaL?=*pEkg-_b<!0y?(KLQK@
XOGd;`6`0!Q00000NkvXXu0mjfo2l%&

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/search_spinner_anim9.png b/core/res/res/drawable/search_spinner_anim9.png
new file mode 100755
index 0000000000000000000000000000000000000000..42a2c6525c52c6c018596080b11810f1eae327c2
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzxJg7oRCwB~RJ%$8Q4rl-Z#E<wK?y<-
z(xvdxSXf(%{y`c)!0+%U?5!<qOt93}53o>Bu+#V;CY$V<tY_q09j*&*#DQTRcjnAv
z_g+8CGS4O7_vau&oW;=V;^GlpSr5Jn^aT3E%{4h-5k!T00+9+hk5d+tm<W0d(1Fem
z9I&bdBbB5RWheAmsxap#pd6su5bD?gOdZyMW69B=Mvp1uAfOLvi^bg2t12AxY|7Yq
z=w(P>#+OXl$)Z!W?-d{mrd-c~T6peWe<3$Els4^eQX<Qk?*%)QysF)=tVc$!(~(%`
z3>~`7goZzDNKW+!C`dK^<pb}ZNjl8*$bZ0iv*U`iA7u%~DtHatf$y&1{tR!{*GDmM
z?!wqpaRPo&u)B!em04gQJG^v)9%dMK>exwuHU*$V$2sgnRBD6w!OJ;g*1#L!72YU&
z_dl<x;Ujm1fFb0ufWfuNpe@*^kUO-yU@5XdaLK)bobX}!eh&$@t-yqCz)iA8*#kFd
zH;^+z?rrXWh=VhT3kR^JYyo^x_PqwneX$X6f~o?#4*dywQysV9>%w;p{So@e&HoT!
Y02;f*9kog}-v9sr07*qoM6N<$f`yp!t^fc4

literal 0
HcmV?d00001

diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml
index b5124904e4279..7b7f8a67f5ff1 100644
--- a/core/res/res/layout/search_bar.xml
+++ b/core/res/res/layout/search_bar.xml
@@ -71,6 +71,7 @@
                 android:layout_weight="1.0"
                 android:paddingLeft="8dip"
                 android:paddingRight="6dip"
+                android:drawablePadding="2dip"
                 android:singleLine="true"
                 android:inputType="text|textAutoComplete"
                 android:dropDownWidth="fill_parent"