diff options
author | Michael Kolb <kolby@google.com> | 2012-05-30 09:47:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-30 09:47:31 -0700 |
commit | c322f516e99c750978e481d7a2246bc5eb5ae353 (patch) | |
tree | f8a14e44e05c9533f014f348f6e08661feed6331 /res | |
parent | 2ed6c856c78c4d8df3432759181f34bdf89e9122 (diff) | |
parent | 5f51df7f18e8fe9319b45eaf095511f7aa95aa44 (diff) | |
download | packages_apps_browser-c322f516e99c750978e481d7a2246bc5eb5ae353.zip packages_apps_browser-c322f516e99c750978e481d7a2246bc5eb5ae353.tar.gz packages_apps_browser-c322f516e99c750978e481d7a2246bc5eb5ae353.tar.bz2 |
am 5f51df7f: am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-dev
* commit '5f51df7f18e8fe9319b45eaf095511f7aa95aa44':
tighten nav bar layout & fix animation bug
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-sw600dp/title_bar_nav.xml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml index 300b740..651474a 100644 --- a/res/layout-sw600dp/title_bar_nav.xml +++ b/res/layout-sw600dp/title_bar_nav.xml @@ -28,7 +28,6 @@ android:src="@drawable/ic_back_holo_dark" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingLeft="16dip" android:contentDescription="@string/accessibility_button_back" style="@style/HoloButton" /> <ImageButton @@ -52,22 +51,20 @@ android:layout_width="0dip" android:layout_height="match_parent" android:layout_weight="1.0" - android:layout_marginLeft="8dip" - android:layout_marginRight="8dip" android:orientation="horizontal" android:background="@drawable/url_background"> <ImageView android:id="@+id/url_icon" - android:layout_width="48dip" + android:layout_width="32dip" android:layout_height="20dip" - android:paddingLeft="14dip" - android:paddingRight="14dip" android:src="@drawable/ic_web_holo_dark" android:layout_gravity="center" /> <ImageView android:id="@+id/lock" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="0dip" style="@style/HoloIcon" android:visibility="gone" /> <com.android.browser.UrlInputView @@ -75,7 +72,7 @@ android:layout_width="0dip" android:layout_weight="1.0" android:layout_height="match_parent" - android:paddingLeft="0dip" + android:paddingLeft="4dip" android:paddingRight="0dip" android:background="@null" android:textAppearance="?android:attr/textAppearanceMedium" @@ -115,7 +112,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:scaleType="center" - android:paddingRight="16dip" style="@style/HoloButton" android:contentDescription="@string/accessibility_button_bookmarks" android:src="@drawable/ic_bookmarks_history_holo_dark" /> |