diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2013-11-06 15:15:32 +0530 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2014-01-27 10:31:09 -0800 |
commit | 03a057c1af9ca3f125c7924bf0b78da52223d8d3 (patch) | |
tree | 5dd4c9e5f9eacfb667676bdf534369f83898ee21 /tools/layoutlib/bridge/resources | |
parent | b30296b5fda75bf383c7ab3f567eb41820747869 (diff) | |
download | frameworks_base-03a057c1af9ca3f125c7924bf0b78da52223d8d3.zip frameworks_base-03a057c1af9ca3f125c7924bf0b78da52223d8d3.tar.gz frameworks_base-03a057c1af9ca3f125c7924bf0b78da52223d8d3.tar.bz2 |
Manual merge of changes from frameworks/base/tools
Manually merge of following changes:
9cb5f5b5233f2331748d108d71f4b685762f32a7
1cf5df38f4bdafa1beb2674ca548ad6d9650766b
083e3caf66c21f7cc9511db479726c38d90e2d2f
81f74f4bc96ea4266cebe1b785d095558f540800
39e75835399f4d979cf82069dae2bd1ec496fb81
272d1bce798a5fef42cc2ee31f629d00c89f66eb
45f5cd49fa898a59484edfd8e291dbe10df82db2
Change-Id: Ie21ca480ac117e16e28eb554474835b762ccb104
Diffstat (limited to 'tools/layoutlib/bridge/resources')
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png | bin | 0 -> 1040 bytes | |||
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png | bin | 1195 -> 2436 bytes | |||
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png | bin | 0 -> 762 bytes | |||
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png | bin | 885 -> 1430 bytes | |||
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/status_bar.xml | 8 | ||||
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png | bin | 0 -> 1332 bytes | |||
-rw-r--r-- | tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png | bin | 0 -> 3485 bytes |
7 files changed, 5 insertions, 3 deletions
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png Binary files differnew file mode 100644 index 0000000..829378e --- /dev/null +++ b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png 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 Binary files differindex bd44b52..931daed 100644 --- 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 diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png Binary files differnew file mode 100644 index 0000000..2773a70 --- /dev/null +++ b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png Binary files differindex c629387..6e1ac91 100644 --- a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png +++ b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png diff --git a/tools/layoutlib/bridge/resources/bars/status_bar.xml b/tools/layoutlib/bridge/resources/bars/status_bar.xml index d3c492e..51b474d 100644 --- a/tools/layoutlib/bridge/resources/bars/status_bar.xml +++ b/tools/layoutlib/bridge/resources/bars/status_bar.xml @@ -6,10 +6,12 @@ android:layout_weight="1"/> <ImageView android:layout_height="wrap_content" - android:layout_width="wrap_content"/> + android:layout_width="wrap_content" + android:layout_marginTop="1dp"/> <ImageView android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginLeft="3dip" - android:layout_marginRight="5dip"/> + android:layout_marginLeft="3dp" + android:layout_marginRight="5dp" + android:layout_marginTop="1dp"/> </merge> diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png Binary files differnew file mode 100644 index 0000000..c7fd719 --- /dev/null +++ b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png Binary files differnew file mode 100644 index 0000000..625c61d --- /dev/null +++ b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png |