summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-06-17 16:26:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-17 16:26:59 -0700
commitd81500c9a8cc733da2c916dddd1bfa3c0ba2c05e (patch)
tree9a425328e4a6c7d0d83972369d2f6606f165a0b7 /res
parent3f1c7b93b87595beb2610b31ed9bbef211bcab40 (diff)
parent67f3363c1fa95aa06b6a90e1f07ad950e4e22a3a (diff)
downloadpackages_apps_browser-d81500c9a8cc733da2c916dddd1bfa3c0ba2c05e.zip
packages_apps_browser-d81500c9a8cc733da2c916dddd1bfa3c0ba2c05e.tar.gz
packages_apps_browser-d81500c9a8cc733da2c916dddd1bfa3c0ba2c05e.tar.bz2
Merge "Omnibox improvements"
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_search_category_bookmark.pngbin1749 -> 1950 bytes
-rw-r--r--res/drawable-hdpi/ic_search_category_browser.pngbin4296 -> 2495 bytes
-rw-r--r--res/drawable-hdpi/ic_search_category_history.pngbin2657 -> 2184 bytes
-rw-r--r--res/drawable-hdpi/ic_search_category_suggest.pngbin2448 -> 1783 bytes
-rw-r--r--res/layout/suggestion_item.xml15
-rw-r--r--res/values-sw600dp/dimensions.xml1
-rw-r--r--res/values/dimensions.xml1
7 files changed, 10 insertions, 7 deletions
diff --git a/res/drawable-hdpi/ic_search_category_bookmark.png b/res/drawable-hdpi/ic_search_category_bookmark.png
index f94776a..017df48 100644
--- a/res/drawable-hdpi/ic_search_category_bookmark.png
+++ b/res/drawable-hdpi/ic_search_category_bookmark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_browser.png b/res/drawable-hdpi/ic_search_category_browser.png
index fbafafb..05b3324 100644
--- a/res/drawable-hdpi/ic_search_category_browser.png
+++ b/res/drawable-hdpi/ic_search_category_browser.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_history.png b/res/drawable-hdpi/ic_search_category_history.png
index 8ca6089..6eac1c5 100644
--- a/res/drawable-hdpi/ic_search_category_history.png
+++ b/res/drawable-hdpi/ic_search_category_history.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_suggest.png b/res/drawable-hdpi/ic_search_category_suggest.png
index 8e96638..54ef717 100644
--- a/res/drawable-hdpi/ic_search_category_suggest.png
+++ b/res/drawable-hdpi/ic_search_category_suggest.png
Binary files differ
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>