From 1076be31f1c14f39295cc2ce7a747ee9ad96ee73 Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Thu, 26 Jun 2014 20:02:57 -0700
Subject: Update system icon resolution in LayoutLib.

This fixes some bugs with the resolution of icons for Status Bar and
Navigation Bar by separating the icons into v21 and v11 directories. An
icon is searched in v21 directory by default. For simulating older
platforms, v11 directory is searched first and then v21 is used as a
fallback.

This also adds xxhdpi versions of home, back and recent icons.

Change-Id: Ia6eafc83856eacafc4fb0b13d87793d4aa24f106
---
 .../resources/bars/hdpi-v21/ic_sysbar_back.png     | Bin 2980 -> 0 bytes
 .../resources/bars/hdpi-v21/ic_sysbar_home.png     | Bin 3653 -> 0 bytes
 .../resources/bars/hdpi-v21/ic_sysbar_recent.png   | Bin 1396 -> 0 bytes
 .../bridge/resources/bars/hdpi/ic_sysbar_back.png  | Bin 1053 -> 0 bytes
 .../bridge/resources/bars/hdpi/ic_sysbar_home.png  | Bin 1064 -> 0 bytes
 .../resources/bars/hdpi/ic_sysbar_recent.png       | Bin 711 -> 0 bytes
 .../bars/hdpi/stat_sys_battery_charge_anim100.png  | Bin 1040 -> 0 bytes
 .../bars/hdpi/stat_sys_wifi_signal_4_fully.png     | Bin 2436 -> 0 bytes
 .../bars/hdpi/status_bar_background.9.png          | Bin 3233 -> 0 bytes
 .../bars/ldrtl-hdpi-v21/ic_sysbar_back.png         | Bin 3026 -> 0 bytes
 .../resources/bars/ldrtl-hdpi/ic_sysbar_back.png   | Bin 904 -> 0 bytes
 .../resources/bars/ldrtl-hdpi/ic_sysbar_recent.png | Bin 533 -> 0 bytes
 .../bars/ldrtl-mdpi-v21/ic_sysbar_back.png         | Bin 1803 -> 0 bytes
 .../resources/bars/ldrtl-mdpi/ic_sysbar_back.png   | Bin 617 -> 0 bytes
 .../resources/bars/ldrtl-mdpi/ic_sysbar_recent.png | Bin 423 -> 0 bytes
 .../bars/ldrtl-xhdpi-v21/ic_sysbar_back.png        | Bin 4375 -> 0 bytes
 .../resources/bars/ldrtl-xhdpi/ic_sysbar_back.png  | Bin 1250 -> 0 bytes
 .../bars/ldrtl-xhdpi/ic_sysbar_recent.png          | Bin 552 -> 0 bytes
 .../resources/bars/mdpi-v21/ic_sysbar_back.png     | Bin 1845 -> 0 bytes
 .../resources/bars/mdpi-v21/ic_sysbar_home.png     | Bin 2372 -> 0 bytes
 .../resources/bars/mdpi-v21/ic_sysbar_recent.png   | Bin 1148 -> 0 bytes
 .../bridge/resources/bars/mdpi/ic_sysbar_back.png  | Bin 774 -> 0 bytes
 .../bridge/resources/bars/mdpi/ic_sysbar_home.png  | Bin 836 -> 0 bytes
 .../resources/bars/mdpi/ic_sysbar_recent.png       | Bin 591 -> 0 bytes
 .../bars/mdpi/stat_sys_battery_charge_anim100.png  | Bin 762 -> 0 bytes
 .../bars/mdpi/stat_sys_wifi_signal_4_fully.png     | Bin 1430 -> 0 bytes
 .../bars/mdpi/status_bar_background.9.png          | Bin 204 -> 0 bytes
 tools/layoutlib/bridge/resources/bars/v11/README   |   1 +
 .../resources/bars/v11/hdpi/ic_sysbar_back.png     | Bin 0 -> 1053 bytes
 .../resources/bars/v11/hdpi/ic_sysbar_home.png     | Bin 0 -> 1064 bytes
 .../resources/bars/v11/hdpi/ic_sysbar_recent.png   | Bin 0 -> 711 bytes
 .../bars/v11/ldrtl-hdpi/ic_sysbar_back.png         | Bin 0 -> 904 bytes
 .../bars/v11/ldrtl-hdpi/ic_sysbar_recent.png       | Bin 0 -> 533 bytes
 .../bars/v11/ldrtl-mdpi/ic_sysbar_back.png         | Bin 0 -> 617 bytes
 .../bars/v11/ldrtl-mdpi/ic_sysbar_recent.png       | Bin 0 -> 423 bytes
 .../bars/v11/ldrtl-xhdpi/ic_sysbar_back.png        | Bin 0 -> 1250 bytes
 .../bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png      | Bin 0 -> 552 bytes
 .../resources/bars/v11/mdpi/ic_sysbar_back.png     | Bin 0 -> 774 bytes
 .../resources/bars/v11/mdpi/ic_sysbar_home.png     | Bin 0 -> 836 bytes
 .../resources/bars/v11/mdpi/ic_sysbar_recent.png   | Bin 0 -> 591 bytes
 .../resources/bars/v11/xhdpi/ic_sysbar_back.png    | Bin 0 -> 1421 bytes
 .../resources/bars/v11/xhdpi/ic_sysbar_home.png    | Bin 0 -> 1421 bytes
 .../resources/bars/v11/xhdpi/ic_sysbar_recent.png  | Bin 0 -> 749 bytes
 .../resources/bars/v21/hdpi/ic_sysbar_back.png     | Bin 0 -> 2980 bytes
 .../resources/bars/v21/hdpi/ic_sysbar_home.png     | Bin 0 -> 3653 bytes
 .../resources/bars/v21/hdpi/ic_sysbar_recent.png   | Bin 0 -> 1396 bytes
 .../v21/hdpi/stat_sys_battery_charge_anim100.png   | Bin 0 -> 1040 bytes
 .../bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png | Bin 0 -> 2436 bytes
 .../bars/v21/hdpi/status_bar_background.9.png      | Bin 0 -> 3233 bytes
 .../bars/v21/ldrtl-hdpi/ic_sysbar_back.png         | Bin 0 -> 3026 bytes
 .../bars/v21/ldrtl-mdpi/ic_sysbar_back.png         | Bin 0 -> 1803 bytes
 .../bars/v21/ldrtl-xhdpi/ic_sysbar_back.png        | Bin 0 -> 4375 bytes
 .../bars/v21/ldrtl-xxhdpi/ic_sysbar_back.png       | Bin 0 -> 2062 bytes
 .../resources/bars/v21/mdpi/ic_sysbar_back.png     | Bin 0 -> 1845 bytes
 .../resources/bars/v21/mdpi/ic_sysbar_home.png     | Bin 0 -> 2372 bytes
 .../resources/bars/v21/mdpi/ic_sysbar_recent.png   | Bin 0 -> 1148 bytes
 .../v21/mdpi/stat_sys_battery_charge_anim100.png   | Bin 0 -> 762 bytes
 .../bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png | Bin 0 -> 1430 bytes
 .../bars/v21/mdpi/status_bar_background.9.png      | Bin 0 -> 204 bytes
 .../resources/bars/v21/xhdpi/ic_sysbar_back.png    | Bin 0 -> 4218 bytes
 .../resources/bars/v21/xhdpi/ic_sysbar_home.png    | Bin 0 -> 5365 bytes
 .../resources/bars/v21/xhdpi/ic_sysbar_recent.png  | Bin 0 -> 1754 bytes
 .../v21/xhdpi/stat_sys_battery_charge_anim100.png  | Bin 0 -> 1332 bytes
 .../v21/xhdpi/stat_sys_wifi_signal_4_fully.png     | Bin 0 -> 3485 bytes
 .../resources/bars/v21/xxhdpi/ic_sysbar_back.png   | Bin 0 -> 7195 bytes
 .../resources/bars/v21/xxhdpi/ic_sysbar_home.png   | Bin 0 -> 8635 bytes
 .../resources/bars/v21/xxhdpi/ic_sysbar_recent.png | Bin 0 -> 2369 bytes
 .../resources/bars/xhdpi-v21/ic_sysbar_back.png    | Bin 4218 -> 0 bytes
 .../resources/bars/xhdpi-v21/ic_sysbar_home.png    | Bin 5365 -> 0 bytes
 .../resources/bars/xhdpi-v21/ic_sysbar_recent.png  | Bin 1754 -> 0 bytes
 .../bridge/resources/bars/xhdpi/ic_sysbar_back.png | Bin 1421 -> 0 bytes
 .../bridge/resources/bars/xhdpi/ic_sysbar_home.png | Bin 1421 -> 0 bytes
 .../resources/bars/xhdpi/ic_sysbar_recent.png      | Bin 749 -> 0 bytes
 .../bars/xhdpi/stat_sys_battery_charge_anim100.png | Bin 1332 -> 0 bytes
 .../bars/xhdpi/stat_sys_wifi_signal_4_fully.png    | Bin 3485 -> 0 bytes
 .../com/android/layoutlib/bridge/bars/Config.java  |  46 +++++++++++
 .../android/layoutlib/bridge/bars/CustomBar.java   |  88 +++++++++++++--------
 .../android/layoutlib/bridge/bars/StatusBar.java   |   1 -
 .../com/android/layoutlib/bridge/impl/Config.java  |  33 --------
 .../layoutlib/bridge/impl/RenderSessionImpl.java   |   1 +
 80 files changed, 105 insertions(+), 65 deletions(-)
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_home.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_home.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.9.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-hdpi-v21/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-mdpi-v21/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi-v21/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_home.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_home.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/status_bar_background.9.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/README
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/ldrtl-hdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/ldrtl-mdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/ldrtl-xhdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/ldrtl-xxhdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_recent.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_back.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_home.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_home.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_back.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_home.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_recent.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png
 delete mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png
 create mode 100644 tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
 delete mode 100644 tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Config.java

