diff options
| -rw-r--r-- | res/drawable-hdpi/ic_search_category_bookmark.png | bin | 1749 -> 1950 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_search_category_browser.png | bin | 4296 -> 2495 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_search_category_history.png | bin | 2657 -> 2184 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_search_category_suggest.png | bin | 2448 -> 1783 bytes | |||
| -rw-r--r-- | res/layout/suggestion_item.xml | 15 | ||||
| -rw-r--r-- | res/values-sw600dp/dimensions.xml | 1 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 1 | ||||
| -rw-r--r-- | src/com/android/browser/TitleBarPhone.java | 25 |
8 files changed, 19 insertions, 23 deletions
diff --git a/res/drawable-hdpi/ic_search_category_bookmark.png b/res/drawable-hdpi/ic_search_category_bookmark.png Binary files differindex f94776a..017df48 100644 --- a/res/drawable-hdpi/ic_search_category_bookmark.png +++ b/res/drawable-hdpi/ic_search_category_bookmark.png diff --git a/res/drawable-hdpi/ic_search_category_browser.png b/res/drawable-hdpi/ic_search_category_browser.png Binary files differindex fbafafb..05b3324 100644 --- a/res/drawable-hdpi/ic_search_category_browser.png +++ b/res/drawable-hdpi/ic_search_category_browser.png diff --git a/res/drawable-hdpi/ic_search_category_history.png b/res/drawable-hdpi/ic_search_category_history.png Binary files differindex 8ca6089..6eac1c5 100644 --- a/res/drawable-hdpi/ic_search_category_history.png +++ b/res/drawable-hdpi/ic_search_category_history.png diff --git a/res/drawable-hdpi/ic_search_category_suggest.png b/res/drawable-hdpi/ic_search_category_suggest.png Binary files differindex 8e96638..54ef717 100644 --- a/res/drawable-hdpi/ic_search_category_suggest.png +++ b/res/drawable-hdpi/ic_search_category_suggest.png diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml index c08ba84..17b01ba 100644 --- a/res/layout/suggestion_item.xml +++ b/res/layout/suggestion_item.xml @@ -32,14 +32,15 @@ android:layout_height="match_parent" android:layout_weight="1" android:orientation="horizontal" - android:background="@drawable/suggest_item_selector"> + android:background="@drawable/suggest_item_selector" + android:padding="0dp"> <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/icon1" android:layout_gravity="center_vertical" - style="@style/HoloIcon" - android:layout_marginRight="16dip" /> + android:layout_marginLeft="@dimen/suggest_item_padding" + android:layout_marginRight="@dimen/suggest_item_padding" /> <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" @@ -69,12 +70,12 @@ /> <ImageView android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:id="@+id/icon2" android:scaleType="center" android:src="@drawable/ic_add_string" - android:background="?android:attr/activatedBackgroundIndicator" - style="@style/HoloButton" - android:layout_marginRight="16dip" + android:background="@drawable/suggest_item_selector" + android:paddingRight="@dimen/suggest_item_padding" + android:paddingLeft="@dimen/suggest_item_padding" /> </LinearLayout> diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml index 977148b..e1ed19e 100644 --- a/res/values-sw600dp/dimensions.xml +++ b/res/values-sw600dp/dimensions.xml @@ -34,4 +34,5 @@ <dimen name="qc_thumb_width">240dip</dimen> <dimen name="qc_thumb_height">160dip</dimen> <dimen name="qc_item_size">48dip</dimen> + <dimen name="suggest_item_padding">16dp</dimen> </resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 355c1cf..4f93914 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -71,4 +71,5 @@ <dimen name="nav_tab_height">240dip</dimen> <dimen name="nav_tab_text_normal">18sp</dimen> <dimen name="nav_tab_text_small">14sp</dimen> + <dimen name="suggest_item_padding">8dp</dimen> </resources> diff --git a/src/com/android/browser/TitleBarPhone.java b/src/com/android/browser/TitleBarPhone.java index 75b9fb7..de5fb7f 100644 --- a/src/com/android/browser/TitleBarPhone.java +++ b/src/com/android/browser/TitleBarPhone.java @@ -72,6 +72,7 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener mStopDrawable = res.getDrawable(R.drawable.ic_stop_holo_dark); mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh_holo_dark); setUaSwitcher(mFavicon); + mUrlInput.setContainer(this); } @Override @@ -110,16 +111,6 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener } @Override - protected void onProgressStarted() { - setFocusState(mUrlInput.hasFocus()); - } - - @Override - protected void onProgressStopped() { - setFocusState(mUrlInput.hasFocus()); - } - - @Override void setProgress(int progress) { super.setProgress(progress); if (progress == 100) { @@ -137,13 +128,15 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener */ @Override void setDisplayTitle(String title) { - if (title == null) { - mUrlInput.setText(R.string.new_tab); - } else { - mUrlInput.setText(title); + if (!isEditingUrl()) { + if (title == null) { + mUrlInput.setText(R.string.new_tab); + } else { + mUrlInput.setText(title); + } + mUrlInput.setSelection(0); + updateNavigationState(); } - mUrlInput.setSelection(0); - updateNavigationState(); } @Override |
