summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-01-09 16:47:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-09 16:47:35 -0800
commitd3be0a76e46584357dbb77fcd200128d0d7dc9a8 (patch)
tree8f760b71d0f03b3934589af00019ead811ece2f7 /core
parent64140a0770f98b56993a96289ec3143e89194265 (diff)
parent613989772f7d7f7317349568a4809bf08b942bd7 (diff)
downloadframeworks_base-d3be0a76e46584357dbb77fcd200128d0d7dc9a8.zip
frameworks_base-d3be0a76e46584357dbb77fcd200128d0d7dc9a8.tar.gz
frameworks_base-d3be0a76e46584357dbb77fcd200128d0d7dc9a8.tar.bz2
Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
Diffstat (limited to 'core')
-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 4f19010..b6b6a8d 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 {