From e2ac72b4bc1c3dcb1540624c40ab17dfbf78a6ee Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 23 Sep 2010 15:41:50 -0700
Subject: [PATCH] Add a delete button to quickly delete a word in the user
 dictionary.

---
 res/drawable-hdpi/ic_item_delete.png          | Bin 0 -> 1445 bytes
 res/drawable-mdpi/ic_item_delete.png          | Bin 0 -> 3440 bytes
 res/layout/user_dictionary_item.xml           |  53 ++++++++++++++++++
 .../settings/UserDictionarySettings.java      |  48 ++++++++++++----
 4 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_item_delete.png
 create mode 100644 res/drawable-mdpi/ic_item_delete.png
 create mode 100644 res/layout/user_dictionary_item.xml

diff --git a/res/drawable-hdpi/ic_item_delete.png b/res/drawable-hdpi/ic_item_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3e53d7596c135fccdfd8710d01201f29f003d34
GIT binary patch
literal 1445
zcmV;W1zP%vP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%M@d9MRCwC#nORR8R}_HHoeeuI21D=w
zWicS7%1bICMOBmr6jvq$nn+Qr{((GJY91?<<RPI_AJdoohE%O8H4Py+1(CF>s#HkL
z3uz=Ugaj~~+1z@W<@TImGt}V0OR7k|Xk>eQ@44T1_c4rf4sUZ}1%ZM<L7*T|5GV*_
zl1AlDRRR_{4n>jUtO#Tfj#OR)6Bc<K79n1u121XQ21A)}2$>Z6L-v0b0sZwFXu)}i
zpI$(a1Oic0*tsY#m7%f}gJMz4H_`)tN}Zn{1L-!k`c^Bh8NmH+raZ;oNZS)u8Hhue
zCr*pN0vN|dWvDm)0sY#0`rtQt6Cije!mG>yB_LU?8OHWp;ITDqe}6?9iEa25gclIL
znmJr<P=Mig*b5NiF^C>f!nVLOgm-{=+p`6~owg+wQNlPxA{l<O<#*w?6G_aYL=22;
zr))~t5(vsYA2VRzxezNE{vZh&PE|<~1i!Rr*!&khSpw$;#^j$gYxlp;$s|_6(Ox4L
z!!cR0rt1ES{>l-z3db`-1(pzW0oySShIP?<x<}tp9?Hv8#G#Aopt`8eob^Eb{V%*A
zu;2JbROJ)6+G$40d=zPAXHI~>j7d-F{yNuj%!4)ND-LLRE6LbDEh?~5X9!Gwrs(&t
zCv!FjV%>cwf%75$YFRZW=F&>g>a+?8Kiw+_#aeCB!3!-l!0IbQz?jd`-#eD`RVYdl
zra5H3Mv3wC63Y-@qtBIK1HQEegm(~L5PVLX@EPp`e|O(P362s=X(bHUjEw`s27DF5
zGhcE4^|8EeWY$WNBw-vPkv1W`m;_&PMEI=ELhIc(vy<2dU)FzPEEA5bPNQp<ggIm!
zRbmTXwBQAwD?|949H&?OH%@}4qr|dm1nnIt#by=Zal*=yuOe`BESvhX7MK+;(PTX@
zF<}Vo#$pU~Zu)R?57!#^vZ`Oo_JLv?A}Sut?zp)Ebkwjl^mu}f9(Qo(?WhF^{ck-m
zEOyl4jyr_sniF)k5f5H0_as_g>Fk8p3*4c7=Z%q>H!kqA1<#KRpIU<XKFm-eBY}X>
zUWbRV5!_u{GlAbPfxGrNZgm}g^YKjH1s)3L2>us@_Z|u_Ad)0*?#enYuO?3?F^MHU
zxL`h+$(z7{aIOJgu;pcMMH+b7tAgCDMy=<8V92RWh7Ofju_QD)eRg!2Po{G&Fo^It
z=0{xE@+goV-m6Asujh&-FggDN3fPd)@L?t~iF2Z()24*&WwaQ?yAlZAQY=E~Ch!B`
zJs^2KQ7Dow$DU6=vNkSP@nyXCBbGT(f?~QbHm*uu9n8D<@k~yCRykhma#q%<Ac$h>
zpG%Tj9u%oZUs!z<dlm$`=sn%r>=o6@n<@syraGvuoNr{xsphLp76Yu<;ZBUt0yoS(
zEw3P$*yM?F8R6$whvP3^fw^H#0WhCWLy=iOELNBIV4nL}sWTCr+tU+F6hOfT8mYz|
z=9+OeFO&G?#ojhtQ3BfZ!mb3tx731y@Jx}q5dLv8{ElO(6N*mMgXAf1=LvlvF*WZ@
zOw3vm7JO?h$PLwDT)F&>5Bf&)wv0|){Bl<U$FtJt0h!=s$&W+j*Z5xuABm<OuO%q)
zE=p9FpXHh!&`9Ftyw!W#@J$cC8qNDgHucf<Hql)c08wy*VMdIVjV^62d?@^W3Ax67
zR;(x;z!)VMBW#4%{Y^jJ8qNDgwlkbQ?Q4+hsxBe;!^HT^c+3WTvV;RAl-9ad6uF?y
zEZuATws$%cj>7*33IYXzf<Qr_An;ZT{42l!KcGZ^=P<%~00000NkvXXu0mjfz8{i0

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_item_delete.png b/res/drawable-mdpi/ic_item_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..f074db32efc24f4f53ac7c414fa7aaa42afef3c6
GIT binary patch
literal 3440
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
ShYA(|0000<MNUMnLSTZJ$!hHY

literal 0
HcmV?d00001

diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
new file mode 100644
index 00000000000..926068fd93a
--- /dev/null
+++ b/res/layout/user_dictionary_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+    <TextView
+            android:id="@android:id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:minHeight="?android:attr/listPreferredItemHeight"/>
+
+    <ImageView
+            android:id="@+id/divider"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dip"
+            android:src="@drawable/nav_divider"
+        />
+
+    <ImageView
+            android:id="@+id/delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
+            android:paddingTop="8dip"
+            android:paddingBottom="8dip"
+            android:src="@drawable/ic_item_delete"
+            android:background="@android:drawable/list_selector_background"
+        />
+</LinearLayout>
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 6386c86b0d1..7bd5d56ac63 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -41,6 +41,7 @@ import android.view.WindowManager;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AlphabetIndexer;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
@@ -59,7 +60,10 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata
     private static final String[] QUERY_PROJECTION = {
         UserDictionary.Words._ID, UserDictionary.Words.WORD
     };
-    
+
+    private static final int INDEX_ID = 0;
+    private static final int INDEX_WORD = 1;
+
     // Either the locale is empty (means the word is applicable to all locales)
     // or the word equals our current locale
     private static final String QUERY_SELECTION = UserDictionary.Words.LOCALE + "=? OR "
@@ -152,9 +156,9 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata
 
     private ListAdapter createAdapter() {
         return new MyAdapter(getActivity(),
-                android.R.layout.simple_list_item_1, mCursor,
-                new String[] { UserDictionary.Words.WORD },
-                new int[] { android.R.id.text1 });
+                R.layout.user_dictionary_item, mCursor,
+                new String[] { UserDictionary.Words.WORD, UserDictionary.Words._ID },
+                new int[] { android.R.id.text1, R.id.delete_button }, this);
     }
     
     @Override
@@ -285,15 +289,35 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata
                 UserDictionary.Words.CONTENT_URI, DELETE_SELECTION, new String[] { word });
     }
 
-    private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer {
-        private AlphabetIndexer mIndexer;        
-        
-        public MyAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
+    private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer,
+            View.OnClickListener {
+
+        private AlphabetIndexer mIndexer;
+        private UserDictionarySettings mSettings;
+
+        private ViewBinder mViewBinder = new ViewBinder() {
+
+            public boolean setViewValue(View v, Cursor c, int columnIndex) {
+                if (v instanceof ImageView && columnIndex == INDEX_ID) {
+                    v.setOnClickListener(MyAdapter.this);
+                    v.setTag(c.getString(INDEX_WORD));
+                    return true;
+                }
+
+                return false;
+            }
+        };
+
+        public MyAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
+                UserDictionarySettings settings) {
             super(context, layout, c, from, to);
 
+            mSettings = settings;
             int wordColIndex = c.getColumnIndexOrThrow(UserDictionary.Words.WORD);
-            String alphabet = context.getString(com.android.internal.R.string.fast_scroll_alphabet);
-            mIndexer = new AlphabetIndexer(c, wordColIndex, alphabet); 
+            String alphabet = context.getString(
+                    com.android.internal.R.string.fast_scroll_alphabet);
+            mIndexer = new AlphabetIndexer(c, wordColIndex, alphabet);
+            setViewBinder(mViewBinder);
         }
 
         public int getPositionForSection(int section) {
@@ -307,5 +331,9 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata
         public Object[] getSections() {
             return mIndexer.getSections();
         }
+
+        public void onClick(View v) {
+            mSettings.deleteWord((String) v.getTag());
+        }
     }
 }