From fde4e3b17a5ead9f1a0848bf35b4f49f16600795 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 22 Sep 2014 16:19:51 -0700 Subject: [PATCH] Fix inaccurate TypedArray.getDrawable() documentation The documentation implied that you could override Resources.getDrawable(int) to load custom drawables, which is not the case. BUG: 16635905 Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d --- core/java/android/content/res/TypedArray.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 186623aa78d5e..73b93c64d5246 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -16,6 +16,7 @@ package android.content.res; +import android.annotation.Nullable; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -728,15 +729,13 @@ public class TypedArray { } /** - * Retrieve the Drawable for the attribute at index. This - * gets the resource ID of the selected attribute, and uses - * {@link Resources#getDrawable Resources.getDrawable} of the owning - * Resources object to retrieve its Drawable. + * Retrieve the Drawable for the attribute at index. * * @param index Index of attribute to retrieve. * * @return Drawable for the attribute, or null if not defined. */ + @Nullable public Drawable getDrawable(int index) { if (mRecycled) { throw new RuntimeException("Cannot make calls to a recycled instance!");