summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-14 12:19:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-14 12:19:20 -0800
commit96893be80e21c4af58c878bacea3cb31f59d06e8 (patch)
tree2197b3d41a06c45f2aa7b9d030f29df96c749191
parent9a67e14fc41c439458f65075fabf1b2cbd31c1fc (diff)
parent38eb5eea5d03f6d177f0458a3382a28e87e5a88c (diff)
downloadpackages_apps_browser-96893be80e21c4af58c878bacea3cb31f59d06e8.zip
packages_apps_browser-96893be80e21c4af58c878bacea3cb31f59d06e8.tar.gz
packages_apps_browser-96893be80e21c4af58c878bacea3cb31f59d06e8.tar.bz2
am 38eb5eea: Merge "Restrict Favicon size for tablet" into ics-mr1
* commit '38eb5eea5d03f6d177f0458a3382a28e87e5a88c': Restrict Favicon size for tablet
-rw-r--r--res/layout-sw600dp/title_bar_nav.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 433394c..e628a81 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -58,12 +58,12 @@
android:background="@drawable/url_background">
<ImageView
android:id="@+id/url_icon"
- android:layout_width="48dp"
- android:layout_height="match_parent"
+ android:layout_width="48dip"
+ android:layout_height="20dip"
+ android:paddingLeft="14dip"
+ android:paddingRight="14dip"
android:src="@drawable/ic_web_holo_dark"
- android:contentDescription="@string/accessibility_button_uaswitch"
- android:scaleType="center"
- style="@style/HoloButton" />
+ android:layout_gravity="center" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"