summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-01-09 16:51:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-09 16:51:52 -0800
commit32313b161f7c7d17841bf49b3d146fd19dd7fde1 (patch)
treefb05cd7f89cab1cd68dd898996b94ab4b9522034 /core/java/android
parent14f722359c87c64d864cbf237c60a18b172fcd24 (diff)
parentd476c8b8a8a6fadea7e72426d3e93c4e6b00e543 (diff)
am d476c8b8: am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
* commit 'd476c8b8a8a6fadea7e72426d3e93c4e6b00e543': Unhide Resources APIs for getting resources at specific densities.
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/content/res/Resources.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index d38b8da7a82a..2af58be74381 100755
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -683,7 +683,6 @@ public class Resources {
* @throws NotFoundException Throws NotFoundException if the given ID does
* not exist.
* @return Drawable An object that can be used to draw this resource.
- * @hide
*/
public Drawable getDrawableForDensity(int id, int density) throws NotFoundException {
synchronized (mTmpValue) {
@@ -1032,7 +1031,6 @@ public class Resources {
* @throws NotFoundException Throws NotFoundException if the given ID does
* not exist.
* @see #getValue(String, TypedValue, boolean)
- * @hide
*/
public void getValueForDensity(int id, int density, TypedValue outValue, boolean resolveRefs)
throws NotFoundException {