summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-08-24 13:22:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-24 13:22:23 -0700
commit053f016e3b8328f6de0288f918c4615b8ba673b1 (patch)
treeeb523700bc8a324fe1ff7f11f7f7ee4e67e32884 /res/layout
parent904a8bd6faf1965097b4f264595e654a33ac2086 (diff)
parent6ced844e7655dc9fededcbe20046e1baf16f490e (diff)
downloadpackages_apps_Browser-053f016e3b8328f6de0288f918c4615b8ba673b1.zip
packages_apps_Browser-053f016e3b8328f6de0288f918c4615b8ba673b1.tar.gz
packages_apps_Browser-053f016e3b8328f6de0288f918c4615b8ba673b1.tar.bz2
Merge "Fix icon resources"
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/title_bar.xml2
-rw-r--r--res/layout/title_bar_nav.xml14
2 files changed, 7 insertions, 9 deletions
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index acc49e6..eb3f782 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:background="@null"
android:layout_below="@id/taburlbar"
- android:src="@drawable/progress"
+ android:src="@drawable/progress_primary_holo_dark"
android:layout_marginTop="@dimen/progress_bar_margin"
android:visibility="gone" />
</RelativeLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index e14c089..18cd4e7 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -39,16 +39,14 @@
style="@style/HoloButton">
<ImageView
android:id="@+id/favicon"
- android:layout_width="36dip"
- android:layout_height="36dip"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- android:layout_gravity="center_vertical" />
+ android:layout_width="20dip"
+ android:layout_height="20dip"
+ android:layout_gravity="center" />
<ImageView
android:id="@+id/lock"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|right"
+ android:layout_width="32dip"
+ android:layout_height="33dip"
+ android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
<ImageView