(limited to 'tools/layoutlib/bridge')

diff --git a/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_back.png
deleted file mode 100644
index b28624f..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_home.png
deleted file mode 100644
index 3f3e288..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_home.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_recent.png
deleted file mode 100644
index 06dcd20..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi-v21/ic_sysbar_recent.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_back.png
deleted file mode 100644
index 84e6bc8..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_home.png
deleted file mode 100644
index 38e4f45..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_home.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_recent.png
deleted file mode 100644
index bf9f300..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/ic_sysbar_recent.png and /dev/null differ
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
deleted file mode 100644
index 829378e..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png and /dev/null differ
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
deleted file mode 100644
index 931daed..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png and /dev/null 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
deleted file mode 100644
index a4be298..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.9.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi-v21/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi-v21/ic_sysbar_back.png
deleted file mode 100644
index e464347..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi-v21/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_back.png
deleted file mode 100644
index 782ebfe..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_recent.png
deleted file mode 100644
index 677b471..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-hdpi/ic_sysbar_recent.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi-v21/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi-v21/ic_sysbar_back.png
deleted file mode 100644
index 1b578a6..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi-v21/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_back.png
deleted file mode 100644
index a1b8062..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_recent.png
deleted file mode 100644
index fcdbefe..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-mdpi/ic_sysbar_recent.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi-v21/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi-v21/ic_sysbar_back.png
deleted file mode 100644
index 373e84a..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi-v21/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_back.png
deleted file mode 100644
index 633d864..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_recent.png
deleted file mode 100644
index 4665e2a..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/ldrtl-xhdpi/ic_sysbar_recent.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_back.png
deleted file mode 100644
index f878093..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_home.png
deleted file mode 100644
index 8e9583b..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_home.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_recent.png
deleted file mode 100644
index e2a89c3..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi-v21/ic_sysbar_recent.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_back.png
deleted file mode 100644
index a00bc5b..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_home.png
deleted file mode 100644
index dc3183b..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_home.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_recent.png
deleted file mode 100644
index b07f611..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_recent.png and /dev/null differ
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
deleted file mode 100644
index 2773a70..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png and /dev/null differ
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
deleted file mode 100644
index 6e1ac91..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png and /dev/null 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
deleted file mode 100644
index eb7c1a4..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/status_bar_background.9.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/README b/tools/layoutlib/bridge/resources/bars/v11/README
new file mode 100644
index 0000000..ae094e2
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v11/README
@@ -0,0 +1 @@
+Resources for Api level 11-20
diff --git a/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..84e6bc8
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..38e4f45
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..bf9f300
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..782ebfe
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..677b471
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..a1b8062
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..fcdbefe
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..633d864
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..4665e2a
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..a00bc5b
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..dc3183b
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..b07f611
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..bd60cd6
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..c5bc5c9
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..f621d9c
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..b28624f
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..3f3e288
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..06dcd20
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/hdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000..829378e
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..931daed
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png
new file mode 100644
index 0000000..a4be298
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/ldrtl-hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-hdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..e464347
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-hdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/ldrtl-mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-mdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..1b578a6
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-mdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/ldrtl-xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-xhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..373e84a
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-xhdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/ldrtl-xxhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-xxhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..6b19593
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/ldrtl-xxhdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..f878093
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..8e9583b
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..e2a89c3
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/mdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000..2773a70
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..6e1ac91
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png
new file mode 100644
index 0000000..eb7c1a4
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..ec2951d
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..254f757
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..8a8e941
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000..c7fd719
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..625c61d
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..77969b8
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_back.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..d60229f
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_home.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..a261f85
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/ic_sysbar_recent.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_back.png
deleted file mode 100644
index ec2951d..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_home.png
deleted file mode 100644
index 254f757..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_home.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_recent.png
deleted file mode 100644
index 8a8e941..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi-v21/ic_sysbar_recent.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_back.png
deleted file mode 100644
index bd60cd6..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_back.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_home.png
deleted file mode 100644
index c5bc5c9..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_home.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_recent.png
deleted file mode 100644
index f621d9c..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi/ic_sysbar_recent.png and /dev/null differ
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
deleted file mode 100644
index c7fd719..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png and /dev/null differ
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
deleted file mode 100644
index 625c61d..0000000
Binary files a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
new file mode 100644
index 0000000..089cad3
--- /dev/null
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.layoutlib.bridge.bars;
+
+/**
+ * Various helper methods to simulate older versions of platform.
+ */
+public class Config {
+
+    public static final String DEFAULT_RESOURCE_DIR = "/bars/v21/";
+
+    public static boolean showOnScreenNavBar(int platformVersion) {
+        // return true if ICS or later.
+        return platformVersion >= 14 || platformVersion == 0;
+    }
+
+    public static int getStatusBarColor(int platformVersion) {
+        // return white for froyo and earlier; black otherwise.
+        return platformVersion >= 9 || platformVersion == 0 ? 0xFF000000 : 0xFFFFFFFF;
+    }
+
+    public static boolean usesCustomResourceDir(int platformVersion) {
+        return platformVersion > 10 && platformVersion < 21;
+    }
+
+    public static String getResourceDir(int platformVersion) {
+        if (usesCustomResourceDir(platformVersion)) {
+            return "/bars/v11/";
+        }
+        return DEFAULT_RESOURCE_DIR;
+    }
+}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
index 9bc86a0..4da9f04 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
@@ -47,6 +47,8 @@ import android.widget.TextView;
 import java.io.IOException;
 import java.io.InputStream;
 
