diff options
| author | 2016-03-31 03:50:17 +0000 | |
|---|---|---|
| committer | 2016-03-31 03:50:19 +0000 | |
| commit | 88f8675471df616b4c302d4b294b711d63179e2d (patch) | |
| tree | 305064f9c75aea39ee2dc158f7d7b70f0bd1754b | |
| parent | e1d0cabb5f4ccc43d7fa1d84a02a87a8683f8537 (diff) | |
| parent | 5f53f6531176d503d0bb26b50581091372a1478f (diff) | |
Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/DocumentsContract.java | 3 |
4 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 1b21633e06eb..4aa1aea605f6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31932,6 +31932,7 @@ package android.provider { field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; + field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION"; field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; } diff --git a/api/system-current.txt b/api/system-current.txt index 9e5cfafc6c2e..96f0432525db 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -34304,6 +34304,7 @@ package android.provider { field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; + field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION"; field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; } diff --git a/api/test-current.txt b/api/test-current.txt index dcd2848bea5c..2e7efec18383 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -32001,6 +32001,7 @@ package android.provider { field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; + field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION"; field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; } diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 441245956b8d..aba39722db0c 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -112,9 +112,8 @@ public final class DocumentsContract { * thumbnail should be rotated. * * @see MediaStore.Images.ImageColumns#ORIENTATION - * @hide */ - public static final String EXTRA_ORIENTATION = "android.content.extra.ORIENTATION"; + public static final String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION"; /** * Overrides the default prompt text in DocumentsUI when set in an intent. |