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

Merge "Fix overrides for BridgeResources." into mnc-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2015-05-21 01:50:22 +00:00
committed by Android (Google) Code Review
parent 84fd4af053 4d8e078c7c
commit 8562b08f04
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/layoutlib/bridge/src/android/content/res/BridgeResources.java
View File

@@ -169,7 +169,7 @@ public final class BridgeResources extends Resources {
} }
@Override @Override
public int getColor(int id) throws NotFoundException { public int getColor(int id, Theme theme) throws NotFoundException {
Pair<String, ResourceValue> value = getResourceValue(id, mPlatformResourceFlag); Pair<String, ResourceValue> value = getResourceValue(id, mPlatformResourceFlag);
if (value != null) { if (value != null) {
@@ -192,22 +192,21 @@ public final class BridgeResources extends Resources {
} }
} }
// id was not found or not resolved. Throw a NotFoundException. // Suppress possible NPE. getColorStateList will never return null, it will instead
throwException(id); // throw an exception, but intelliJ can't figure that out
//noinspection ConstantConditions
// this is not used since the method above always throws return getColorStateList(id, theme).getDefaultColor();
return 0;
} }
@Override @Override
public ColorStateList getColorStateList(int id) throws NotFoundException { public ColorStateList getColorStateList(int id, Theme theme) throws NotFoundException {
Pair<String, ResourceValue> resValue = getResourceValue(id, mPlatformResourceFlag); Pair<String, ResourceValue> resValue = getResourceValue(id, mPlatformResourceFlag);
if (resValue != null) { if (resValue != null) {
ColorStateList stateList = ResourceHelper.getColorStateList(resValue.getSecond(), ColorStateList stateList = ResourceHelper.getColorStateList(resValue.getSecond(),
mContext); mContext);
if (stateList != null) { if (stateList != null) {
return stateList; return stateList.obtainForTheme(theme);
} }
} }