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

am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

Browse Source 
* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2015-08-26 05:54:44 +00:00
committed by Android Git Automerger
parent 50e1406a4a 92480a9ad8
commit de3ac8f9fc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@@ -444,7 +444,7 @@ public final class BridgeTypedArray extends TypedArray {
@Override
public int getDimensionPixelSize(int index, int defValue) {
try {
return getDimension(index);
return getDimension(index, null);
} catch (RuntimeException e) {
String s = getString(index);
@@ -474,12 +474,12 @@ public final class BridgeTypedArray extends TypedArray {
@Override
public int getLayoutDimension(int index, String name) {
try {
// this will throw an exception
return getDimension(index);
// this will throw an exception if not found.
return getDimension(index, name);
} catch (RuntimeException e) {
if (LayoutInflater_Delegate.sIsInInclude) {
throw new RuntimeException();
throw new RuntimeException("Layout Dimension '" + name + "' not found.");
}
Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT,
@@ -494,9 +494,13 @@ public final class BridgeTypedArray extends TypedArray {
return getDimensionPixelSize(index, defValue);
}
private int getDimension(int index) {
/** @param name attribute name, used for error reporting. */
private int getDimension(int index, @Nullable String name) {
String s = getString(index);
if (s == null) {
if (name != null) {
throw new RuntimeException("Attribute '" + name + "' not found");
}
throw new RuntimeException();
}
// Check if the value is a magic constant that doesn't require a unit.

8
tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java
View File

@@ -134,12 +134,8 @@ public class LayoutInflater_Delegate {
params = group.generateLayoutParams(attrs);
} catch (RuntimeException e) {
// ---- START CHANGES
sIsInInclude = false;
// ---- END CHANGES
params = group.generateLayoutParams(childAttrs);
} catch (RuntimeException ignored) {
// Ignore, just fail over to child attrs.
} finally {
// ---- START CHANGES
sIsInInclude = false;