summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/resources
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-02-06 10:58:16 -0800
committerXavier Ducrohet <xav@android.com>2011-02-06 10:58:16 -0800
commit13bdc3355c781dc2614f2810a42d3a9e73f5bed9 (patch)
treeb40424e57a6011ff0b0febf0fa39a13f6bfb0269 /tools/layoutlib/bridge/resources
parentfd18f573280bbbcc549b35b548580a562bd960e2 (diff)
downloadframeworks_base-13bdc3355c781dc2614f2810a42d3a9e73f5bed9.zip
frameworks_base-13bdc3355c781dc2614f2810a42d3a9e73f5bed9.tar.gz
frameworks_base-13bdc3355c781dc2614f2810a42d3a9e73f5bed9.tar.bz2
LayoutLib: improved rendering for system/title/action bars.
Change-Id: I926531e9ad4a7b98e04e23cac3837794f7c89449
Diffstat (limited to 'tools/layoutlib/bridge/resources')
-rw-r--r--tools/layoutlib/bridge/resources/bars/action_bar.xml6
-rw-r--r--tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.pngbin0 -> 1195 bytes
-rw-r--r--tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.9.pngbin0 -> 3233 bytes
-rw-r--r--tools/layoutlib/bridge/resources/bars/mdpi/status_bar_background.9.pngbin0 -> 204 bytes
-rw-r--r--tools/layoutlib/bridge/resources/bars/phone_system_bar.xml9
-rw-r--r--tools/layoutlib/bridge/resources/bars/tablet_system_bar.xml6
-rw-r--r--tools/layoutlib/bridge/resources/bars/title_bar.xml3
7 files changed, 13 insertions, 11 deletions
diff --git a/tools/layoutlib/bridge/resources/bars/action_bar.xml b/tools/layoutlib/bridge/resources/bars/action_bar.xml
index cd99a09..51983f2 100644
--- a/tools/layoutlib/bridge/resources/bars/action_bar.xml
+++ b/tools/layoutlib/bridge/resources/bars/action_bar.xml
@@ -2,10 +2,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_width="wrap_content"/>
<TextView
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_height="wrap_content"/>
</merge>
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..bd44b52
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.9.png b/tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.9.png
new file mode 100644
index 0000000..a4be298
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.9.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/status_bar_background.9.png b/tools/layoutlib/bridge/resources/bars/mdpi/status_bar_background.9.png
new file mode 100644
index 0000000..eb7c1a4
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/mdpi/status_bar_background.9.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/phone_system_bar.xml b/tools/layoutlib/bridge/resources/bars/phone_system_bar.xml
index 29df909..5211b0a 100644
--- a/tools/layoutlib/bridge/resources/bars/phone_system_bar.xml
+++ b/tools/layoutlib/bridge/resources/bars/phone_system_bar.xml
@@ -3,10 +3,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text=" "/>
+ android:layout_weight="1"/>
<ImageView
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_width="wrap_content"/>
+ <ImageView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"/>
</merge>
diff --git a/tools/layoutlib/bridge/resources/bars/tablet_system_bar.xml b/tools/layoutlib/bridge/resources/bars/tablet_system_bar.xml
index 8a3b87a..c5acddb 100644
--- a/tools/layoutlib/bridge/resources/bars/tablet_system_bar.xml
+++ b/tools/layoutlib/bridge/resources/bars/tablet_system_bar.xml
@@ -15,6 +15,10 @@
android:layout_weight="1"/>
<ImageView
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"/>
+ <ImageView
+ android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_marginLeft="3dip"
+ android:layout_marginRight="15dip"/>
</merge>
diff --git a/tools/layoutlib/bridge/resources/bars/title_bar.xml b/tools/layoutlib/bridge/resources/bars/title_bar.xml
index 29fcc4b..76d78d9 100644
--- a/tools/layoutlib/bridge/resources/bars/title_bar.xml
+++ b/tools/layoutlib/bridge/resources/bars/title_bar.xml
@@ -2,6 +2,5 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_height="wrap_content"/>
</merge>