diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-02-22 06:32:25 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-22 06:32:25 -0800 |
| commit | 7edf7388b81eb7e3d3ed1e717f69896c3d95ecfa (patch) | |
| tree | 34dd26777efa592adbef48769932538eb2ca22b4 | |
| parent | 4379dca2f4c6aa56986b9fd70bdbf5648fb1b6fe (diff) | |
| parent | edcdbb6d3bb6f66e9fd91b15ef45f4cec5694393 (diff) | |
| download | frameworks_base-7edf7388b81eb7e3d3ed1e717f69896c3d95ecfa.zip frameworks_base-7edf7388b81eb7e3d3ed1e717f69896c3d95ecfa.tar.gz frameworks_base-7edf7388b81eb7e3d3ed1e717f69896c3d95ecfa.tar.bz2 | |
Merge "Add new action for launching the user's music player app."
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index e123602..33a8020 100644 --- a/api/current.xml +++ b/api/current.xml @@ -130743,6 +130743,17 @@ visibility="public" > </field> +<field name="INTENT_ACTION_MUSIC_PLAYER" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.MUSIC_PLAYER"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="INTENT_ACTION_STILL_IMAGE_CAMERA" type="java.lang.String" transient="false" diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 74a03da..dda9018 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -54,6 +54,13 @@ public final class MediaStore { private static final String CONTENT_AUTHORITY_SLASH = "content://" + AUTHORITY + "/"; /** + * Activity Action: Launch a music player. + * The activity should be able to play, browse, or manipulate music files stored on the device. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER"; + + /** * Activity Action: Perform a search for media. * Contains at least the {@link android.app.SearchManager#QUERY} extra. * May also contain any combination of the following extras: |