diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2018-12-04 16:58:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-04 16:58:17 +0000 |
| commit | f660c012b080496eb70ea77f141f346e80bb6cfa (patch) | |
| tree | 761573788148814a8393f71a574cd82242e1b57b /core/java/android | |
| parent | 5b9de38cd13a2df97733cb6e49d656e88e9964c8 (diff) | |
| parent | 10887d5e5a921b2e8508f93877bf465230003f3b (diff) | |
Merge "Add support for "Audiobooks"."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Environment.java | 12 | ||||
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 0c1aae8bd16c..8904ee61e2e3 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -657,6 +657,12 @@ public class Environment { public static String DIRECTORY_SCREENSHOTS = "Screenshots"; /** + * Standard directory in which to place any audio files which are + * audiobooks. + */ + public static String DIRECTORY_AUDIOBOOKS = "Audiobooks"; + + /** * List of standard storage directories. * <p> * Each of its values have its own constant: @@ -671,6 +677,7 @@ public class Environment { * <li>{@link #DIRECTORY_DOWNLOADS} * <li>{@link #DIRECTORY_DCIM} * <li>{@link #DIRECTORY_DOCUMENTS} + * <li>{@link #DIRECTORY_AUDIOBOOKS} * </ul> * @hide */ @@ -684,7 +691,8 @@ public class Environment { DIRECTORY_MOVIES, DIRECTORY_DOWNLOADS, DIRECTORY_DCIM, - DIRECTORY_DOCUMENTS + DIRECTORY_DOCUMENTS, + DIRECTORY_AUDIOBOOKS, }; /** @@ -709,6 +717,7 @@ public class Environment { /** {@hide} */ public static final int HAS_DOWNLOADS = 1 << 7; /** {@hide} */ public static final int HAS_DCIM = 1 << 8; /** {@hide} */ public static final int HAS_DOCUMENTS = 1 << 9; + /** {@hide} */ public static final int HAS_AUDIOBOOKS = 1 << 10; /** {@hide} */ public static final int HAS_ANDROID = 1 << 16; /** {@hide} */ public static final int HAS_OTHER = 1 << 17; @@ -738,6 +747,7 @@ public class Environment { else if (DIRECTORY_DOWNLOADS.equals(name)) res |= HAS_DOWNLOADS; else if (DIRECTORY_DCIM.equals(name)) res |= HAS_DCIM; else if (DIRECTORY_DOCUMENTS.equals(name)) res |= HAS_DOCUMENTS; + else if (DIRECTORY_AUDIOBOOKS.equals(name)) res |= HAS_AUDIOBOOKS; else if (DIRECTORY_ANDROID.equals(name)) res |= HAS_ANDROID; else res |= HAS_OTHER; } diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index ec8db1ca580e..9e26a368ad80 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -1693,6 +1693,12 @@ public final class MediaStore { public static final String IS_NOTIFICATION = "is_notification"; /** + * Non-zero if the audio file is an audiobook + * <P>Type: INTEGER (boolean)</P> + */ + public static final String IS_AUDIOBOOK = "is_audiobook"; + + /** * The genre of the audio file, if any * <P>Type: TEXT</P> * Does not exist in the database - only used by the media scanner for inserts. |