diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2013-10-17 09:09:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-17 09:09:16 -0700 |
| commit | 38d097b6d1102760cf25eee3d39cb687b8f7cf80 (patch) | |
| tree | 0fd9339d01fd1a758fce571dad8c08b0fe24eedf /tools | |
| parent | ca429e08fea319fa1baf527a6f12619be53afe34 (diff) | |
| parent | 92a80b1830082d109be4902c357424535305130d (diff) | |
| download | frameworks_base-38d097b6d1102760cf25eee3d39cb687b8f7cf80.zip frameworks_base-38d097b6d1102760cf25eee3d39cb687b8f7cf80.tar.gz frameworks_base-38d097b6d1102760cf25eee3d39cb687b8f7cf80.tar.bz2 | |
am 92a80b18: am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev
* commit '92a80b1830082d109be4902c357424535305130d':
Layoutlib: Update the wifi icon in the status bar.
Diffstat (limited to 'tools')
| -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 | |||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java | 5 |
8 files changed, 6 insertions, 7 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 diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java index baa956d..3692d96 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java @@ -45,10 +45,7 @@ public class StatusBar extends CustomBar { // We do know the order though. // 0 is the spacer loadIcon(1, "stat_sys_wifi_signal_4_fully.png", density); - Drawable drawable = loadIcon(2, ResourceType.DRAWABLE, "stat_sys_battery_charge"); - if (drawable instanceof LevelListDrawable) { - ((LevelListDrawable) drawable).setLevel(100); - } + loadIcon(2, "stat_sys_battery_charge_anim100.png", density); } @Override |
