From 7ac40e38696aa74d7b7938add8fdbc47180ae424 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Fri, 8 Feb 2013 13:58:53 -0800
Subject: [PATCH] Deprecate useless BitmapDrawable constructor Bug #2590549

Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
---
 api/current.txt                                            | 2 +-
 .../java/android/graphics/drawable/BitmapDrawable.java     | 7 +++++--
 graphics/java/android/graphics/drawable/Drawable.java      | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index fcbe24f34ebb9..42056b4b2023d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9376,7 +9376,7 @@ package android.graphics.drawable {
 
   public class BitmapDrawable extends android.graphics.drawable.Drawable {
     ctor public deprecated BitmapDrawable();
-    ctor public BitmapDrawable(android.content.res.Resources);
+    ctor public deprecated BitmapDrawable(android.content.res.Resources);
     ctor public deprecated BitmapDrawable(android.graphics.Bitmap);
     ctor public BitmapDrawable(android.content.res.Resources, android.graphics.Bitmap);
     ctor public deprecated BitmapDrawable(java.lang.String);
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 6e41d341d4f7c..675c4b6bceb01 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -74,8 +74,8 @@ public class BitmapDrawable extends Drawable {
     
     /**
      * Create an empty drawable, not dealing with density.
-     * @deprecated Use {@link #BitmapDrawable(Resources)} to ensure
-     * that the drawable has correctly set its target density.
+     * @deprecated Use {@link #BitmapDrawable(android.content.res.Resources, android.graphics.Bitmap)}
+     * instead to specify a bitmap to draw with and ensure the correct density is set.
      */
     @Deprecated
     public BitmapDrawable() {
@@ -85,7 +85,10 @@ public class BitmapDrawable extends Drawable {
     /**
      * Create an empty drawable, setting initial target density based on
      * the display metrics of the resources.
+     * @deprecated Use {@link #BitmapDrawable(android.content.res.Resources, android.graphics.Bitmap)}
+     * instead to specify a bitmap to draw with.
      */
+    @Deprecated
     @SuppressWarnings({"UnusedParameters"})
     public BitmapDrawable(Resources res) {
         mBitmapState = new BitmapState((Bitmap) null);
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 54d1bf57fa0c0..37f2250658f6a 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -868,6 +868,7 @@ public abstract class Drawable {
         } else if (name.equals("inset")) {
             drawable = new InsetDrawable();
         } else if (name.equals("bitmap")) {
+            //noinspection deprecation
             drawable = new BitmapDrawable(r);
             if (r != null) {
                ((BitmapDrawable) drawable).setTargetDensity(r.getDisplayMetrics());