resolve merge conflicts of 595eacc to master
Change-Id: Id10f6695fc01c32af804ca79571ac1bf04157b61
diff --git a/media-compat/java/android/support/v4/media/MediaMetadataCompat.java b/media-compat/java/android/support/v4/media/MediaMetadataCompat.java
index 0d07826..4cb2c65 100644
--- a/media-compat/java/android/support/v4/media/MediaMetadataCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaMetadataCompat.java
@@ -361,8 +361,8 @@
public RatingCompat getRating(@RatingKey String key) {
RatingCompat rating = null;
try {
- if (Build.VERSION.SDK_INT >= 21) {
- // On platform version 21 or higher, mBundle stores a Rating object. Convert it to
+ if (Build.VERSION.SDK_INT >= 19) {
+ // On platform version 19 or higher, mBundle stores a Rating object. Convert it to
// RatingCompat.
rating = RatingCompat.fromRating(mBundle.getParcelable(key));
} else {
@@ -708,8 +708,8 @@
+ " key cannot be used to put a Rating");
}
}
- if (Build.VERSION.SDK_INT >= 21) {
- // On platform version 21 or higher, use Rating instead of RatingCompat so mBundle
+ if (Build.VERSION.SDK_INT >= 19) {
+ // On platform version 19 or higher, use Rating instead of RatingCompat so mBundle
// can be unmarshalled.
mBundle.putParcelable(key, (Parcelable) value.getRating());
} else {
diff --git a/media-compat/java/android/support/v4/media/RatingCompat.java b/media-compat/java/android/support/v4/media/RatingCompat.java
index d6c6033..ee25ad4 100644
--- a/media-compat/java/android/support/v4/media/RatingCompat.java
+++ b/media-compat/java/android/support/v4/media/RatingCompat.java
@@ -312,35 +312,35 @@
/**
* Creates an instance from a framework {@link android.media.Rating} object.
* <p>
- * This method is only supported on API 21+.
+ * This method is only supported on API 19+.
* </p>
*
* @param ratingObj A {@link android.media.Rating} object, or null if none.
* @return An equivalent {@link RatingCompat} object, or null if none.
*/
public static RatingCompat fromRating(Object ratingObj) {
- if (ratingObj == null || Build.VERSION.SDK_INT < 21) {
+ if (ratingObj == null || Build.VERSION.SDK_INT < 19) {
return null;
}
- final int ratingStyle = RatingCompatApi21.getRatingStyle(ratingObj);
+ final int ratingStyle = RatingCompatKitkat.getRatingStyle(ratingObj);
final RatingCompat rating;
- if (RatingCompatApi21.isRated(ratingObj)) {
+ if (RatingCompatKitkat.isRated(ratingObj)) {
switch (ratingStyle) {
case RATING_HEART:
- rating = newHeartRating(RatingCompatApi21.hasHeart(ratingObj));
+ rating = newHeartRating(RatingCompatKitkat.hasHeart(ratingObj));
break;
case RATING_THUMB_UP_DOWN:
- rating = newThumbRating(RatingCompatApi21.isThumbUp(ratingObj));
+ rating = newThumbRating(RatingCompatKitkat.isThumbUp(ratingObj));
break;
case RATING_3_STARS:
case RATING_4_STARS:
case RATING_5_STARS:
rating = newStarRating(ratingStyle,
- RatingCompatApi21.getStarRating(ratingObj));
+ RatingCompatKitkat.getStarRating(ratingObj));
break;
case RATING_PERCENTAGE:
- rating = newPercentageRating(RatingCompatApi21.getPercentRating(ratingObj));
+ rating = newPercentageRating(RatingCompatKitkat.getPercentRating(ratingObj));
break;
default:
return null;
@@ -355,36 +355,36 @@
/**
* Gets the underlying framework {@link android.media.Rating} object.
* <p>
- * This method is only supported on API 21+.
+ * This method is only supported on API 19+.
* </p>
*
* @return An equivalent {@link android.media.Rating} object, or null if none.
*/
public Object getRating() {
- if (mRatingObj != null || Build.VERSION.SDK_INT < 21) {
+ if (mRatingObj != null || Build.VERSION.SDK_INT < 19) {
return mRatingObj;
}
if (isRated()) {
switch (mRatingStyle) {
case RATING_HEART:
- mRatingObj = RatingCompatApi21.newHeartRating(hasHeart());
+ mRatingObj = RatingCompatKitkat.newHeartRating(hasHeart());
break;
case RATING_THUMB_UP_DOWN:
- mRatingObj = RatingCompatApi21.newThumbRating(isThumbUp());
+ mRatingObj = RatingCompatKitkat.newThumbRating(isThumbUp());
break;
case RATING_3_STARS:
case RATING_4_STARS:
case RATING_5_STARS:
- mRatingObj = RatingCompatApi21.newStarRating(mRatingStyle, getStarRating());
+ mRatingObj = RatingCompatKitkat.newStarRating(mRatingStyle, getStarRating());
break;
case RATING_PERCENTAGE:
- mRatingObj = RatingCompatApi21.newPercentageRating(getPercentRating());
+ mRatingObj = RatingCompatKitkat.newPercentageRating(getPercentRating());
default:
return null;
}
} else {
- mRatingObj = RatingCompatApi21.newUnratedRating(mRatingStyle);
+ mRatingObj = RatingCompatKitkat.newUnratedRating(mRatingStyle);
}
return mRatingObj;
}
diff --git a/media-compat/api21/android/support/v4/media/RatingCompatApi21.java b/media-compat/kitkat/android/support/v4/media/RatingCompatKitkat.java
similarity index 97%
rename from media-compat/api21/android/support/v4/media/RatingCompatApi21.java
rename to media-compat/kitkat/android/support/v4/media/RatingCompatKitkat.java
index 6c8b9b2..b15c15e 100644
--- a/media-compat/api21/android/support/v4/media/RatingCompatApi21.java
+++ b/media-compat/kitkat/android/support/v4/media/RatingCompatKitkat.java
@@ -18,7 +18,7 @@
import android.media.Rating;
-class RatingCompatApi21 {
+class RatingCompatKitkat {
public static Object newUnratedRating(int ratingStyle) {
return Rating.newUnratedRating(ratingStyle);
}