Merge "Fix a random assortment of spelling errors."
diff --git a/compat/gingerbread/android/support/v4/os/BuildCompat.java b/compat/gingerbread/android/support/v4/os/BuildCompat.java
index 9792598..4b2ba3d 100644
--- a/compat/gingerbread/android/support/v4/os/BuildCompat.java
+++ b/compat/gingerbread/android/support/v4/os/BuildCompat.java
@@ -30,16 +30,10 @@
/**
* Check if the device is running on the Android N release or newer.
- * This method is suitable for use with preview SDKs and associated
- * pre-release device builds.
*
* @return {@code true} if N APIs are available for use
*/
public static boolean isAtLeastN() {
- if (TextUtils.isEmpty(VERSION.CODENAME) || "REL".equals(VERSION.CODENAME)) {
- return VERSION.SDK_INT > 23;
- }
- final char prefix = VERSION.CODENAME.charAt(0);
- return prefix >= 'N' && prefix <= 'Z';
+ return VERSION.SDK_INT >= 24;
}
}
diff --git a/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java b/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
index 3a13aa9..8c1f231 100644
--- a/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
+++ b/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
@@ -119,8 +119,6 @@
private int mMediumAnimationDuration;
private int mCurrentTargetOffsetTop;
- // Whether or not the starting offset has been determined.
- private boolean mOriginalOffsetCalculated = false;
private float mInitialMotionY;
private float mInitialDownY;
@@ -162,9 +160,7 @@
private boolean mNotify;
- private int mCircleWidth;
-
- private int mCircleHeight;
+ private int mCircleDiameter;
// Whether the client has set a custom starting position;
private boolean mUsingCustomStart;
@@ -274,9 +270,9 @@
}
final DisplayMetrics metrics = getResources().getDisplayMetrics();
if (size == MaterialProgressDrawable.LARGE) {
- mCircleHeight = mCircleWidth = (int) (CIRCLE_DIAMETER_LARGE * metrics.density);
+ mCircleDiameter = (int) (CIRCLE_DIAMETER_LARGE * metrics.density);
} else {
- mCircleHeight = mCircleWidth = (int) (CIRCLE_DIAMETER * metrics.density);
+ mCircleDiameter = (int) (CIRCLE_DIAMETER * metrics.density);
}
// force the bounds of the progress circle inside the circle view to
// update by setting it to null before updating its size and then
@@ -317,8 +313,7 @@
a.recycle();
final DisplayMetrics metrics = getResources().getDisplayMetrics();
- mCircleWidth = (int) (CIRCLE_DIAMETER * metrics.density);
- mCircleHeight = (int) (CIRCLE_DIAMETER * metrics.density);
+ mCircleDiameter = (int) (CIRCLE_DIAMETER * metrics.density);
createProgressView();
ViewCompat.setChildrenDrawingOrderEnabled(this, true);
@@ -329,6 +324,9 @@
mNestedScrollingChildHelper = new NestedScrollingChildHelper(this);
setNestedScrollingEnabled(true);
+
+ mOriginalOffsetTop = mCurrentTargetOffsetTop = -mCircleDiameter;
+ moveToStart(1.0f);
}
@Override
@@ -619,12 +617,8 @@
getMeasuredWidth() - getPaddingLeft() - getPaddingRight(),
MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(
getMeasuredHeight() - getPaddingTop() - getPaddingBottom(), MeasureSpec.EXACTLY));
- mCircleView.measure(MeasureSpec.makeMeasureSpec(mCircleWidth, MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(mCircleHeight, MeasureSpec.EXACTLY));
- if (!mUsingCustomStart && !mOriginalOffsetCalculated) {
- mOriginalOffsetCalculated = true;
- mCurrentTargetOffsetTop = mOriginalOffsetTop = -mCircleView.getMeasuredHeight();
- }
+ mCircleView.measure(MeasureSpec.makeMeasureSpec(mCircleDiameter, MeasureSpec.EXACTLY),
+ MeasureSpec.makeMeasureSpec(mCircleDiameter, MeasureSpec.EXACTLY));
mCircleViewIndex = -1;
// Get the index of the circleview.
for (int index = 0; index < getChildCount(); index++) {
@@ -637,13 +631,12 @@
/**
* Get the diameter of the progress circle that is displayed as part of the
- * swipe to refresh layout. This is not valid until a measure pass has
- * completed.
+ * swipe to refresh layout.
*
* @return Diameter in pixels of the progress circle view.
*/
public int getProgressCircleDiameter() {
- return mCircleView != null ?mCircleView.getMeasuredHeight() : 0;
+ return mCircleDiameter;
}
/**
diff --git a/customtabs/src/android/support/customtabs/CustomTabsClient.java b/customtabs/src/android/support/customtabs/CustomTabsClient.java
index f743c7d..6bd8896 100644
--- a/customtabs/src/android/support/customtabs/CustomTabsClient.java
+++ b/customtabs/src/android/support/customtabs/CustomTabsClient.java
@@ -123,7 +123,7 @@
* necessary.
*
* @param context {@link Context} to use to connect to the remote service.
- * @param packageName Package name of the target implamentation.
+ * @param packageName Package name of the target implementation.
* @return Whether the binding was successful.
*/
public static boolean connectAndInitialize(Context context, String packageName) {
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
index b383d24..c0a32b2 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
@@ -678,7 +678,7 @@
}
private void checkVectorDrawableSetup(@NonNull Context context) {
- if (!mHasCheckedVectorDrawableSetup) {
+ if (mHasCheckedVectorDrawableSetup) {
// We've already checked so return now...
return;
}
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_dark.png
deleted file mode 100644
index d3dc80a..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_light.png
deleted file mode 100644
index ab54e17..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_dark.png
deleted file mode 100644
index 11984e7..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_light.png
deleted file mode 100644
index e4a7dd2..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_dark.png
deleted file mode 100644
index 3c79c94..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_light.png
deleted file mode 100644
index 8f9d7e2..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_dark.png
deleted file mode 100644
index ad15549..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_light.png
deleted file mode 100644
index b1486a8..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_dark.png
deleted file mode 100644
index f795413..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_light.png
deleted file mode 100644
index 07da2f6..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_dark.png
deleted file mode 100644
index 0f37592..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_light.png
deleted file mode 100644
index d384adc..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_dark.png
deleted file mode 100644
index df637c9..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_light.png
deleted file mode 100644
index 30ba6f4..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_dark.png
deleted file mode 100644
index 4815d29..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_light.png
deleted file mode 100644
index 83d8758..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_dark.png
deleted file mode 100644
index dccaba1..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_light.png
deleted file mode 100644
index d332a9c..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_dark.png
deleted file mode 100644
index c738201..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_light.png
deleted file mode 100644
index 9f87111..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_dark.png
deleted file mode 100644
index 2bd60ab..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_light.png
deleted file mode 100644
index 9e28ebc..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_dark.png
deleted file mode 100644
index 6d410d0..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_light.png
deleted file mode 100644
index 345370d..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_dark.png
deleted file mode 100644
index e55c3aa..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_light.png
deleted file mode 100644
index 2f7a392..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_dark.png
deleted file mode 100644
index 0912127..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_light.png
deleted file mode 100644
index 60f223e..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_dark.png
deleted file mode 100644
index 00a222e..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_light.png
deleted file mode 100644
index 9357a0b..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_dark.png
deleted file mode 100644
index d6622d0..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_light.png
deleted file mode 100644
index 28b7ac6..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_dark.png
deleted file mode 100644
index cd21fc3..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_light.png
deleted file mode 100644
index 96031aa..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_dark.png
deleted file mode 100644
index 6151a79..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_light.png
deleted file mode 100644
index cb56957..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_dark.png
deleted file mode 100644
index cfcac2d..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_light.png
deleted file mode 100644
index bce0de2..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_dark.png
deleted file mode 100644
index cd4db3d..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_light.png
deleted file mode 100644
index caa5cc3..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_dark.png
deleted file mode 100644
index ee692b2..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_light.png
deleted file mode 100644
index 2aba1b8..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_dark.png
deleted file mode 100644
index 4984d26..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_light.png
deleted file mode 100644
index 748a3f5..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_dark.png
deleted file mode 100644
index e9f2c3c..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_light.png
deleted file mode 100644
index 5601bd0..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_dark.png
deleted file mode 100644
index f33c9ac..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_light.png
deleted file mode 100644
index 0c6dca9..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_dark.png
deleted file mode 100644
index e1aa156..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_light.png
deleted file mode 100644
index 343808a..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_dark.png
deleted file mode 100644
index 440cbef..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_light.png
deleted file mode 100644
index 1935743..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_dark.png
deleted file mode 100644
index e9d0814..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_light.png
deleted file mode 100644
index 28e20ea..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_dark.png
deleted file mode 100644
index ba41fd2..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_light.png
deleted file mode 100644
index ce4662c..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_dark.png
deleted file mode 100644
index acae734..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_light.png
deleted file mode 100644
index 4acd976..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_dark.png
deleted file mode 100644
index 1e2fda6..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_light.png
deleted file mode 100644
index eb9e848..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_dark.png
deleted file mode 100644
index 5403f97..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_light.png
deleted file mode 100644
index 85d6633..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_dark.png
deleted file mode 100644
index 5ebcdbc..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_light.png
deleted file mode 100644
index 63a7d95..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_dark.png
deleted file mode 100644
index c6d9358..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_light.png
deleted file mode 100644
index 801086e..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_dark.png
deleted file mode 100644
index 33ff2b8..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_light.png
deleted file mode 100644
index 639dd32..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_dark.png
deleted file mode 100644
index 86c7f1d..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_light.png
deleted file mode 100644
index a363c5f..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_dark.png
deleted file mode 100644
index 88d87dd..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_light.png
deleted file mode 100644
index 48b68b4..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_dark.png
deleted file mode 100644
index 80b004b..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_light.png
deleted file mode 100644
index e326b47..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_dark.png
deleted file mode 100644
index 6f85f52..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_light.png
deleted file mode 100644
index a0202fe..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_dark.png
deleted file mode 100644
index 2d470d6..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_light.png
deleted file mode 100644
index f2f8973..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_dark.png
deleted file mode 100644
index 12fc467..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_light.png
deleted file mode 100644
index 284a67c..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_dark.png
deleted file mode 100644
index 83b5a1e..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_light.png
deleted file mode 100644
index e85ecac..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_dark.png
deleted file mode 100644
index 4564484..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_light.png
deleted file mode 100644
index 0c82374..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_dark.png
deleted file mode 100644
index f1a8a80..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_light.png
deleted file mode 100644
index 5a65260..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_dark.png
deleted file mode 100644
index 4aba31d..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_light.png
deleted file mode 100644
index 0a2666e..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_dark.png
deleted file mode 100644
index da3c257..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_light.png
deleted file mode 100644
index 57c77e3..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_dark.png
deleted file mode 100644
index 21aea95..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_light.png
deleted file mode 100644
index e920b96..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_light.png
deleted file mode 100644
index 086aefe..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_dark.png
deleted file mode 100644
index d087884..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_light.png
deleted file mode 100644
index b10f4ce..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_dark.png
deleted file mode 100644
index af63e07..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_light.png
deleted file mode 100644
index a799a0c..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_dark.png
deleted file mode 100644
index ed9816b..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_light.png
deleted file mode 100644
index 76299fb..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_dark.png
deleted file mode 100644
index ae64fc2..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_light.png
deleted file mode 100644
index c624824..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_dark.png
deleted file mode 100644
index e91e52c..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_light.png
deleted file mode 100644
index 296be3c..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_dark.png
deleted file mode 100644
index c25182c..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_light.png
deleted file mode 100644
index 9f92507..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_dark.png
deleted file mode 100644
index 83cbee1..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_light.png
deleted file mode 100644
index 4de75d7..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_dark.png
deleted file mode 100644
index b4d995a..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_light.png
deleted file mode 100644
index 2a5de02..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_dark.png
deleted file mode 100644
index 4a9a300..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_light.png
deleted file mode 100644
index 11b5c3b..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_dark.png
deleted file mode 100644
index 2b238b0..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_light.png
deleted file mode 100644
index 77f82d8..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_dark.png
deleted file mode 100644
index edbbc02..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_light.png
deleted file mode 100644
index 735c564..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_dark.png
deleted file mode 100644
index fc9d8e5..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_light.png
deleted file mode 100644
index b6c7e8a..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_dark.png
deleted file mode 100644
index 1e3cf93..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_light.png
deleted file mode 100644
index fe56c75..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_dark.png
deleted file mode 100644
index 9ccb10a..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_light.png
deleted file mode 100644
index 312c0cb..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_dark.png
deleted file mode 100644
index d1c7a93..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_light.png
deleted file mode 100644
index 23c7457..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_dark.png
deleted file mode 100644
index c566c1a..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_light.png
deleted file mode 100644
index 8aaaabb..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_dark.png
deleted file mode 100644
index c79901e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_light.png
deleted file mode 100644
index faeee27..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_dark.png
deleted file mode 100644
index 4c0168e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_light.png
deleted file mode 100644
index c905fd1..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_dark.png
deleted file mode 100644
index cdbe967..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_light.png
deleted file mode 100644
index a63beb2..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_dark.png
deleted file mode 100644
index a2e5d4e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_light.png
deleted file mode 100644
index f0a31a7..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_dark.png
deleted file mode 100644
index e23cf40..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_light.png
deleted file mode 100644
index 564c167..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_dark.png
deleted file mode 100644
index d49d1a8..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_light.png
deleted file mode 100644
index 645145a..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_dark.png
deleted file mode 100644
index b2c9ef0..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_light.png
deleted file mode 100644
index 1578c9e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_dark.png
deleted file mode 100644
index 883aef4..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_light.png
deleted file mode 100644
index a47e9a7..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_dark.png
deleted file mode 100644
index 8b05ae3..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_light.png
deleted file mode 100644
index d8dbcc5..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_dark.png
deleted file mode 100644
index 898f859..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_light.png
deleted file mode 100644
index 405f1c6..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_dark.png
deleted file mode 100644
index a850fe5..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_light.png
deleted file mode 100644
index f61484b..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_dark.png
deleted file mode 100644
index b68bead..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_light.png
deleted file mode 100644
index 93f50be..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_dark.png
deleted file mode 100644
index e805614..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_light.png
deleted file mode 100644
index 2cbb915..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_dark.png
deleted file mode 100644
index f611e71..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_light.png
deleted file mode 100644
index 0a66af9..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_dark.png
deleted file mode 100644
index aa011b1..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_light.png
deleted file mode 100644
index d9c3dff..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_dark.png
deleted file mode 100644
index 3594ee5..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_light.png
deleted file mode 100644
index 1c524d8..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_dark.png
deleted file mode 100644
index 1f2c004..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_light.png
deleted file mode 100644
index 7cf2bd0..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_dark.png
deleted file mode 100644
index e41184d..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_light.png
deleted file mode 100644
index 9a56e23..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_dark.png
deleted file mode 100644
index c0e7a08..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_light.png
deleted file mode 100644
index d991612..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_dark.png
deleted file mode 100644
index 4069c8f..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_light.png
deleted file mode 100644
index fea3d15..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_dark.png
deleted file mode 100644
index 10a425c..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_light.png
deleted file mode 100644
index 4594aab..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_dark.png
deleted file mode 100644
index e16dc31..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_light.png
deleted file mode 100644
index a45edd6..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_dark.png
deleted file mode 100644
index b6c69ba..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_light.png
deleted file mode 100644
index b3834ea..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_dark.png
deleted file mode 100644
index 1b1fe86..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_light.png
deleted file mode 100644
index 04ffe76..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_dark.png
deleted file mode 100644
index b9e98f9..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_light.png
deleted file mode 100644
index 85d1a94..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_dark.png
deleted file mode 100644
index 040d1e0..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_light.png
deleted file mode 100644
index ab750bc..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_dark.png
deleted file mode 100644
index 68f92f1..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_light.png
deleted file mode 100644
index 6dba74a..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_dark.png
deleted file mode 100644
index af2346d..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_light.png
deleted file mode 100644
index e2d4e27..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_dark.png
deleted file mode 100644
index e13a057..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_light.png
deleted file mode 100644
index b1567c2..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_dark.png
deleted file mode 100644
index 98d3a5e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_light.png
deleted file mode 100644
index 75ff3c3..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_light.png
deleted file mode 100644
index ca865f2..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00.png
new file mode 100644
index 0000000..3c7f5bc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_dark.png
deleted file mode 100644
index b0a34f6..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_light.png
deleted file mode 100644
index bae0b42..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01.png
new file mode 100644
index 0000000..b937ea6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_dark.png
deleted file mode 100644
index 4d8e2a1..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_light.png
deleted file mode 100644
index 0d4dc81..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02.png
new file mode 100644
index 0000000..03e6997
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_dark.png
deleted file mode 100644
index d55ef43..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_light.png
deleted file mode 100644
index 354a702..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03.png
new file mode 100644
index 0000000..1edf346
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_dark.png
deleted file mode 100644
index 86de1ae..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_light.png
deleted file mode 100644
index f374fd1..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04.png
new file mode 100644
index 0000000..5fad85f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_dark.png
deleted file mode 100644
index 6106d9a..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_light.png
deleted file mode 100644
index c2114ce..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05.png
new file mode 100644
index 0000000..e13721a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_dark.png
deleted file mode 100644
index b8589bc..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_light.png
deleted file mode 100644
index 5d2e03a..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06.png
new file mode 100644
index 0000000..bc7180f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_dark.png
deleted file mode 100644
index c1c8d30..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_light.png
deleted file mode 100644
index 5df34dc..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07.png
new file mode 100644
index 0000000..125c1ea
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_dark.png
deleted file mode 100644
index 004860a..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_light.png
deleted file mode 100644
index d25e42f..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08.png
new file mode 100644
index 0000000..bcd2616
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_dark.png
deleted file mode 100644
index 37ea2d7..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_light.png
deleted file mode 100644
index cb34b0c..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09.png
new file mode 100644
index 0000000..0023252
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_dark.png
deleted file mode 100644
index d90f767..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_light.png
deleted file mode 100644
index f4f8fea..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10.png
new file mode 100644
index 0000000..5474d78
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_dark.png
deleted file mode 100644
index d4bb447..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_light.png
deleted file mode 100644
index eb36549..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11.png
new file mode 100644
index 0000000..427c496
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_dark.png
deleted file mode 100644
index 898bc73..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_light.png
deleted file mode 100644
index 3336c22..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12.png
new file mode 100644
index 0000000..333d1e1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_dark.png
deleted file mode 100644
index f3c335f..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_light.png
deleted file mode 100644
index 1cc8e9c..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13.png
new file mode 100644
index 0000000..e71e3fb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_dark.png
deleted file mode 100644
index 27d6ce3..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_light.png
deleted file mode 100644
index 0341aa3..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14.png
new file mode 100644
index 0000000..a6b1e0d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_dark.png
deleted file mode 100644
index b6ad4bc..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_light.png
deleted file mode 100644
index 1268ed8..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15.png
new file mode 100644
index 0000000..0cbb3fd
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_dark.png
deleted file mode 100644
index 847658e..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_light.png
deleted file mode 100644
index 197017c..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16.png
new file mode 100644
index 0000000..40ec436
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_dark.png
deleted file mode 100644
index 3bfba88..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_light.png
deleted file mode 100644
index 64516c3..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17.png
new file mode 100644
index 0000000..424b7b0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_dark.png
deleted file mode 100644
index 41810e6..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_light.png
deleted file mode 100644
index 6388eab..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18.png
new file mode 100644
index 0000000..32b5ab8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_dark.png
deleted file mode 100644
index afddc85..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_light.png
deleted file mode 100644
index 6aef69b..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19.png
new file mode 100644
index 0000000..7dbba0b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_dark.png
deleted file mode 100644
index 1713a64..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_light.png
deleted file mode 100644
index f83539f..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20.png
new file mode 100644
index 0000000..cd14275
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_dark.png
deleted file mode 100644
index d18bd20..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_light.png
deleted file mode 100644
index 806d8f0..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21.png
new file mode 100644
index 0000000..092a5b2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_dark.png
deleted file mode 100644
index 5afc741..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_light.png
deleted file mode 100644
index 350b0a4..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22.png
new file mode 100644
index 0000000..f1b1d55
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_dark.png
deleted file mode 100644
index caa6ba4..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_light.png
deleted file mode 100644
index 92e5937..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00.png
new file mode 100644
index 0000000..df5a16f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_dark.png
deleted file mode 100644
index 86dc6db..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_light.png
deleted file mode 100644
index b5847d2..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01.png
new file mode 100644
index 0000000..9bb7a82
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_dark.png
deleted file mode 100644
index d58d0bb..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_light.png
deleted file mode 100644
index e950f3f..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02.png
new file mode 100644
index 0000000..d3ce71f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_dark.png
deleted file mode 100644
index d2341ab..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_light.png
deleted file mode 100644
index 514ab96..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03.png
new file mode 100644
index 0000000..75a1b71
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_dark.png
deleted file mode 100644
index 6c7d956..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_light.png
deleted file mode 100644
index 021c61e..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04.png
new file mode 100644
index 0000000..bf6209d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_dark.png
deleted file mode 100644
index 3374644..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_light.png
deleted file mode 100644
index f41c1d6..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05.png
new file mode 100644
index 0000000..5996e32
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_dark.png
deleted file mode 100644
index 2dd3e4d..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_light.png
deleted file mode 100644
index ba8a40d..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06.png
new file mode 100644
index 0000000..3fee0df
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_dark.png
deleted file mode 100644
index 03bd9be..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_light.png
deleted file mode 100644
index 4982edf..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07.png
new file mode 100644
index 0000000..febab15
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_dark.png
deleted file mode 100644
index d78c86c..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_light.png
deleted file mode 100644
index 504af84..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08.png
new file mode 100644
index 0000000..677ee5f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_dark.png
deleted file mode 100644
index 1cb6cc0..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_light.png
deleted file mode 100644
index bedaf2d..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09.png
new file mode 100644
index 0000000..43d57d1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_dark.png
deleted file mode 100644
index e1ac366..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_light.png
deleted file mode 100644
index f210b6d..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10.png
new file mode 100644
index 0000000..44b8425
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_dark.png
deleted file mode 100644
index 71dd950..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_light.png
deleted file mode 100644
index a1f387a..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11.png
new file mode 100644
index 0000000..c3e2f04
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_dark.png
deleted file mode 100644
index e190e33..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_light.png
deleted file mode 100644
index e7a2c68..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12.png
new file mode 100644
index 0000000..be64016
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_dark.png
deleted file mode 100644
index 2c0dc55..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_light.png
deleted file mode 100644
index de3131d..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13.png
new file mode 100644
index 0000000..a461ff3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_dark.png
deleted file mode 100644
index 2934a6c..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_light.png
deleted file mode 100644
index 1f65148..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14.png
new file mode 100644
index 0000000..0c64d3a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_dark.png
deleted file mode 100644
index b61db6b..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_light.png
deleted file mode 100644
index 4b8758b..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15.png
new file mode 100644
index 0000000..b0cb6bc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_dark.png
deleted file mode 100644
index 7d193aa..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_light.png
deleted file mode 100644
index 61642cc..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16.png
new file mode 100644
index 0000000..5533da8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_dark.png
deleted file mode 100644
index 5be5110..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_light.png
deleted file mode 100644
index ae9f11d..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17.png
new file mode 100644
index 0000000..26d03b7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_dark.png
deleted file mode 100644
index b2993b9..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_light.png
deleted file mode 100644
index d54d867..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18.png
new file mode 100644
index 0000000..7f56f1d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_dark.png
deleted file mode 100644
index 6c91068..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_light.png
deleted file mode 100644
index ca5a89e..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19.png
new file mode 100644
index 0000000..9ce7d44
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_dark.png
deleted file mode 100644
index 14fba92..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_light.png
deleted file mode 100644
index 1cb7cdc..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20.png
new file mode 100644
index 0000000..7f430ab
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_dark.png
deleted file mode 100644
index 7bd7b83..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_light.png
deleted file mode 100644
index 8cc8109..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21.png
new file mode 100644
index 0000000..5200b93
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_dark.png
deleted file mode 100644
index eccdb95..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_light.png
deleted file mode 100644
index 9da4e0b..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22.png
new file mode 100644
index 0000000..1811bb1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_dark.png
deleted file mode 100644
index 1a51ef5..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_light.png
deleted file mode 100644
index d9f3f43..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png
index abdecfb..3c43af0 100644
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00.png
new file mode 100644
index 0000000..8328156
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_dark.png
deleted file mode 100644
index 4adfb9f..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_light.png
deleted file mode 100644
index ae0770f..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01.png
new file mode 100644
index 0000000..4a48bdc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_dark.png
deleted file mode 100644
index 9dcdb32..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_light.png
deleted file mode 100644
index 51d8eb8..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02.png
new file mode 100644
index 0000000..d740bd4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_dark.png
deleted file mode 100644
index 6530c29..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_light.png
deleted file mode 100644
index 00e145f..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03.png
new file mode 100644
index 0000000..c6a4cfe
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_dark.png
deleted file mode 100644
index 2e1e374..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_light.png
deleted file mode 100644
index 5ae66cf..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04.png
new file mode 100644
index 0000000..a38ad7d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_dark.png
deleted file mode 100644
index f0a5c64..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_light.png
deleted file mode 100644
index 82811dc..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05.png
new file mode 100644
index 0000000..b4037be
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_dark.png
deleted file mode 100644
index 123e4dc..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_light.png
deleted file mode 100644
index d589f5f..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06.png
new file mode 100644
index 0000000..f91f683
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_dark.png
deleted file mode 100644
index 473ab36..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_light.png
deleted file mode 100644
index 8b1ec75..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07.png
new file mode 100644
index 0000000..5c4ef69
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_dark.png
deleted file mode 100644
index f04095f..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_light.png
deleted file mode 100644
index 70edb33..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08.png
new file mode 100644
index 0000000..cef9f1f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_dark.png
deleted file mode 100644
index 38768b3..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_light.png
deleted file mode 100644
index 9122174..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09.png
new file mode 100644
index 0000000..b6f1c59
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_dark.png
deleted file mode 100644
index 687d224..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_light.png
deleted file mode 100644
index e860d18..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10.png
new file mode 100644
index 0000000..07472f3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_dark.png
deleted file mode 100644
index dc16761..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_light.png
deleted file mode 100644
index 63121aa..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11.png
new file mode 100644
index 0000000..27fc974
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_dark.png
deleted file mode 100644
index 99716f0..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_light.png
deleted file mode 100644
index 418a0c3..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12.png
new file mode 100644
index 0000000..9fb9a44
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_dark.png
deleted file mode 100644
index c96b35c..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_light.png
deleted file mode 100644
index ff3da39..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13.png
new file mode 100644
index 0000000..aefd5e1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_dark.png
deleted file mode 100644
index f9235a4..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_light.png
deleted file mode 100644
index 8aa1b50..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14.png
new file mode 100644
index 0000000..3369168
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_dark.png
deleted file mode 100644
index 70e8489..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_light.png
deleted file mode 100644
index e46efdf..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15.png
new file mode 100644
index 0000000..d5f442f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_dark.png
deleted file mode 100644
index 82a1fec..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_light.png
deleted file mode 100644
index f8a3229..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16.png
new file mode 100644
index 0000000..9d8fcb7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_dark.png
deleted file mode 100644
index d7acac0..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_light.png
deleted file mode 100644
index 8021b77..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17.png
new file mode 100644
index 0000000..9737f5c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_dark.png
deleted file mode 100644
index 437bd0d..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_light.png
deleted file mode 100644
index 6f95113..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18.png
new file mode 100644
index 0000000..525e52b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_dark.png
deleted file mode 100644
index b12e965..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_light.png
deleted file mode 100644
index 7711297..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19.png
new file mode 100644
index 0000000..78ea7ac
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_dark.png
deleted file mode 100644
index 54bfa19..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_light.png
deleted file mode 100644
index 366bd83..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20.png
new file mode 100644
index 0000000..cd27674
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_dark.png
deleted file mode 100644
index 8af8eca..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_light.png
deleted file mode 100644
index 668d90a..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21.png
new file mode 100644
index 0000000..3998114
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_dark.png
deleted file mode 100644
index ef2b541..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_light.png
deleted file mode 100644
index 5fa1e69..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22.png
new file mode 100644
index 0000000..355bd6f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_dark.png
deleted file mode 100644
index 2f8ebef..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_light.png
deleted file mode 100644
index 5da4070..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00.png
new file mode 100644
index 0000000..d39a8c5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_dark.png
deleted file mode 100644
index 8500685..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_light.png
deleted file mode 100644
index 98fc370..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01.png
new file mode 100644
index 0000000..df710c1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_dark.png
deleted file mode 100644
index 0a90238..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_light.png
deleted file mode 100644
index 79be598..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02.png
new file mode 100644
index 0000000..217e318
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_dark.png
deleted file mode 100644
index 3754643..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_light.png
deleted file mode 100644
index 2b1dead..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03.png
new file mode 100644
index 0000000..37272ce
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_dark.png
deleted file mode 100644
index bc684d6..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_light.png
deleted file mode 100644
index ee16f3d..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04.png
new file mode 100644
index 0000000..46cc052
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_dark.png
deleted file mode 100644
index d85fe45..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_light.png
deleted file mode 100644
index d73d55f..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05.png
new file mode 100644
index 0000000..e4cc9fb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_dark.png
deleted file mode 100644
index 5b954e2..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_light.png
deleted file mode 100644
index c5fbe4d..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06.png
new file mode 100644
index 0000000..c5952de
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_dark.png
deleted file mode 100644
index 679c094..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_light.png
deleted file mode 100644
index 29c6ed0..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07.png
new file mode 100644
index 0000000..c5ccf4c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_dark.png
deleted file mode 100644
index f5b9b84..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_light.png
deleted file mode 100644
index 3df6a15..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08.png
new file mode 100644
index 0000000..3d5a27e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_dark.png
deleted file mode 100644
index caf32c6..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_light.png
deleted file mode 100644
index 64897f1..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09.png
new file mode 100644
index 0000000..1876ba0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_dark.png
deleted file mode 100644
index bb31d59..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_light.png
deleted file mode 100644
index bd29373..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10.png
new file mode 100644
index 0000000..d58e936
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_dark.png
deleted file mode 100644
index 944a5e0..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_light.png
deleted file mode 100644
index 2872fcb..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11.png
new file mode 100644
index 0000000..ceb63af
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_dark.png
deleted file mode 100644
index 350a6ef..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_light.png
deleted file mode 100644
index 074e939..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12.png
new file mode 100644
index 0000000..826dfbf
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_dark.png
deleted file mode 100644
index cadce32..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_light.png
deleted file mode 100644
index 27396fd..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13.png
new file mode 100644
index 0000000..875d1d5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_dark.png
deleted file mode 100644
index dfe5fc7..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_light.png
deleted file mode 100644
index 538e4de..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14.png
new file mode 100644
index 0000000..c97fce4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_dark.png
deleted file mode 100644
index 831e514..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_light.png
deleted file mode 100644
index 16dd579..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15.png
new file mode 100644
index 0000000..6c20e89
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_dark.png
deleted file mode 100644
index cd4ce9b..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_light.png
deleted file mode 100644
index fd450e2..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16.png
new file mode 100644
index 0000000..da203fc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_dark.png
deleted file mode 100644
index 5b9f16b..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_light.png
deleted file mode 100644
index cc45b86..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17.png
new file mode 100644
index 0000000..042fb2c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_dark.png
deleted file mode 100644
index c8442c9..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_light.png
deleted file mode 100644
index c9de27a..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18.png
new file mode 100644
index 0000000..96b18a1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_dark.png
deleted file mode 100644
index 36e164d..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_light.png
deleted file mode 100644
index e9d6a34..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19.png
new file mode 100644
index 0000000..4cc6c3a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_dark.png
deleted file mode 100644
index 08052bf..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_light.png
deleted file mode 100644
index 5a39372..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20.png
new file mode 100644
index 0000000..19f16b8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_dark.png
deleted file mode 100644
index f9b0e07..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_light.png
deleted file mode 100644
index 3a13705..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21.png
new file mode 100644
index 0000000..2bfc79b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_dark.png
deleted file mode 100644
index f051b45..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_light.png
deleted file mode 100644
index 51e1299..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22.png
new file mode 100644
index 0000000..f5bb4f9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_dark.png
deleted file mode 100644
index 63cc2ad..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_light.png
deleted file mode 100644
index aebdf75..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png
index 4b64a48..ce27a79 100644
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_connecting.xml
similarity index 72%
rename from v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
rename to v7/mediarouter/res/drawable/mr_ic_media_route_connecting.xml
index f1c1b38..5cf0bbd 100644
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_connecting.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,27 +17,27 @@
<animation-list
xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
- <item android:drawable="@drawable/ic_media_route_connecting_00_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_01_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_02_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_03_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_04_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_05_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_06_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_07_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_08_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_09_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_10_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_11_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_12_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_13_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_14_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_15_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_16_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_17_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_18_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_19_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_20_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_21_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_22_dark" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_00" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_01" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_02" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_03" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_04" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_05" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_06" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_07" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_08" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_09" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_10" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_11" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_12" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_13" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_14" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_15" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_16" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_17" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_18" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_19" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_20" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_21" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_connecting_22" android:duration="42" />
</animation-list>
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_light.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_light.xml
deleted file mode 100644
index e387276..0000000
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_light.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<animation-list
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:oneshot="false">
- <item android:drawable="@drawable/ic_media_route_connecting_00_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_01_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_02_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_03_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_04_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_05_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_06_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_07_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_08_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_09_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_10_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_11_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_12_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_13_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_14_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_15_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_16_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_17_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_18_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_19_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_20_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_21_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_connecting_22_light" android:duration="42" />
-</animation-list>
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml
index abf4634..a3a2487 100644
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml
@@ -16,9 +16,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_mono_dark" />
+ android:drawable="@drawable/mr_ic_media_route_on" />
<item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_mono_dark" />
+ android:drawable="@drawable/mr_ic_media_route_connecting" />
<item android:state_enabled="true"
android:drawable="@drawable/ic_media_route_off_mono_dark" />
<item android:drawable="@drawable/ic_media_route_disabled_mono_dark" />
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.xml
index 2512b66..055e2e1 100644
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.xml
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.xml
@@ -16,9 +16,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_mono_light" />
+ android:drawable="@drawable/mr_ic_media_route_on" />
<item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_mono_light" />
+ android:drawable="@drawable/mr_ic_media_route_connecting" />
<item android:state_enabled="true"
android:drawable="@drawable/ic_cast_off_light" />
<item android:drawable="@drawable/ic_cast_disabled_light" />
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_on.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_on.xml
new file mode 100644
index 0000000..0d6d7f8
--- /dev/null
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_on.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<animation-list
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:oneshot="true">
+ <item android:drawable="@drawable/ic_media_route_on_00" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_01" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_02" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_03" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_04" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_05" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_06" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_07" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_08" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_09" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_10" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_11" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_12" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_13" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_14" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_15" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_16" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_17" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_18" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_19" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_20" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_21" android:duration="42" />
+ <item android:drawable="@drawable/ic_media_route_on_22" android:duration="42" />
+</animation-list>
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_dark.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_dark.xml
deleted file mode 100644
index de183a3..0000000
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_dark.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<animation-list
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:oneshot="true">
- <item android:drawable="@drawable/ic_media_route_on_00_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_01_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_02_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_03_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_04_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_05_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_06_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_07_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_08_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_09_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_10_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_11_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_12_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_13_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_14_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_15_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_16_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_17_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_18_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_19_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_20_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_21_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_22_dark" android:duration="42" />
-</animation-list>
diff --git a/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_light.xml b/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_light.xml
deleted file mode 100644
index 2d4775b..0000000
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_light.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<animation-list
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:oneshot="true">
- <item android:drawable="@drawable/ic_media_route_on_00_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_01_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_02_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_03_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_04_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_05_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_06_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_07_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_08_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_09_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_10_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_11_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_12_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_13_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_14_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_15_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_16_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_17_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_18_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_19_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_20_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_21_light" android:duration="42" />
- <item android:drawable="@drawable/ic_media_route_on_22_light" android:duration="42" />
-</animation-list>
diff --git a/v7/mediarouter/res/values/themes.xml b/v7/mediarouter/res/values/themes.xml
index cf1c303..2d1955a 100644
--- a/v7/mediarouter/res/values/themes.xml
+++ b/v7/mediarouter/res/values/themes.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
<item name="MediaRouteControllerWindowBackground">@drawable/mr_dialog_material_background_dark</item>
<item name="mediaRouteOffDrawable">@drawable/ic_media_route_off_mono_dark</item>
- <item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_dark</item>
- <item name="mediaRouteOnDrawable">@drawable/mr_ic_media_route_on_mono_dark</item>
+ <item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting</item>
+ <item name="mediaRouteOnDrawable">@drawable/mr_ic_media_route_on</item>
<item name="mediaRouteCloseDrawable">@drawable/mr_ic_close_dark</item>
<item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_dark</item>
<item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_dark</item>
@@ -54,8 +54,6 @@
<item name="MediaRouteControllerWindowBackground">@drawable/mr_dialog_material_background_light</item>
<item name="mediaRouteOffDrawable">@drawable/ic_cast_off_light</item>
- <item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_light</item>
- <item name="mediaRouteOnDrawable">@drawable/mr_ic_media_route_on_mono_light</item>
<item name="mediaRouteCloseDrawable">@drawable/mr_ic_close_light</item>
<item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_light</item>
<item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_light</item>
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
index da5c194..0d89da0 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
@@ -21,6 +21,7 @@
import android.content.ContextWrapper;
import android.content.res.TypedArray;
import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
@@ -366,6 +367,10 @@
mRemoteIndicator.setCallback(null);
unscheduleDrawable(mRemoteIndicator);
}
+ if (MediaRouterThemeHelper.isLightTheme(getContext()) && d != null) {
+ d = DrawableCompat.wrap(d.mutate());
+ DrawableCompat.setTint(d, Color.BLACK);
+ }
mRemoteIndicator = d;
if (d != null) {
d.setCallback(this);
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java b/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
index 3d55951..120ef51 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
@@ -137,7 +137,7 @@
volumeSlider.setColor(controllerColor);
}
- private static boolean isLightTheme(Context context) {
+ static boolean isLightTheme(Context context) {
TypedValue value = new TypedValue();
return context.getTheme().resolveAttribute(
android.support.v7.appcompat.R.attr.isLightTheme, value, true)
diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 0a8c1d2..81262f6 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -276,7 +276,7 @@
* Prior to L, there is no way to query this variable which is why we override the setter and
* track it here.
*/
- private boolean mClipToPadding;
+ private boolean mClipToPadding = true;
/**
* Note: this Runnable is only ever posted if:
@@ -2133,6 +2133,7 @@
needsFocusFailureLayout = found == null;
}
if (needsFocusFailureLayout) {
+ consumePendingUpdateOperations();
eatRequestLayout();
mLayout.onFocusSearchFailed(focused, direction, mRecycler, mState);
resumeRequestLayout(false);
@@ -2141,6 +2142,7 @@
} else {
result = ff.findNextFocus(this, focused, direction);
if (result == null && canRunFocusFailure) {
+ consumePendingUpdateOperations();
eatRequestLayout();
result = mLayout.onFocusSearchFailed(focused, direction, mRecycler, mState);
resumeRequestLayout(false);
@@ -5182,9 +5184,10 @@
if (!holder.hasAnyOfTheFlags(ViewHolder.FLAG_INVALID | ViewHolder.FLAG_REMOVED
| ViewHolder.FLAG_UPDATE)) {
// Retire oldest cached view
- final int cachedViewSize = mCachedViews.size();
- if (cachedViewSize == mViewCacheMax && cachedViewSize > 0) {
+ int cachedViewSize = mCachedViews.size();
+ if (cachedViewSize >= mViewCacheMax && cachedViewSize > 0) {
recycleCachedViewAt(0);
+ cachedViewSize --;
}
if (cachedViewSize < mViewCacheMax) {
mCachedViews.add(holder);
diff --git a/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewLayoutTest.java b/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewLayoutTest.java
index 252ca6b..75a3efd 100644
--- a/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewLayoutTest.java
+++ b/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewLayoutTest.java
@@ -561,6 +561,53 @@
}
@Test
+ public void testFocusSearchAfterChangedData() throws Throwable {
+ final RecyclerView recyclerView = new RecyclerView(getActivity());
+ TestLayoutManager tlm = new TestLayoutManager() {
+ @Override
+ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+ layoutRange(recycler, 0, 2);
+ layoutLatch.countDown();
+ }
+
+ @Nullable
+ @Override
+ public View onFocusSearchFailed(View focused, int direction,
+ RecyclerView.Recycler recycler,
+ RecyclerView.State state) {
+ try {
+ View view = recycler.getViewForPosition(state.getItemCount() - 1);
+ } catch (Throwable t) {
+ postExceptionToInstrumentation(t);
+ }
+ return null;
+ }
+ };
+ recyclerView.setLayoutManager(tlm);
+ final TestAdapter adapter = new TestAdapter(10) {
+ @Override
+ public void onBindViewHolder(TestViewHolder holder, int position) {
+ super.onBindViewHolder(holder, position);
+ holder.itemView.setFocusable(false);
+ holder.itemView.setFocusableInTouchMode(false);
+ }
+ };
+ recyclerView.setAdapter(adapter);
+ tlm.expectLayouts(1);
+ setRecyclerView(recyclerView);
+ tlm.waitForLayout(1);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ adapter.mItems.remove(9);
+ adapter.notifyItemRemoved(9);
+ recyclerView.focusSearch(recyclerView.getChildAt(1), View.FOCUS_DOWN);
+ }
+ });
+ checkForMainThreadException();
+ }
+
+ @Test
public void testFocusSearchFailFrozen() throws Throwable {
RecyclerView recyclerView = new RecyclerView(getActivity());
final CountDownLatch focusLatch = new CountDownLatch(1);
diff --git a/v8/renderscript/api/current.txt b/v8/renderscript/api/current.txt
index 929bd5f..3d135b1 100644
--- a/v8/renderscript/api/current.txt
+++ b/v8/renderscript/api/current.txt
@@ -70,9 +70,11 @@
method public static android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, int);
method public static android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type);
method public void generateMipmaps();
+ method public java.nio.ByteBuffer getByteBuffer();
method public int getBytesSize();
method public android.support.v8.renderscript.Element getElement();
method public long getIncAllocID();
+ method public long getStride();
method public android.support.v8.renderscript.Type getType();
method public int getUsage();
method public void ioReceive();
diff --git a/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java b/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
index 21a68a4..2384518 100644
--- a/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
+++ b/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
@@ -16,19 +16,15 @@
package android.support.v8.renderscript;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.nio.ByteBuffer;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import android.content.res.Resources;
-import android.content.res.AssetManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
-import android.view.Surface;
import android.util.Log;
-import android.util.TypedValue;
+import android.view.Surface;
/**
* <p> This class provides the primary method through which data is passed to
@@ -269,13 +265,50 @@
}
/**
- * Enable/Disable AutoPadding for Vec3 Elements.
+ * Specifies the mapping between the Allocation's cells and an array's elements
+ * when data is copied from the Allocation to the array, or vice-versa.
*
- * <p> Vec3 Elements, such as {@link Element#U8_3} are treated as Vec4 Elements
- * with the fourth vector element used as padding. Enabling the AutoPadding feature
- * will automatically add/remove the padding when you copy to/from an Allocation
- * with a Vec3 Element.
- * <p> By default: Disabled.
+ * Only applies to an Allocation whose Element is a vector of length 3 (such as
+ * {@link Element#U8_3} or {@link Element#RGB_888}). Enabling this feature may make
+ * copying data from the Allocation to an array or vice-versa less efficient.
+ *
+ * <p> Vec3 Element cells are stored in an Allocation as Vec4 Element cells with
+ * the same {@link android.support.v8.renderscript.Element.DataType}, with the fourth vector
+ * component treated as padding. When this feature is enabled, only the data components,
+ * i.e. the first 3 vector components of each cell, will be mapped between the array
+ * and the Allocation. When disabled, explicit mapping of the padding components
+ * is required, as described in the following example.
+ *
+ * <p> For example, when copying an integer array to an Allocation of two {@link
+ * Element#I32_3} cells using {@link #copyFrom(int[])}:
+ * <p> When disabled:
+ * The array must have at least 8 integers, with the first 4 integers copied
+ * to the first cell of the Allocation, and the next 4 integers copied to
+ * the second cell. The 4th and 8th integers are mapped as the padding components.
+ *
+ * <p> When enabled:
+ * The array just needs to have at least 6 integers, with the first 3 integers
+ * copied to the the first cell as data components, and the next 3 copied to
+ * the second cell. There is no mapping for the padding components.
+ *
+ * <p> Similarly, when copying a byte array to an Allocation of two {@link
+ * Element#I32_3} cells, using {@link #copyFromUnchecked(int[])}:
+ * <p> When disabled:
+ * The array must have at least 32 bytes, with the first 16 bytes copied
+ * to the first cell of the Allocation, and the next 16 bytes copied to
+ * the second cell. The 13th-16th and 29th-32nd bytes are mapped as padding
+ * components.
+ *
+ * <p> When enabled:
+ * The array just needs to have at least 24 bytes, with the first 12 bytes copied
+ * to the first cell of the Allocation, and the next 12 bytes copied to
+ * the second cell. There is no mapping for the padding components.
+ *
+ * <p> Similar to copying data to an Allocation from an array, when copying data from an
+ * Allocation to an array, the padding components for Vec3 Element cells will not be
+ * copied/mapped to the array if AutoPadding is enabled.
+ *
+ * <p> Default: Disabled.
*
* @param useAutoPadding True: enable AutoPadding; False: disable AutoPadding
*
@@ -476,11 +509,18 @@
public void ioSendOutput() {
ioSend();
}
-
/**
- * @hide
- * Get the ByteBuffer pointing to the raw data associated with Allocation.
- * Note: The ByteBuffer will be Read-Only for devices before Lollopop (API 21).
+ * Gets or creates a ByteBuffer that contains the raw data of the current Allocation.
+ * <p> If the Allocation is created with USAGE_IO_INPUT, the returned ByteBuffer
+ * would contain the up-to-date data as READ ONLY.
+ * For a 2D or 3D Allocation, the raw data maybe padded so that each row of
+ * the Allocation has certain alignment. The size of each row including padding,
+ * called stride, can be queried using the {@link #getStride()} method.
+ *
+ * Note: Operating on the ByteBuffer of a destroyed Allocation will triger errors.
+ * The ByteBuffer will be Read-Only for devices before Lollopop (API 21).
+ *
+ * @return ByteBuffer The ByteBuffer associated with raw data pointer of the Allocation.
*/
public ByteBuffer getByteBuffer() {
int xBytesSize = mType.getX() * mType.getElement().getBytesSize();
@@ -513,8 +553,14 @@
}
/**
- * @hide
- * Get the Stride of raw data associated with this 2D Allocation.
+ * Gets the stride of the Allocation.
+ * For a 2D or 3D Allocation, the raw data maybe padded so that each row of
+ * the Allocation has certain alignment. The size of each row including such
+ * padding is called stride.
+ *
+ * @return the stride. For 1D Allocation, the stride will be the number of
+ * bytes of this Allocation. For 2D and 3D Allocations, the stride
+ * will be the stride in X dimension measuring in bytes.
*/
public long getStride() {
if (mByteBufferStride ==0) {
@@ -640,7 +686,21 @@
* that the Allocation is compatible with the input buffer; it copies memory
* without reinterpretation.
*
- * @param array The source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param array The source array
*/
public void copyFromUnchecked(Object array) {
copyFromUnchecked(array, validateObjectIsPrimitiveArray(array, false),
@@ -652,7 +712,21 @@
* that the Allocation is compatible with the input buffer; it copies memory
* without reinterpretation.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFromUnchecked(int[] d) {
copyFromUnchecked(d, Element.DataType.SIGNED_32, d.length);
@@ -663,7 +737,21 @@
* that the Allocation is compatible with the input buffer; it copies memory
* without reinterpretation.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFromUnchecked(short[] d) {
copyFromUnchecked(d, Element.DataType.SIGNED_16, d.length);
@@ -674,7 +762,21 @@
* that the Allocation is compatible with the input buffer; it copies memory
* without reinterpretation.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFromUnchecked(byte[] d) {
copyFromUnchecked(d, Element.DataType.SIGNED_8, d.length);
@@ -685,7 +787,21 @@
* that the Allocation is compatible with the input buffer; it copies memory
* without reinterpretation.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFromUnchecked(float[] d) {
copyFromUnchecked(d, Element.DataType.FLOAT_32, d.length);
@@ -695,10 +811,24 @@
/**
* Copy into this Allocation from an array. This variant is type checked
* and will generate exceptions if the Allocation's {@link
- * android.renderscript.Element} does not match the array's
+ * android.support.v8.renderscript.Element} does not match the array's
* primitive type.
*
- * @param array The source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param array The source array
*/
public void copyFrom(Object array) {
copyFromUnchecked(array, validateObjectIsPrimitiveArray(array, true),
@@ -708,9 +838,24 @@
/**
* Copy into this Allocation from an array. This variant is type checked
* and will generate exceptions if the Allocation's {@link
- * android.support.v8.renderscript.Element} is not a 32 bit integer type.
+ * android.support.v8.renderscript.Element} is not a 32 bit integer nor a vector of 32 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFrom(int[] d) {
validateIsInt32();
@@ -720,9 +865,24 @@
/**
* Copy into this Allocation from an array. This variant is type checked
* and will generate exceptions if the Allocation's {@link
- * android.support.v8.renderscript.Element} is not a 16 bit integer type.
+ * android.support.v8.renderscript.Element} is not a 16 bit integer nor a vector of 16 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFrom(short[] d) {
validateIsInt16();
@@ -732,9 +892,24 @@
/**
* Copy into this Allocation from an array. This variant is type checked
* and will generate exceptions if the Allocation's {@link
- * android.support.v8.renderscript.Element} is not an 8 bit integer type.
+ * android.support.v8.renderscript.Element} is not an 8 bit integer nor a vector of 8 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFrom(byte[] d) {
validateIsInt8();
@@ -744,9 +919,24 @@
/**
* Copy into this Allocation from an array. This variant is type checked
* and will generate exceptions if the Allocation's {@link
- * android.support.v8.renderscript.Element} is not a 32 bit float type.
+ * android.support.v8.renderscript.Element} is neither a 32 bit float nor a vector of
+ * 32 bit floats {@link android.support.v8.renderscript.Element.DataType}.
*
- * @param d the source data array
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
+ *
+ * @param d the source array
*/
public void copyFrom(float[] d) {
validateIsFloat32();
@@ -940,12 +1130,26 @@
}
/**
- * Copy an array into part of this Allocation. This method does not
+ * Copy an array into a 1D region of this Allocation. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param array The source data array
+ * @param array The source array
*/
public void copy1DRangeFromUnchecked(int off, int count, Object array) {
copy1DRangeFromUnchecked(off, count, array,
@@ -954,48 +1158,104 @@
}
/**
- * Copy an array into part of this Allocation. This method does not
+ * Copy an array into a 1D region of this Allocation. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFromUnchecked(int off, int count, int[] d) {
copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.SIGNED_32, d.length);
}
/**
- * Copy an array into part of this Allocation. This method does not
+ * Copy an array into a 1D region of this Allocation. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFromUnchecked(int off, int count, short[] d) {
copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.SIGNED_16, d.length);
}
/**
- * Copy an array into part of this Allocation. This method does not
+ * Copy an array into a 1D region of this Allocation. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFromUnchecked(int off, int count, byte[] d) {
copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.SIGNED_8, d.length);
}
/**
- * Copy an array into part of this Allocation. This method does not
+ * Copy an array into a 1D region of this Allocation. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFromUnchecked(int off, int count, float[] d) {
copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.FLOAT_32, d.length);
@@ -1003,13 +1263,28 @@
/**
- * Copy an array into part of this Allocation. This variant is type checked
- * and will generate exceptions if the Allocation type does not
- * match the component type of the array passed in.
+ * Copy an array into a 1D region of this Allocation. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} does not match the component type
+ * of the array passed in.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param array The source data array.
+ * @param array The source array.
*/
public void copy1DRangeFrom(int off, int count, Object array) {
copy1DRangeFromUnchecked(off, count, array,
@@ -1018,13 +1293,28 @@
}
/**
- * Copy an array into part of this Allocation. This variant is type checked
- * and will generate exceptions if the Allocation type is not a 32 bit
- * integer type.
+ * Copy an array into a 1D region of this Allocation. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not an 32 bit integer nor a vector of 32 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFrom(int off, int count, int[] d) {
validateIsInt32();
@@ -1032,13 +1322,28 @@
}
/**
- * Copy an array into part of this Allocation. This variant is type checked
- * and will generate exceptions if the Allocation type is not a 16 bit
- * integer type.
+ * Copy an array into a 1D region of this Allocation. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not an 16 bit integer nor a vector of 16 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFrom(int off, int count, short[] d) {
validateIsInt16();
@@ -1046,13 +1351,28 @@
}
/**
- * Copy an array into part of this Allocation. This variant is type checked
- * and will generate exceptions if the Allocation type is not an 8 bit
- * integer type.
+ * Copy an array into a 1D region of this Allocation. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not an 8 bit integer nor a vector of 8 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeFrom(int off, int count, byte[] d) {
validateIsInt8();
@@ -1060,13 +1380,28 @@
}
/**
- * Copy an array into part of this Allocation. This variant is type checked
- * and will generate exceptions if the Allocation type is not a 32 bit float
- * type.
+ * Copy an array into a 1D region of this Allocation. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither a 32 bit float nor a vector of
+ * 32 bit floats {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array.
+ * @param d the source array.
*/
public void copy1DRangeFrom(int off, int count, float[] d) {
validateIsFloat32();
@@ -1132,7 +1467,23 @@
/**
* Copy from an array into a rectangular region in this Allocation. The
- * array is assumed to be tightly packed.
+ * array is assumed to be tightly packed. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} does not match the input data type.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to update in this Allocation
* @param yoff Y offset of the region to update in this Allocation
@@ -1148,7 +1499,24 @@
/**
* Copy from an array into a rectangular region in this Allocation. The
- * array is assumed to be tightly packed.
+ * array is assumed to be tightly packed. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not an 8 bit integer nor a vector of 8 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to update in this Allocation
* @param yoff Y offset of the region to update in this Allocation
@@ -1164,7 +1532,24 @@
/**
* Copy from an array into a rectangular region in this Allocation. The
- * array is assumed to be tightly packed.
+ * array is assumed to be tightly packed. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not a 16 bit integer nor a vector of 16 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to update in this Allocation
* @param yoff Y offset of the region to update in this Allocation
@@ -1180,7 +1565,24 @@
/**
* Copy from an array into a rectangular region in this Allocation. The
- * array is assumed to be tightly packed.
+ * array is assumed to be tightly packed. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not a 32 bit integer nor a vector of 32 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to update in this Allocation
* @param yoff Y offset of the region to update in this Allocation
@@ -1196,7 +1598,24 @@
/**
* Copy from an array into a rectangular region in this Allocation. The
- * array is assumed to be tightly packed.
+ * array is assumed to be tightly packed. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither a 32 bit float nor a vector of
+ * 32 bit floats {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to update in this Allocation
* @param yoff Y offset of the region to update in this Allocation
@@ -1272,7 +1691,13 @@
}
}
-
+ /**
+ * Copy a rectangular region from the array into the allocation.
+ * The array is assumed to be tightly packed.
+ *
+ * The data type of the array is not required to be the same as
+ * the element data type.
+ */
private void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d,
Object array, Element.DataType dt, int arrayLen) {
mRS.validate();
@@ -1298,8 +1723,24 @@
}
/**
- * Copy a rectangular region from the array into the allocation.
- * The array is assumed to be tightly packed.
+ * Copy from an array into a 3D region in this Allocation. The
+ * array is assumed to be tightly packed. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} does not match the input data type.
+ *
+ * <p> The size of the region is: w * h * d * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to update in this Allocation
* @param yoff Y offset of the region to update in this Allocation
@@ -1374,10 +1815,23 @@
}
/**
- * Copy from the Allocation into an array. The array must be at
- * least as large as the Allocation. The
- * {@link android.renderscript.Element} must match the component
- * type of the array passed in.
+ * Copy from the Allocation into an array. The method is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} does not match the input data type.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells will be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
*
* @param array The array to be set from the Allocation.
*/
@@ -1387,9 +1841,24 @@
}
/**
- * Copy from the Allocation into a byte array. The array must be at least
- * as large as the Allocation. The allocation must be of an 8 bit integer
- * {@link android.support.v8.renderscript.Element} type.
+ * Copy from the Allocation into a byte array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither an 8 bit integer nor a vector of 8 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells will be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
*
* @param d The array to be set from the Allocation.
*/
@@ -1399,9 +1868,24 @@
}
/**
- * Copy from the Allocation into a short array. The array must be at least
- * as large as the Allocation. The allocation must be of an 16 bit integer
- * {@link android.support.v8.renderscript.Element} type.
+ * Copy from the Allocation into a short array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not a 16 bit integer nor a vector of 16 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells will be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
*
* @param d The array to be set from the Allocation.
*/
@@ -1411,9 +1895,24 @@
}
/**
- * Copy from the Allocation into a int array. The array must be at least as
- * large as the Allocation. The allocation must be of an 32 bit integer
- * {@link android.support.v8.renderscript.Element} type.
+ * Copy from the Allocation into a int array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is not a 32 bit integer nor a vector of 32 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells will be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
*
* @param d The array to be set from the Allocation.
*/
@@ -1423,9 +1922,24 @@
}
/**
- * Copy from the Allocation into a float array. The array must be at least
- * as large as the Allocation. The allocation must be of an 32 bit float
- * {@link android.support.v8.renderscript.Element} type.
+ * Copy from the Allocation into a float array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither a 32 bit float nor a vector of
+ * 32 bit floats {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the Allocation {@link
+ * #getBytesSize getBytesSize()}.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells will be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the Allocation {@link #getBytesSize getBytesSize()}. The padding bytes for
+ * the cells must not be part of the array.
*
* @param d The array to be set from the Allocation.
*/
@@ -1443,7 +1957,7 @@
* @param yoff
* @param zoff
* @param component_number
- * @param array
+ * @param fp
*/
/*
public void copyToFieldPacker(int xoff, int yoff, int zoff, int component_number, FieldPacker fp) {
@@ -1462,7 +1976,7 @@
}
final byte[] data = fp.getData();
- int data_length = fp.getPos();
+ int data_length = data.length;
int eSize = mType.mElement.mElements[component_number].getBytesSize();
eSize *= mType.mElement.mArraySizes[component_number];
@@ -1490,12 +2004,26 @@
}
/**
- * Copy part of this Allocation into an array. This method does not
+ * Copy a 1D region of this Allocation into an array. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param array The dest data array
+ * @param array The dest array
*/
public void copy1DRangeToUnchecked(int off, int count, Object array) {
copy1DRangeToUnchecked(off, count, array,
@@ -1504,48 +2032,104 @@
}
/**
- * Copy part of this Allocation into an array. This method does not
+ * Copy a 1D region of this Allocation into an array. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeToUnchecked(int off, int count, int[] d) {
copy1DRangeToUnchecked(off, count, (Object)d, Element.DataType.SIGNED_32, d.length);
}
/**
- * Copy part of this Allocation into an array. This method does not
+ * Copy a 1D region of this Allocation into an array. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeToUnchecked(int off, int count, short[] d) {
copy1DRangeToUnchecked(off, count, (Object)d, Element.DataType.SIGNED_16, d.length);
}
/**
- * Copy part of this Allocation into an array. This method does not
+ * Copy a 1D region of this Allocation into an array. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeToUnchecked(int off, int count, byte[] d) {
copy1DRangeToUnchecked(off, count, (Object)d, Element.DataType.SIGNED_8, d.length);
}
/**
- * Copy part of this Allocation into an array. This method does not
+ * Copy a 1D region of this Allocation into an array. This method does not
* guarantee that the Allocation is compatible with the input buffer.
*
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
+ *
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeToUnchecked(int off, int count, float[] d) {
copy1DRangeToUnchecked(off, count, (Object)d, Element.DataType.FLOAT_32, d.length);
@@ -1553,13 +2137,28 @@
/**
- * Copy part of this Allocation into an array. This method does not
- * and will generate exceptions if the Allocation type does not
- * match the component type of the array passed in.
+ * Copy a 1D region of this Allocation into an array. This method is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} does not match the component type
+ * of the array passed in.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param array The source data array.
+ * @param array The source array.
*/
public void copy1DRangeTo(int off, int count, Object array) {
copy1DRangeToUnchecked(off, count, array,
@@ -1568,13 +2167,28 @@
}
/**
- * Copy part of this Allocation into an array. This method does not
- * and will generate exceptions if the Allocation type is not a 32 bit
- * integer type.
+ * Copy a 1D region of this Allocation into an array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither a 32 bit integer nor a vector of 32 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeTo(int off, int count, int[] d) {
validateIsInt32();
@@ -1582,13 +2196,28 @@
}
/**
- * Copy part of this Allocation into an array. This method does not
- * and will generate exceptions if the Allocation type is not a 16 bit
- * integer type.
+ * Copy a 1D region of this Allocation into an array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither a 16 bit integer nor a vector of 16 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeTo(int off, int count, short[] d) {
validateIsInt16();
@@ -1596,13 +2225,28 @@
}
/**
- * Copy part of this Allocation into an array. This method does not
- * and will generate exceptions if the Allocation type is not an 8 bit
- * integer type.
+ * Copy a 1D region of this Allocation into an array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither an 8 bit integer nor a vector of 8 bit
+ * integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array
+ * @param d the source array
*/
public void copy1DRangeTo(int off, int count, byte[] d) {
validateIsInt8();
@@ -1610,13 +2254,28 @@
}
/**
- * Copy part of this Allocation into an array. This method does not
- * and will generate exceptions if the Allocation type is not a 32 bit float
- * type.
+ * Copy a 1D region of this Allocation into an array. This variant is type checked
+ * and will generate exceptions if the Allocation's {@link
+ * android.support.v8.renderscript.Element} is neither a 32 bit float nor a vector of
+ * 32 bit floats {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: count * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param off The offset of the first element to be copied.
* @param count The number of elements to be copied.
- * @param d the source data array.
+ * @param d the source array.
*/
public void copy1DRangeTo(int off, int count, float[] d) {
validateIsFloat32();
@@ -1648,7 +2307,24 @@
}
/**
- * Copy from a rectangular region in this Allocation into an array.
+ * Copy from a rectangular region in this Allocation into an array. This
+ * method is type checked and will generate exceptions if the Allocation's
+ * {@link android.support.v8.renderscript.Element} does not match the component type
+ * of the array passed in.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to copy in this Allocation
* @param yoff Y offset of the region to copy in this Allocation
@@ -1663,7 +2339,24 @@
}
/**
- * Copy from a rectangular region in this Allocation into an array.
+ * Copy from a rectangular region in this Allocation into an array. This
+ * variant is type checked and will generate exceptions if the Allocation's
+ * {@link android.support.v8.renderscript.Element} is neither an 8 bit integer nor a vector
+ * of 8 bit integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to copy in this Allocation
* @param yoff Y offset of the region to copy in this Allocation
@@ -1678,7 +2371,24 @@
}
/**
- * Copy from a rectangular region in this Allocation into an array.
+ * Copy from a rectangular region in this Allocation into an array. This
+ * variant is type checked and will generate exceptions if the Allocation's
+ * {@link android.support.v8.renderscript.Element} is neither a 16 bit integer nor a vector
+ * of 16 bit integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to copy in this Allocation
* @param yoff Y offset of the region to copy in this Allocation
@@ -1693,7 +2403,24 @@
}
/**
- * Copy from a rectangular region in this Allocation into an array.
+ * Copy from a rectangular region in this Allocation into an array. This
+ * variant is type checked and will generate exceptions if the Allocation's
+ * {@link android.support.v8.renderscript.Element} is neither a 32 bit integer nor a vector
+ * of 32 bit integers {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to copy in this Allocation
* @param yoff Y offset of the region to copy in this Allocation
@@ -1708,7 +2435,24 @@
}
/**
- * Copy from a rectangular region in this Allocation into an array.
+ * Copy from a rectangular region in this Allocation into an array. This
+ * variant is type checked and will generate exceptions if the Allocation's
+ * {@link android.support.v8.renderscript.Element} is neither a 32 bit float nor a vector
+ * of 32 bit floats {@link android.support.v8.renderscript.Element.DataType}.
+ *
+ * <p> The size of the region is: w * h * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to copy in this Allocation
* @param yoff Y offset of the region to copy in this Allocation
@@ -1724,8 +2468,12 @@
/**
- * @hide
+ * Copy from a 3D region in this Allocation into an array. This method does
+ * not guarantee that the Allocation is compatible with the input buffer.
+ * The array is assumed to be tightly packed.
*
+ * The data type of the array is not required to be the same as
+ * the element data type.
*/
/*
private void copy3DRangeToUnchecked(int xoff, int yoff, int zoff, int w, int h, int d,
@@ -1754,7 +2502,24 @@
/**
* @hide
- * Copy from a rectangular region in this Allocation into an array.
+ * Copy from a 3D region in this Allocation into an array. This
+ * method is type checked and will generate exceptions if the Allocation's
+ * {@link android.support.v8.renderscript.Element} does not match the component type
+ * of the array passed in.
+ *
+ * <p> The size of the region is: w * h * d * {@link #getElement}.{@link
+ * Element#getBytesSize}.
+ *
+ * <p> If the Allocation does not have Vec3 Elements, then the size of the
+ * array in bytes must be at least the size of the region.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is disabled, then the size of the array in bytes must be at least the size
+ * of the region. The padding bytes for the cells must be part of the array.
+ *
+ * <p> If the Allocation has Vec3 Elements and {@link #setAutoPadding AutoPadding}
+ * is enabled, then the size of the array in bytes must be at least 3/4 the size
+ * of the region. The padding bytes for the cells must not be part of the array.
*
* @param xoff X offset of the region to copy in this Allocation
* @param yoff Y offset of the region to copy in this Allocation
diff --git a/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicBlur.java b/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicBlur.java
index e577d67..e1a134a 100644
--- a/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicBlur.java
+++ b/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicBlur.java
@@ -40,7 +40,8 @@
* Create an intrinsic for applying a blur to an allocation. The
* default radius is 5.0.
*
- * Supported elements types are {@link Element#U8_4}
+ * Supported elements types are {@link Element#U8},
+ * {@link Element#U8_4}.
*
* @param rs The RenderScript context
* @param e Element type for inputs and outputs
