summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerome Gaillard <jgaillard@google.com> 2017-05-02 14:26:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-05-02 14:26:24 +0000
commitd9152e3605fcf199148025baf905a26c93118570 (patch)
tree59136d129f423c128fde5e39260f202caa2c9973
parent106df6992a4bfc07a109ea053f1e9eb95bcd8e84 (diff)
parent91d83954fe42cc2af1d45c1162cef700288ffbe2 (diff)
Merge "Ignore density in AdaptiveIconDrawable"
-rw-r--r--tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
index 34360e7e11e6..b5996afd7985 100644
--- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
+++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
@@ -699,6 +699,14 @@ public final class BridgeTypedArray extends TypedArray {
return ResourceHelper.getDrawable(value, mContext, mTheme);
}
+ /**
+ * Version of {@link #getDrawable(int)} that accepts an override density.
+ * @hide
+ */
+ @Override
+ public Drawable getDrawableForDensity(int index, int density) {
+ return getDrawable(index);
+ }
/**
* Retrieve the Typeface for the attribute at <var>index</var>.