+import static com.android.layoutlib.bridge.bars.Config.DEFAULT_RESOURCE_DIR;
+
 /**
  * Base "bar" class for the window decor around the the edited layout.
  * This is basically an horizontal layout that loads a given layout on creation (it is read
@@ -58,6 +60,12 @@ import java.io.InputStream;
  */
 abstract class CustomBar extends LinearLayout {
 
+    // An upper-bound on the length of the path to the directory to find the icon in.
+    // This assumes that resource directory name for different api levels have same length.
+    private static final int ICON_PATH_LENGTH = DEFAULT_RESOURCE_DIR.length()
+            + LayoutDirection.RTL.getResourceValue().length() + 9;  // 9 = "-xxxhdpi/".length
+
+
     private final int mSimulatedPlatformVersion;
 
     protected abstract TextView getStyleableTextView();
@@ -90,54 +98,71 @@ abstract class CustomBar extends LinearLayout {
     }
 
     private InputStream getIcon(String iconName, Density[] densityInOut, LayoutDirection direction,
-            String[] pathOut, boolean tryOtherDensities) {
+            StringBuilder[] pathOut, boolean tryOtherDensities) {
+        pathOut[0] = new StringBuilder(ICON_PATH_LENGTH + iconName.length());
+
+        if (Config.usesCustomResourceDir(mSimulatedPlatformVersion)) {
+            // current density.
+            Density density = densityInOut[0];
+            InputStream stream = getIcon(iconName, Config.getResourceDir(mSimulatedPlatformVersion),
+                    densityInOut, direction, pathOut, tryOtherDensities);
+            if (stream != null) {
+                return stream;
+            }
+            // reset the density.
+            densityInOut[0] = density;
+        }
+        return getIcon(iconName, DEFAULT_RESOURCE_DIR, densityInOut, direction, pathOut,
+                tryOtherDensities);
+
+    }
+
+    private InputStream getIcon(String iconName, String dir, Density[] densityInOut,
+            LayoutDirection direction, StringBuilder[] pathOut, boolean tryOtherDensities) {
         // current density
         Density density = densityInOut[0];
 
+        pathOut[0].setLength(0);
+
         // bitmap url relative to this class
-        if (direction != null) {
-            pathOut[0] = "/bars/" + direction.getResourceValue() + "-" + density.getResourceValue()
-                    + "/" + iconName;
+        if (direction == LayoutDirection.RTL) {
+            pathOut[0].append(dir)
+                    .append(direction.getResourceValue())
+                    .append('-')
+                    .append(density.getResourceValue())
+                    .append('/')
+                    .append(iconName);
         } else {
-            pathOut[0] = "/bars/" + density.getResourceValue() + "/" + iconName;
+            // Since we do not have any ldltr resource, skip the check.
+            pathOut[0].append(dir)
+                    .append(density.getResourceValue())
+                    .append('/')
+                    .append(iconName);
         }
 
-        // TODO: Change this with a more generic method.
-        InputStream stream = getIconWithApi(pathOut, iconName);
+        InputStream stream = getClass().getResourceAsStream(pathOut[0].toString());
         if (stream == null && tryOtherDensities) {
             for (Density d : Density.values()) {
                 if (d != density) {
                     densityInOut[0] = d;
-                    stream = getIcon(iconName, densityInOut, direction, pathOut,
+                    stream = getIcon(iconName, dir, densityInOut, direction, pathOut,
                             false /*tryOtherDensities*/);
                     if (stream != null) {
                         return stream;
                     }
                 }
-                // couldn't find resource with direction qualifier. try without.
-                if (direction != null) {
-                    return getIcon(iconName, densityInOut, null, pathOut, true);
-                }
+            }
+            // couldn't find resource with direction qualifier, try without.
+            if (direction == LayoutDirection.RTL) {
+                densityInOut[0] = density;
+                stream = getIcon(iconName, dir, densityInOut, null, pathOut,
+                        true /*tryOtherDensities*/);
             }
         }
 
         return stream;
     }
 
-    private InputStream getIconWithApi(String[] pathOut, String iconName) {
-        if (mSimulatedPlatformVersion == 0) {
-            String path = pathOut[0];
-            String dirName = path.substring(0, path.lastIndexOf('/'));
-            path = dirName + "-v21" + "/" + iconName;
-            InputStream stream = getClass().getResourceAsStream(path);
-            if (stream != null) {
-                pathOut[0] = path;
-                return stream;
-            }
-        }
-        return getClass().getResourceAsStream(pathOut[0]);
-    }
-
     protected void loadIcon(int index, String iconName, Density density) {
         loadIcon(index, iconName, density, false);
     }
@@ -147,20 +172,21 @@ abstract class CustomBar extends LinearLayout {
         if (child instanceof ImageView) {
             ImageView imageView = (ImageView) child;
 
-            String[] pathOut = new String[1];
-            Density[] densityInOut = new Density[] { density };
-            LayoutDirection dir = isRtl ? LayoutDirection.RTL : LayoutDirection.LTR;
+            StringBuilder[] pathOut = new StringBuilder[1];
+            Density[] densityInOut = new Density[]{density};
+            LayoutDirection dir = isRtl ? LayoutDirection.RTL : null;
             InputStream stream = getIcon(iconName, densityInOut, dir, pathOut,
                     true /*tryOtherDensities*/);
             density = densityInOut[0];
+            String path = pathOut[0].toString();
 
             if (stream != null) {
                 // look for a cached bitmap
-                Bitmap bitmap = Bridge.getCachedBitmap(pathOut[0], true /*isFramework*/);
+                Bitmap bitmap = Bridge.getCachedBitmap(path, true /*isFramework*/);
                 if (bitmap == null) {
                     try {
                         bitmap = Bitmap_Delegate.createBitmap(stream, false /*isMutable*/, density);
-                        Bridge.setCachedBitmap(pathOut[0], bitmap, true /*isFramework*/);
+                        Bridge.setCachedBitmap(path, bitmap, true /*isFramework*/);
                     } catch (IOException e) {
                         return;
                     }
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 c9dd777..4cbdd4d 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
@@ -16,7 +16,6 @@
 
 package com.android.layoutlib.bridge.bars;
 
-import com.android.layoutlib.bridge.impl.Config;
 import com.android.resources.Density;
 
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Config.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Config.java
deleted file mode 100644
index e8bc292..0000000
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Config.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.layoutlib.bridge.impl;
-
-/**
- * Various helper methods to simulate older versions of platform.
- */
-public class Config {
-
-    public static boolean showOnScreenNavBar(int platformVersion) {
-        // return true if ICS or later.
-        return platformVersion >= 14 || platformVersion == 0;
-    }
-
-    public static int getStatusBarColor(int platformVersion) {
-        // return white for froyo and earlier; black otherwise.
-        return platformVersion >= 9 || platformVersion == 0 ? 0xFF000000 : 0xFFFFFFFF;
-    }
-}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 8a58d35..871bc53 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -49,6 +49,7 @@ import com.android.layoutlib.bridge.Bridge;
 import com.android.layoutlib.bridge.android.BridgeContext;
 import com.android.layoutlib.bridge.android.BridgeLayoutParamsMapAttributes;
 import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;
+import com.android.layoutlib.bridge.bars.Config;
 import com.android.layoutlib.bridge.bars.NavigationBar;
 import com.android.layoutlib.bridge.bars.StatusBar;
 import com.android.layoutlib.bridge.bars.TitleBar;
-- 
cgit v1.1