diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-04-18 23:13:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 23:13:10 -0700 |
| commit | 3c3b5b5e0bc05564e0f8ecc680ace523e11bd923 (patch) | |
| tree | 2eb0ae1b787bd7402a21b3441b77cbedd75af888 | |
| parent | 1ee4139fc3e82304755bbd92a7aa1323fd8a3534 (diff) | |
| parent | ac13cc06ee35a9890d35af25b6cd2df2841e1384 (diff) | |
| download | frameworks_base-3c3b5b5e0bc05564e0f8ecc680ace523e11bd923.zip frameworks_base-3c3b5b5e0bc05564e0f8ecc680ace523e11bd923.tar.gz frameworks_base-3c3b5b5e0bc05564e0f8ecc680ace523e11bd923.tar.bz2 | |
Merge "Unhide MediaColumns.WIDTH and MediaColumns.HEIGHT."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 080449b..5eaf380 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17843,9 +17843,11 @@ package android.provider { field public static final java.lang.String DATE_ADDED = "date_added"; field public static final java.lang.String DATE_MODIFIED = "date_modified"; field public static final java.lang.String DISPLAY_NAME = "_display_name"; + field public static final java.lang.String HEIGHT = "height"; field public static final java.lang.String MIME_TYPE = "mime_type"; field public static final java.lang.String SIZE = "_size"; field public static final java.lang.String TITLE = "title"; + field public static final java.lang.String WIDTH = "width"; } public static final class MediaStore.Video { diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 38945c2..79d0144 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -306,13 +306,11 @@ public final class MediaStore { /** * The width of the image/video in pixels. - * @hide */ public static final String WIDTH = "width"; /** * The height of the image/video in pixels. - * @hide */ public static final String HEIGHT = "height"; } |