diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:22:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 09:22:21 -0700 |
| commit | bea97a897b9102d5d75bcb7a41e02eaff9a7506d (patch) | |
| tree | 80894ff99019e573f50527729f3659b2f73a9243 /core/java | |
| parent | b39b0f32d1c24e326886d8d27c8ad7dde38e28d0 (diff) | |
| parent | 2dc7c6c4153380fc64b99d37d763d3f0d1cac04d (diff) | |
| download | frameworks_base-bea97a897b9102d5d75bcb7a41e02eaff9a7506d.zip frameworks_base-bea97a897b9102d5d75bcb7a41e02eaff9a7506d.tar.gz frameworks_base-bea97a897b9102d5d75bcb7a41e02eaff9a7506d.tar.bz2 | |
am 2dc7c6c4: merge from open-source master
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index c9d125b..40ed980 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -1819,4 +1819,12 @@ public final class MediaStore { * Name of current volume being scanned by the media scanner. */ public static final String MEDIA_SCANNER_VOLUME = "volume"; + + /** + * Name of the file signaling the media scanner to ignore media in the containing directory + * and its subdirectories. Developers should use this to avoid application graphics showing + * up in the Gallery and likewise prevent application sounds and music from showing up in + * the Music app. + */ + public static final String MEDIA_IGNORE_FILENAME = ".nomedia"; } |