From 7b20ddd4f03d59cca8fdd4aee790784421570aab Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Thu, 14 Oct 2010 15:03:28 -0700 Subject: Fix suggestion edit button Bug 3052626 Bug 3052664 added vertical divider refresh dropdown when sugegstion is selected Change-Id: I3f2e72bbd9a93ccc3a7968e646493945c0052d2b --- src/com/android/browser/SuggestionsAdapter.java | 2 ++ src/com/android/browser/TitleBarXLarge.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/com/android') diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java index 7cfd78e45..30e46fe59 100644 --- a/src/com/android/browser/SuggestionsAdapter.java +++ b/src/com/android/browser/SuggestionsAdapter.java @@ -209,6 +209,7 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable, OnCli 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 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable, OnCli } 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); diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java index 57098a9b3..93a6fb521 100644 --- a/src/com/android/browser/TitleBarXLarge.java +++ b/src/com/android/browser/TitleBarXLarge.java @@ -171,7 +171,7 @@ public class TitleBarXLarge extends TitleBarBase @Override public void onEdit(String text) { - setDisplayTitle(text); + setDisplayTitle(text, true); if (text != null) { mUrlFocused.setSelection(text.length()); } @@ -240,4 +240,9 @@ public class TitleBarXLarge extends TitleBarBase mUrlUnfocused.setText(title); } + void setDisplayTitle(String title, boolean filter) { + mUrlFocused.setText(title, filter); + mUrlUnfocused.setText(title); + } + } -- cgit v1.2.3