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

am 8562b08f: Merge "Fix overrides for BridgeResources." into mnc-dev

Browse Source 
* commit '8562b08f04c1309cf40db1e749d612b6824f1d12':
  Fix overrides for BridgeResources.
This commit is contained in:
Deepanshu Gupta
2015-05-21 01:59:52 +00:00
committed by Android Git Automerger
parent 4d4430bf27 8562b08f04
commit 57642e1da5
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
public int getColor(int id) throws NotFoundException {
public int getColor(int id, Theme theme) throws NotFoundException {
Pair<String, ResourceValue> value = getResourceValue(id, mPlatformResourceFlag);
if (value != null) {
@@ -192,22 +192,21 @@ public final class BridgeResources extends Resources {
}
}
// id was not found or not resolved. Throw a NotFoundException.
throwException(id);
// this is not used since the method above always throws
return 0;
// Suppress possible NPE. getColorStateList will never return null, it will instead
// throw an exception, but intelliJ can't figure that out
//noinspection ConstantConditions
return getColorStateList(id, theme).getDefaultColor();
}
@Override
public ColorStateList getColorStateList(int id) throws NotFoundException {
public ColorStateList getColorStateList(int id, Theme theme) throws NotFoundException {
Pair<String, ResourceValue> resValue = getResourceValue(id, mPlatformResourceFlag);
if (resValue != null) {
ColorStateList stateList = ResourceHelper.getColorStateList(resValue.getSecond(),
mContext);
if (stateList != null) {
return stateList;
return stateList.obtainForTheme(theme);
}
}