summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-06-24 10:33:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-24 10:33:49 +0000
commitd8ef316f1f42ea8e5417ea82bd4e432442cc8c97 (patch)
treee1275539597fcb87082cd7a8cbb5264d64ffb02b /tools/layoutlib/bridge
parent09348a10be57e4dfaaac582d3a18d37afcd9d53b (diff)
parentb0419c8c4f74236351848ed1b502ebaa94b92ae7 (diff)
downloadframeworks_base-d8ef316f1f42ea8e5417ea82bd4e432442cc8c97.zip
frameworks_base-d8ef316f1f42ea8e5417ea82bd4e432442cc8c97.tar.gz
frameworks_base-d8ef316f1f42ea8e5417ea82bd4e432442cc8c97.tar.bz2
am 91977396: Merge "Fix bug to render status bar icons" into lmp-preview-dev
* commit '9197739603eb34df6cbc85c6a7fa0ea359e4776b': Fix bug to render status bar icons
Diffstat (limited to 'tools/layoutlib/bridge')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java5
1 files changed, 3 insertions, 2 deletions
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 24664c7..9bc86a0 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
@@ -128,9 +128,10 @@ abstract class CustomBar extends LinearLayout {
if (mSimulatedPlatformVersion == 0) {
String path = pathOut[0];
String dirName = path.substring(0, path.lastIndexOf('/'));
- pathOut[0] = dirName + "-v21" + "/" + iconName;
- InputStream stream = getClass().getResourceAsStream(pathOut[0]);
+ path = dirName + "-v21" + "/" + iconName;
+ InputStream stream = getClass().getResourceAsStream(path);
if (stream != null) {
+ pathOut[0] = path;
return stream;
}
}