diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 7 | ||||
| -rw-r--r-- | core/java/android/webkit/DateSorter.java | 7 |
2 files changed, 10 insertions, 4 deletions
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: diff --git a/core/java/android/webkit/DateSorter.java b/core/java/android/webkit/DateSorter.java index bc13504..0e8ad7e 100644 --- a/core/java/android/webkit/DateSorter.java +++ b/core/java/android/webkit/DateSorter.java @@ -66,13 +66,12 @@ public class DateSorter { mLabels[0] = context.getText(com.android.internal.R.string.today).toString(); mLabels[1] = context.getText(com.android.internal.R.string.yesterday).toString(); - int resId = com.android.internal.R.plurals.num_days_ago; + int resId = com.android.internal.R.plurals.last_num_days; String format = resources.getQuantityString(resId, NUM_DAYS_AGO); mLabels[2] = String.format(format, NUM_DAYS_AGO); - mLabels[3] = context.getText(com.android.internal.R.string.oneMonthDurationPast).toString(); - mLabels[4] = context.getText(com.android.internal.R.string.beforeOneMonthDurationPast) - .toString(); + mLabels[3] = context.getString(com.android.internal.R.string.last_month); + mLabels[4] = context.getString(com.android.internal.R.string.older); } /** |