Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove auto-boxing during the inflate" into mnc-ub-dev

Browse Source
This commit is contained in:
Diego Perez
2015-11-04 14:26:15 +00:00
committed by Android (Google) Code Review
parent 7dda46e740 91fa3ba4cc
commit 1c442aca0a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -409,7 +409,7 @@ public final class BridgeContext extends Context {
pushParser(blockParser); pushParser(blockParser);
return Pair.of( return Pair.of(
mBridgeInflater.inflate(blockParser, parent, attachToRoot), mBridgeInflater.inflate(blockParser, parent, attachToRoot),
true); Boolean.TRUE);
} finally { } finally {
popParser(); popParser();
} }
@@ -447,7 +447,7 @@ public final class BridgeContext extends Context {
pushParser(blockParser); pushParser(blockParser);
return Pair.of( return Pair.of(
mBridgeInflater.inflate(blockParser, parent, attachToRoot), mBridgeInflater.inflate(blockParser, parent, attachToRoot),
false); Boolean.FALSE);
} finally { } finally {
popParser(); popParser();
} }
@@ -470,7 +470,7 @@ public final class BridgeContext extends Context {
resource.getName()), null); resource.getName()), null);
} }
return Pair.of(null, false); return Pair.of(null, Boolean.FALSE);
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
View File

@@ -117,11 +117,11 @@ abstract class CustomBar extends LinearLayout {
density = iconLoader.getDensity(); density = iconLoader.getDensity();
String path = iconLoader.getPath(); String path = iconLoader.getPath();
// look for a cached bitmap // look for a cached bitmap
Bitmap bitmap = Bridge.getCachedBitmap(path, true /*isFramework*/); Bitmap bitmap = Bridge.getCachedBitmap(path, Boolean.TRUE /*isFramework*/);
if (bitmap == null) { if (bitmap == null) {
try { try {
bitmap = Bitmap_Delegate.createBitmap(stream, false /*isMutable*/, density); bitmap = Bitmap_Delegate.createBitmap(stream, false /*isMutable*/, density);
Bridge.setCachedBitmap(path, bitmap, true /*isFramework*/); Bridge.setCachedBitmap(path, bitmap, Boolean.TRUE /*isFramework*/);
} catch (IOException e) { } catch (IOException e) {
return; return;
} }