commit 7b20ddd4f03d59cca8fdd4aee790784421570aab
author Michael Kolb <kolby@google.com> Thu Oct 14 15:03:28 2010 -0700
committer Michael Kolb <kolby@google.com> Thu Oct 14 15:11:15 2010 -0700
tree 0d3e3220eda33b25f3cdd7e9db7e47a4412e4591
parent b3a00ab2336bdb2871924232b744160f47116a78

Fix suggestion edit button

    Bug 3052626
    Bug 3052664

    added vertical divider
    refresh dropdown when sugegstion is selected

Change-Id: I3f2e72bbd9a93ccc3a7968e646493945c0052d2b

res/layout/suggestion_item.xml

diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index fec5ae3..37e1f2a 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -55,6 +55,13 @@
             android:layout_below="@android:id/text1"
             android:layout_alignLeft="@android:id/text1" />
     </RelativeLayout>
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/divider"
+        android:scaleType="center"
+        android:src="@drawable/divider_vert"
+        />
     <ImageButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

src/com/android/browser/SuggestionsAdapter.java

diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 7cfd78e..30e46fe 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -209,6 +209,7 @@
         ImageView ic1 = (ImageView) view.findViewById(R.id.icon1);
         View spacer = view.findViewById(R.id.spacer);
         View ic2 = view.findViewById(R.id.icon2);
+        View div = view.findViewById(R.id.divider);
         tv1.setText(item.title);
         tv2.setText(item.url);
         int id = -1;
@@ -234,6 +235,7 @@
         }
         ic2.setVisibility(((TYPE_SUGGEST == item.type) || (TYPE_SEARCH == item.type))
                 ? View.VISIBLE : View.GONE);
+        div.setVisibility(ic2.getVisibility());
         spacer.setVisibility(((TYPE_SUGGEST == item.type) || (TYPE_SEARCH == item.type))
                 ? View.GONE : View.INVISIBLE);
         view.setOnClickListener(this);

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 57098a9..93a6fb5 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -171,7 +171,7 @@
 
     @Override
     public void onEdit(String text) {
-        setDisplayTitle(text);
+        setDisplayTitle(text, true);
         if (text != null) {
             mUrlFocused.setSelection(text.length());
         }
@@ -240,4 +240,9 @@
         mUrlUnfocused.setText(title);
     }
 
+    void setDisplayTitle(String title, boolean filter) {
+        mUrlFocused.setText(title, filter);
+        mUrlUnfocused.setText(title);
+    }
+
 }