commit 88f5e78be2784be37cf4e4e6795d78dd6fc1d762
author Tenghui Zhu <ztenghui@google.com> Wed May 25 17:45:57 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 25 17:45:57 2016 +0000
tree 34d1b30f86fd60ca4fda5bf81353f81472796c91
parent d3a7d47d007faad84356f5f846f92f4abfdff1df
parent 9ccbe0f4fa88c4ec959e1bdfaaa42caedf6886cc

Merge "Fix VectorDrawableSetup checking" into nyc-dev

annotations/src/android/support/annotation/RequiresApi.java

diff --git a/annotations/src/android/support/annotation/RequiresApi.java b/annotations/src/android/support/annotation/RequiresApi.java
index 39f0b51..ddd3158 100644
--- a/annotations/src/android/support/annotation/RequiresApi.java
+++ b/annotations/src/android/support/annotation/RequiresApi.java
@@ -36,6 +36,14 @@
 @Retention(CLASS)
 @Target({TYPE,METHOD,CONSTRUCTOR,FIELD})
 public @interface RequiresApi {
+    /**
+     * The API level to require. Alias for {@link #api} which allows you to leave out the
+     * {@code api=} part.
+     */
     @IntRange(from=1)
-    int value();
+    int value() default 1;
+
+    /** The API level to require */
+    @IntRange(from=1)
+    int api() default 1;
 }

build.gradle

diff --git a/build.gradle b/build.gradle
index 9832ab9..ff93bdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,12 +9,12 @@
         maven { url "../../prebuilts/maven_repo/android" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0-alpha1'
     }
 }
 
-ext.supportVersion = '24.0.0-SNAPSHOT'
-ext.extraVersion = 25
+ext.supportVersion = '24.0.0'
+ext.extraVersion = 33
 ext.supportRepoOut = ''
 ext.buildToolsVersion = '23.0.2'
 ext.buildNumber = Integer.toString(ext.extraVersion)

design/api/current.txt

diff --git a/design/api/current.txt b/design/api/current.txt
index f3e563c..aefeea2 100644
--- a/design/api/current.txt
+++ b/design/api/current.txt
@@ -145,7 +145,7 @@
     method public void setExpandedTitleMarginTop(int);
     method public void setExpandedTitleTextAppearance(int);
     method public void setExpandedTitleTypeface(android.graphics.Typeface);
-    method public void setScrimAnimationDuration(int);
+    method public void setScrimAnimationDuration(long);
     method public void setScrimVisibleHeightTrigger(int);
     method public void setScrimsShown(boolean);
     method public void setScrimsShown(boolean, boolean);

design/src/android/support/design/widget/CollapsingToolbarLayout.java

diff --git a/design/src/android/support/design/widget/CollapsingToolbarLayout.java b/design/src/android/support/design/widget/CollapsingToolbarLayout.java
index e8f593e..2181a1c 100644
--- a/design/src/android/support/design/widget/CollapsingToolbarLayout.java
+++ b/design/src/android/support/design/widget/CollapsingToolbarLayout.java
@@ -1034,7 +1034,7 @@
      *
      * @attr ref android.support.design.R.styleable#CollapsingToolbarLayout_scrimAnimationDuration
      */
-    public void setScrimAnimationDuration(@IntRange(from = 0) final int duration) {
+    public void setScrimAnimationDuration(@IntRange(from = 0) final long duration) {
         mScrimAnimationDuration = duration;
     }
 

documents-archive/Android.mk

diff --git a/documents-archive/Android.mk b/documents-archive/Android.mk
index 32ec7d6..98d28c3 100644
--- a/documents-archive/Android.mk
+++ b/documents-archive/Android.mk
@@ -37,3 +37,13 @@
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
+support_module_src_files += $(LOCAL_SRC_FILES)
+
+# API Check
+# ---------------------------------------------
+support_module := $(LOCAL_MODULE)
+support_module_api_dir := $(LOCAL_PATH)/api
+support_module_java_libraries := $(LOCAL_JAVA_LIBRARIES)
+support_module_java_packages := android.support.provider.*
+include $(SUPPORT_API_CHECK)

documents-archive/tests/NO_DOCS

diff --git a/documents-archive/tests/NO_DOCS b/documents-archive/tests/NO_DOCS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/documents-archive/tests/NO_DOCS

v17/leanback/res/values-is-rIS/strings.xml

diff --git a/v17/leanback/res/values-is-rIS/strings.xml b/v17/leanback/res/values-is-rIS/strings.xml
index c6c6897..84b6430 100644
--- a/v17/leanback/res/values-is-rIS/strings.xml
+++ b/v17/leanback/res/values-is-rIS/strings.xml
@@ -19,7 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lb_navigation_menu_contentDescription" msgid="6215811486591629025">"Yfirlitsvalmynd"</string>
     <string name="orb_search_action" msgid="5651268540267663887">"Leitaraðgerð"</string>
-    <string name="lb_search_bar_hint" msgid="8325490927970116252">"Leitaðu"</string>
+    <string name="lb_search_bar_hint" msgid="8325490927970116252">"Leita"</string>
     <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Talaðu til að leita"</string>
     <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Leita í <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
     <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Talaðu til að leita í <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>

v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java

diff --git a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java
index 4825cb1..64029cd 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java
@@ -157,9 +157,9 @@
                     mFadeCompleteListener.onFadeInComplete();
                 }
             } else {
-                if (getVerticalGridView() != null) {
-                    // Reset focus to the controls row
-                    getVerticalGridView().setSelectedPosition(0);
+                VerticalGridView verticalView = getVerticalGridView();
+                // reset focus to the primary actions only if the selected row was the controls row
+                if (verticalView != null && verticalView.getSelectedPosition() == 0) {
                     resetControlsToPrimaryActions(null);
                 }
                 if (mFadeCompleteListener != null) {

v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java

diff --git a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java
index 9fd1805..a4e3f24 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java
@@ -159,9 +159,9 @@
                     mFadeCompleteListener.onFadeInComplete();
                 }
             } else {
-                if (getVerticalGridView() != null) {
-                    // Reset focus to the controls row
-                    getVerticalGridView().setSelectedPosition(0);
+                VerticalGridView verticalView = getVerticalGridView();
+                // reset focus to the primary actions only if the selected row was the controls row
+                if (verticalView != null && verticalView.getSelectedPosition() == 0) {
                     resetControlsToPrimaryActions(null);
                 }
                 if (mFadeCompleteListener != null) {

v17/preference-leanback/res/layout/leanback_list_preference_item_multi.xml

diff --git a/v17/preference-leanback/res/layout/leanback_list_preference_item_multi.xml b/v17/preference-leanback/res/layout/leanback_list_preference_item_multi.xml
index 728ecff..e7f6f85 100644
--- a/v17/preference-leanback/res/layout/leanback_list_preference_item_multi.xml
+++ b/v17/preference-leanback/res/layout/leanback_list_preference_item_multi.xml
@@ -31,6 +31,8 @@
         android:id="@+id/button"
         android:layout_width="@dimen/lb_preference_item_icon_size"
         android:layout_height="@dimen/lb_preference_item_icon_size"
+        android:focusable="false"
+        android:clickable="false"
         android:layout_marginEnd="@dimen/lb_preference_item_icon_margin_end"
         android:layout_gravity="center_vertical" />
 

v17/preference-leanback/res/layout/leanback_list_preference_item_single.xml

diff --git a/v17/preference-leanback/res/layout/leanback_list_preference_item_single.xml b/v17/preference-leanback/res/layout/leanback_list_preference_item_single.xml
index 354ca41..836b82e 100644
--- a/v17/preference-leanback/res/layout/leanback_list_preference_item_single.xml
+++ b/v17/preference-leanback/res/layout/leanback_list_preference_item_single.xml
@@ -31,6 +31,8 @@
         android:id="@+id/button"
         android:layout_width="@dimen/lb_preference_item_icon_size"
         android:layout_height="@dimen/lb_preference_item_icon_size"
+        android:focusable="false"
+        android:clickable="false"
         android:layout_marginEnd="@dimen/lb_preference_item_icon_margin_end"
         android:layout_gravity="center_vertical" />
 

v4/api/current.txt

diff --git a/v4/api/current.txt b/v4/api/current.txt
index 4a16350..89e6daa 100644
--- a/v4/api/current.txt
+++ b/v4/api/current.txt
@@ -105,18 +105,6 @@
     field public static final int MODE_IGNORED = 1; // 0x1
   }
 
-   abstract class BaseFragmentActivityDonut extends android.app.Activity {
-  }
-
-   abstract class BaseFragmentActivityEclair extends android.support.v4.app.BaseFragmentActivityDonut {
-  }
-
-   abstract class BaseFragmentActivityHoneycomb extends android.support.v4.app.BaseFragmentActivityEclair {
-  }
-
-   abstract class BaseFragmentActivityJB extends android.support.v4.app.BaseFragmentActivityHoneycomb {
-  }
-
   public final class BundleCompat {
     method public static android.os.IBinder getBinder(android.os.Bundle, java.lang.String);
     method public static void putBinder(android.os.Bundle, java.lang.String, android.os.IBinder);
@@ -256,7 +244,7 @@
     field public static final android.os.Parcelable.Creator<android.support.v4.app.Fragment.SavedState> CREATOR;
   }
 
-  public class FragmentActivity extends android.support.v4.app.BaseFragmentActivityJB implements android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback {
+  public class FragmentActivity extends android.app.Activity implements android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback {
     ctor public FragmentActivity();
     method public java.lang.Object getLastCustomNonConfigurationInstance();
     method public android.support.v4.app.FragmentManager getSupportFragmentManager();
@@ -648,6 +636,9 @@
     method public android.support.v4.app.NotificationCompat.Builder setContentIntent(android.app.PendingIntent);
     method public android.support.v4.app.NotificationCompat.Builder setContentText(java.lang.CharSequence);
     method public android.support.v4.app.NotificationCompat.Builder setContentTitle(java.lang.CharSequence);
+    method public android.support.v4.app.NotificationCompat.Builder setCustomBigContentView(android.widget.RemoteViews);
+    method public android.support.v4.app.NotificationCompat.Builder setCustomContentView(android.widget.RemoteViews);
+    method public android.support.v4.app.NotificationCompat.Builder setCustomHeadsUpContentView(android.widget.RemoteViews);
     method public android.support.v4.app.NotificationCompat.Builder setDefaults(int);
     method public android.support.v4.app.NotificationCompat.Builder setDeleteIntent(android.app.PendingIntent);
     method public android.support.v4.app.NotificationCompat.Builder setExtras(android.os.Bundle);

v4/api20/android/support/v4/app/NotificationCompatApi20.java

diff --git a/v4/api20/android/support/v4/app/NotificationCompatApi20.java b/v4/api20/android/support/v4/app/NotificationCompatApi20.java
index 6adabfd..8797a07 100644
--- a/v4/api20/android/support/v4/app/NotificationCompatApi20.java
+++ b/v4/api20/android/support/v4/app/NotificationCompatApi20.java
@@ -32,6 +32,8 @@
             NotificationBuilderWithActions {
         private Notification.Builder b;
         private Bundle mExtras;
+        private RemoteViews mContentView;
+        private RemoteViews mBigContentView;
 
         public Builder(Context context, Notification n,
                 CharSequence contentTitle, CharSequence contentText, CharSequence contentInfo,
@@ -40,7 +42,7 @@
                 int progressMax, int progress, boolean progressIndeterminate, boolean showWhen,
                 boolean useChronometer, int priority, CharSequence subText, boolean localOnly,
                 ArrayList<String> people, Bundle extras, String groupKey, boolean groupSummary,
-                String sortKey) {
+                String sortKey, RemoteViews contentView, RemoteViews bigContentView) {
             b = new Notification.Builder(context)
                 .setWhen(n.when)
                 .setShowWhen(showWhen)
@@ -79,6 +81,8 @@
                 mExtras.putStringArray(Notification.EXTRA_PEOPLE,
                         people.toArray(new String[people.size()]));
             }
+            mContentView = contentView;
+            mBigContentView = bigContentView;
         }
 
         @Override
@@ -94,7 +98,10 @@
         @Override
         public Notification build() {
             b.setExtras(mExtras);
-            return b.build();
+            Notification notification = b.build();
+            notification.contentView = mContentView;
+            notification.bigContentView = mBigContentView;
+            return notification;
         }
     }
 

v4/api21/android/support/v4/app/NotificationCompatApi21.java

diff --git a/v4/api21/android/support/v4/app/NotificationCompatApi21.java b/v4/api21/android/support/v4/app/NotificationCompatApi21.java
index 2aee2f5..5da3646 100644
--- a/v4/api21/android/support/v4/app/NotificationCompatApi21.java
+++ b/v4/api21/android/support/v4/app/NotificationCompatApi21.java
@@ -56,6 +56,9 @@
             NotificationBuilderWithActions {
         private Notification.Builder b;
         private Bundle mExtras;
+        private RemoteViews mContentView;
+        private RemoteViews mBigContentView;
+        private RemoteViews mHeadsUpContentView;
 
         public Builder(Context context, Notification n,
                 CharSequence contentTitle, CharSequence contentText, CharSequence contentInfo,
@@ -65,7 +68,8 @@
                 boolean useChronometer, int priority, CharSequence subText, boolean localOnly,
                 String category, ArrayList<String> people, Bundle extras, int color,
                 int visibility, Notification publicVersion, String groupKey, boolean groupSummary,
-                String sortKey) {
+                String sortKey, RemoteViews contentView, RemoteViews bigContentView,
+                RemoteViews headsUpContentView) {
             b = new Notification.Builder(context)
                     .setWhen(n.when)
                     .setShowWhen(showWhen)
@@ -107,6 +111,9 @@
             for (String person: people) {
                 b.addPerson(person);
             }
+            mContentView = contentView;
+            mBigContentView = bigContentView;
+            mHeadsUpContentView = headsUpContentView;
         }
 
         @Override
@@ -122,7 +129,11 @@
         @Override
         public Notification build() {
             b.setExtras(mExtras);
-            return b.build();
+            Notification notification = b.build();
+            notification.contentView =  mContentView;
+            notification.bigContentView = mBigContentView;
+            notification.headsUpContentView = mHeadsUpContentView;
+            return notification;
         }
     }
 

v4/api24/android/support/v4/app/NotificationCompatApi24.java

diff --git a/v4/api24/android/support/v4/app/NotificationCompatApi24.java b/v4/api24/android/support/v4/app/NotificationCompatApi24.java
index f775255..65c5d73 100644
--- a/v4/api24/android/support/v4/app/NotificationCompatApi24.java
+++ b/v4/api24/android/support/v4/app/NotificationCompatApi24.java
@@ -57,7 +57,8 @@
                 boolean useChronometer, int priority, CharSequence subText, boolean localOnly,
                 String category, ArrayList<String> people, Bundle extras, int color,
                 int visibility, Notification publicVersion, String groupKey, boolean groupSummary,
-                String sortKey, CharSequence[] remoteInputHistory) {
+                String sortKey, CharSequence[] remoteInputHistory, RemoteViews contentView,
+                RemoteViews bigContentView, RemoteViews headsUpContentView) {
             b = new Notification.Builder(context)
                     .setWhen(n.when)
                     .setShowWhen(showWhen)
@@ -93,7 +94,10 @@
                     .setColor(color)
                     .setVisibility(visibility)
                     .setPublicVersion(publicVersion)
-                    .setRemoteInputHistory(remoteInputHistory);
+                    .setRemoteInputHistory(remoteInputHistory)
+                    .setCustomContentView(contentView)
+                    .setCustomBigContentView(bigContentView)
+                    .setCustomHeadsUpContentView(headsUpContentView);
             for (String person: people) {
                 b.addPerson(person);
             }

v4/donut/android/support/v4/app/BaseFragmentActivityDonut.java

diff --git a/v4/donut/android/support/v4/app/BaseFragmentActivityDonut.java b/v4/donut/android/support/v4/app/BaseFragmentActivityDonut.java
index 2778c92..4179632 100644
--- a/v4/donut/android/support/v4/app/BaseFragmentActivityDonut.java
+++ b/v4/donut/android/support/v4/app/BaseFragmentActivityDonut.java
@@ -25,6 +25,8 @@
 
 /**
  * Base class for {@code FragmentActivity} to be able to use Donut APIs.
+ *
+ * @hide
  */
 abstract class BaseFragmentActivityDonut extends Activity {
 

v4/donut/android/support/v4/os/BuildCompat.java

diff --git a/v4/donut/android/support/v4/os/BuildCompat.java b/v4/donut/android/support/v4/os/BuildCompat.java
index cf35e7b..9792598 100644
--- a/v4/donut/android/support/v4/os/BuildCompat.java
+++ b/v4/donut/android/support/v4/os/BuildCompat.java
@@ -31,13 +31,13 @@
     /**
      * Check if the device is running on the Android N release or newer.
      * This method is suitable for use with preview SDKs and associated
-     * prerelease device builds.
+     * pre-release device builds.
      *
-     * @return true if N APIs are available for use
+     * @return {@code true} if N APIs are available for use
      */
     public static boolean isAtLeastN() {
-        if (TextUtils.isEmpty(VERSION.CODENAME)) {
-            return false;
+        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';

v4/eclair/android/support/v4/app/BaseFragmentActivityEclair.java

diff --git a/v4/eclair/android/support/v4/app/BaseFragmentActivityEclair.java b/v4/eclair/android/support/v4/app/BaseFragmentActivityEclair.java
index c5f6d2b..a77f057 100644
--- a/v4/eclair/android/support/v4/app/BaseFragmentActivityEclair.java
+++ b/v4/eclair/android/support/v4/app/BaseFragmentActivityEclair.java
@@ -22,6 +22,8 @@
 
 /**
  * Base class for {@code FragmentActivity} to be able to use v5 APIs.
+ *
+ * @hide
  */
 abstract class BaseFragmentActivityEclair extends BaseFragmentActivityDonut {
 

v4/honeycomb/android/support/v4/app/BaseFragmentActivityHoneycomb.java

diff --git a/v4/honeycomb/android/support/v4/app/BaseFragmentActivityHoneycomb.java b/v4/honeycomb/android/support/v4/app/BaseFragmentActivityHoneycomb.java
index 8acd31e..10e6a79 100644
--- a/v4/honeycomb/android/support/v4/app/BaseFragmentActivityHoneycomb.java
+++ b/v4/honeycomb/android/support/v4/app/BaseFragmentActivityHoneycomb.java
@@ -23,6 +23,8 @@
 
 /**
  * Base class for {@code FragmentActivity} to be able to use v11 APIs.
+ *
+ * @hide
  */
 abstract class BaseFragmentActivityHoneycomb extends BaseFragmentActivityEclair {
 

v4/java/android/support/v4/app/NotificationCompat.java

diff --git a/v4/java/android/support/v4/app/NotificationCompat.java b/v4/java/android/support/v4/app/NotificationCompat.java
index 8b1bc10..6c18db6 100644
--- a/v4/java/android/support/v4/app/NotificationCompat.java
+++ b/v4/java/android/support/v4/app/NotificationCompat.java
@@ -526,6 +526,7 @@
             if (b.mPriority > PRIORITY_DEFAULT) {
                 result.flags |= FLAG_HIGH_PRIORITY;
             }
+            result.contentView =  b.mContentView;
             return result;
         }
 
@@ -603,6 +604,7 @@
             if (b.mPriority > PRIORITY_DEFAULT) {
                 result.flags |= FLAG_HIGH_PRIORITY;
             }
+            result.contentView =  b.mContentView;
             return result;
         }
     }
@@ -610,9 +612,11 @@
     static class NotificationCompatImplHoneycomb extends NotificationCompatImplBase {
         @Override
         public Notification build(Builder b, BuilderExtender extender) {
-            return NotificationCompatHoneycomb.add(b.mContext, b.mNotification,
+            Notification notification = NotificationCompatHoneycomb.add(b.mContext, b.mNotification,
                     b.mContentTitle, b.mContentText, b.mContentInfo, b.mTickerView,
                     b.mNumber, b.mContentIntent, b.mFullScreenIntent, b.mLargeIcon);
+            notification.contentView =  b.mContentView;
+            return notification;
         }
     }
 
@@ -624,7 +628,9 @@
                             b.mContext, b.mNotification, b.mContentTitle, b.mContentText, b.mContentInfo,
                             b.mTickerView, b.mNumber, b.mContentIntent, b.mFullScreenIntent, b.mLargeIcon,
                             b.mProgressMax, b.mProgress, b.mProgressIndeterminate);
-            return extender.build(b, builder);
+            Notification notification = extender.build(b, builder);
+            notification.contentView =  b.mContentView;
+            return notification;
         }
     }
 
@@ -636,7 +642,7 @@
                     b.mTickerView, b.mNumber, b.mContentIntent, b.mFullScreenIntent, b.mLargeIcon,
                     b.mProgressMax, b.mProgress, b.mProgressIndeterminate,
                     b.mUseChronometer, b.mPriority, b.mSubText, b.mLocalOnly, b.mExtras,
-                    b.mGroupKey, b.mGroupSummary, b.mSortKey);
+                    b.mGroupKey, b.mGroupSummary, b.mSortKey, b.mContentView, b.mBigContentView);
             addActionsToBuilder(builder, b.mActions);
             addStyleToBuilderJellybean(builder, b.mStyle);
             Notification notification = extender.build(b, builder);
@@ -704,7 +710,8 @@
                     b.mTickerView, b.mNumber, b.mContentIntent, b.mFullScreenIntent, b.mLargeIcon,
                     b.mProgressMax, b.mProgress, b.mProgressIndeterminate, b.mShowWhen,
                     b.mUseChronometer, b.mPriority, b.mSubText, b.mLocalOnly,
-                    b.mPeople, b.mExtras, b.mGroupKey, b.mGroupSummary, b.mSortKey);
+                    b.mPeople, b.mExtras, b.mGroupKey, b.mGroupSummary, b.mSortKey,
+                    b.mContentView, b.mBigContentView);
             addActionsToBuilder(builder, b.mActions);
             addStyleToBuilderJellybean(builder, b.mStyle);
             return extender.build(b, builder);
@@ -755,7 +762,7 @@
                     b.mTickerView, b.mNumber, b.mContentIntent, b.mFullScreenIntent, b.mLargeIcon,
                     b.mProgressMax, b.mProgress, b.mProgressIndeterminate, b.mShowWhen,
                     b.mUseChronometer, b.mPriority, b.mSubText, b.mLocalOnly, b.mPeople, b.mExtras,
-                    b.mGroupKey, b.mGroupSummary, b.mSortKey);
+                    b.mGroupKey, b.mGroupSummary, b.mSortKey, b.mContentView, b.mBigContentView);
             addActionsToBuilder(builder, b.mActions);
             addStyleToBuilderJellybean(builder, b.mStyle);
             Notification notification = extender.build(b, builder);
@@ -814,7 +821,8 @@
                     b.mProgressMax, b.mProgress, b.mProgressIndeterminate, b.mShowWhen,
                     b.mUseChronometer, b.mPriority, b.mSubText, b.mLocalOnly, b.mCategory,
                     b.mPeople, b.mExtras, b.mColor, b.mVisibility, b.mPublicVersion,
-                    b.mGroupKey, b.mGroupSummary, b.mSortKey);
+                    b.mGroupKey, b.mGroupSummary, b.mSortKey, b.mContentView, b.mBigContentView,
+                    b.mHeadsUpContentView);
             addActionsToBuilder(builder, b.mActions);
             addStyleToBuilderJellybean(builder, b.mStyle);
             Notification notification = extender.build(b, builder);
@@ -853,7 +861,8 @@
                     b.mProgressMax, b.mProgress, b.mProgressIndeterminate, b.mShowWhen,
                     b.mUseChronometer, b.mPriority, b.mSubText, b.mLocalOnly, b.mCategory,
                     b.mPeople, b.mExtras, b.mColor, b.mVisibility, b.mPublicVersion,
-                    b.mGroupKey, b.mGroupSummary, b.mSortKey, b.mRemoteInputHistory);
+                    b.mGroupKey, b.mGroupSummary, b.mSortKey, b.mRemoteInputHistory, b.mContentView,
+                    b.mBigContentView, b.mHeadsUpContentView);
             addActionsToBuilder(builder, b.mActions);
             addStyleToBuilderApi24(builder, b.mStyle);
             Notification notification = extender.build(b, builder);
@@ -1024,6 +1033,9 @@
         int mColor = COLOR_DEFAULT;
         int mVisibility = VISIBILITY_PRIVATE;
         Notification mPublicVersion;
+        RemoteViews mContentView;
+        RemoteViews mBigContentView;
+        RemoteViews mHeadsUpContentView;
 
         /** @hide */
         public Notification mNotification = new Notification();
@@ -1664,6 +1676,43 @@
         }
 
         /**
+         * Supply custom RemoteViews to use instead of the platform template.
+         *
+         * This will override the layout that would otherwise be constructed by this Builder
+         * object.
+         */
+        public Builder setCustomContentView(RemoteViews contentView) {
+            mContentView = contentView;
+            return this;
+        }
+
+        /**
+         * Supply custom RemoteViews to use instead of the platform template in the expanded form.
+         *
+         * This will override the expanded layout that would otherwise be constructed by this
+         * Builder object.
+         *
+         * No-op on versions prior to {@link android.os.Build.VERSION_CODES#JELLY_BEAN}.
+         */
+        public Builder setCustomBigContentView(RemoteViews contentView) {
+            mBigContentView = contentView;
+            return this;
+        }
+
+        /**
+         * Supply custom RemoteViews to use instead of the platform template in the heads up dialog.
+         *
+         * This will override the heads-up layout that would otherwise be constructed by this
+         * Builder object.
+         *
+         * No-op on versions prior to {@link android.os.Build.VERSION_CODES#LOLLIPOP}.
+         */
+        public Builder setCustomHeadsUpContentView(RemoteViews contentView) {
+            mHeadsUpContentView = contentView;
+            return this;
+        }
+
+        /**
          * Apply an extender to this notification builder. Extenders may be used to add
          * metadata or change options on this builder.
          */
@@ -2187,8 +2236,7 @@
 
             static Message getMessageFromBundle(Bundle bundle) {
                 try {
-                    if (!bundle.containsKey(KEY_TEXT) || !bundle.containsKey(KEY_TIMESTAMP) ||
-                            !bundle.containsKey(KEY_SENDER)) {
+                    if (!bundle.containsKey(KEY_TEXT) || !bundle.containsKey(KEY_TIMESTAMP)) {
                         return null;
                     } else {
                         Message message = new Message(bundle.getCharSequence(KEY_TEXT),

v4/java/android/support/v4/media/MediaBrowserServiceCompat.java

diff --git a/v4/java/android/support/v4/media/MediaBrowserServiceCompat.java b/v4/java/android/support/v4/media/MediaBrowserServiceCompat.java
index 4528d05..9163cd7 100644
--- a/v4/java/android/support/v4/media/MediaBrowserServiceCompat.java
+++ b/v4/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -16,6 +16,30 @@
 
 package android.support.v4.media;
 
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_ADD_SUBSCRIPTION;
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_CONNECT;
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_DISCONNECT;
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_GET_MEDIA_ITEM;
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_REGISTER_CALLBACK_MESSENGER;
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_REMOVE_SUBSCRIPTION;
+import static android.support.v4.media.MediaBrowserProtocol.CLIENT_MSG_UNREGISTER_CALLBACK_MESSENGER;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_CALLBACK_TOKEN;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_CALLING_UID;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_MEDIA_ITEM_ID;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_MEDIA_ITEM_LIST;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_MEDIA_SESSION_TOKEN;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_OPTIONS;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_PACKAGE_NAME;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_RESULT_RECEIVER;
+import static android.support.v4.media.MediaBrowserProtocol.DATA_ROOT_HINTS;
+import static android.support.v4.media.MediaBrowserProtocol.EXTRA_CLIENT_VERSION;
+import static android.support.v4.media.MediaBrowserProtocol.EXTRA_MESSENGER_BINDER;
+import static android.support.v4.media.MediaBrowserProtocol.EXTRA_SERVICE_VERSION;
+import static android.support.v4.media.MediaBrowserProtocol.SERVICE_MSG_ON_CONNECT;
+import static android.support.v4.media.MediaBrowserProtocol.SERVICE_MSG_ON_CONNECT_FAILED;
+import static android.support.v4.media.MediaBrowserProtocol.SERVICE_MSG_ON_LOAD_CHILDREN;
+import static android.support.v4.media.MediaBrowserProtocol.SERVICE_VERSION_CURRENT;
+
 import android.app.Service;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -49,8 +73,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import static android.support.v4.media.MediaBrowserProtocol.*;
-
 /**
  * Base class for media browse services.
  * <p>
@@ -873,11 +895,18 @@
 
     /**
      * Gets the root hints sent from the currently connected {@link MediaBrowserCompat}.
+     * The root hints are service-specific arguments included in an optional bundle sent to the
+     * media browser service when connecting and retrieving the root id for browsing, or null if
+     * none. The contents of this bundle may affect the information returned when browsing.
+     * <p>
      * Note that this will return null when connected to {@link android.media.browse.MediaBrowser}
      * and running on API 23 or lower.
      *
      * @throws IllegalStateException If this method is called outside of {@link #onLoadChildren}
      *             or {@link #onLoadItem}
+     * @see MediaBrowserServiceCompat.BrowserRoot#EXTRA_RECENT
+     * @see MediaBrowserServiceCompat.BrowserRoot#EXTRA_OFFLINE
+     * @see MediaBrowserServiceCompat.BrowserRoot#EXTRA_SUGGESTED
      */
     public final Bundle getBrowserRootHints() {
         return mImpl.getBrowserRootHints();

v4/java/android/support/v4/print/PrintHelper.java

diff --git a/v4/java/android/support/v4/print/PrintHelper.java b/v4/java/android/support/v4/print/PrintHelper.java
index b9e5b14..88d5387 100644
--- a/v4/java/android/support/v4/print/PrintHelper.java
+++ b/v4/java/android/support/v4/print/PrintHelper.java
@@ -268,7 +268,7 @@
      */
     public PrintHelper(Context context) {
         if (systemSupportsPrint()) {
-            if (Build.VERSION.CODENAME.equals("N") ) {
+            if (Build.VERSION.SDK_INT >= 24) {
                 mImpl = new PrintHelperApi24Impl(context);
             } else if (Build.VERSION.SDK_INT >= 23) {
                 mImpl = new PrintHelperApi23Impl(context);

v4/jellybean/android/support/v4/app/BaseFragmentActivityJB.java

diff --git a/v4/jellybean/android/support/v4/app/BaseFragmentActivityJB.java b/v4/jellybean/android/support/v4/app/BaseFragmentActivityJB.java
index 615c762..147251c 100644
--- a/v4/jellybean/android/support/v4/app/BaseFragmentActivityJB.java
+++ b/v4/jellybean/android/support/v4/app/BaseFragmentActivityJB.java
@@ -23,6 +23,8 @@
 
 /**
  * Base class for {@code FragmentActivity} to be able to use v16 APIs.
+ *
+ * @hide
  */
 abstract class BaseFragmentActivityJB extends BaseFragmentActivityHoneycomb {
 

v4/jellybean/android/support/v4/app/NotificationCompatJellybean.java

diff --git a/v4/jellybean/android/support/v4/app/NotificationCompatJellybean.java b/v4/jellybean/android/support/v4/app/NotificationCompatJellybean.java
index a614e01..f467845 100644
--- a/v4/jellybean/android/support/v4/app/NotificationCompatJellybean.java
+++ b/v4/jellybean/android/support/v4/app/NotificationCompatJellybean.java
@@ -68,6 +68,8 @@
         private Notification.Builder b;
         private final Bundle mExtras;
         private List<Bundle> mActionExtrasList = new ArrayList<Bundle>();
+        private RemoteViews mContentView;
+        private RemoteViews mBigContentView;
 
         public Builder(Context context, Notification n,
                 CharSequence contentTitle, CharSequence contentText, CharSequence contentInfo,
@@ -75,7 +77,8 @@
                 PendingIntent contentIntent, PendingIntent fullScreenIntent, Bitmap largeIcon,
                 int progressMax, int progress, boolean progressIndeterminate,
                 boolean useChronometer, int priority, CharSequence subText, boolean localOnly,
-                Bundle extras, String groupKey, boolean groupSummary, String sortKey) {
+                Bundle extras, String groupKey, boolean groupSummary, String sortKey,
+                RemoteViews contentView, RemoteViews bigContentView) {
             b = new Notification.Builder(context)
                 .setWhen(n.when)
                 .setSmallIcon(n.icon, n.iconLevel)
@@ -119,6 +122,8 @@
             if (sortKey != null) {
                 mExtras.putString(EXTRA_SORT_KEY, sortKey);
             }
+            mContentView = contentView;
+            mBigContentView = bigContentView;
         }
 
         @Override
@@ -148,6 +153,8 @@
                 // Add the action extras sparse array if any action was added with extras.
                 getExtras(notif).putSparseParcelableArray(EXTRA_ACTION_EXTRAS, actionExtrasMap);
             }
+            notif.contentView = mContentView;
+            notif.bigContentView = mBigContentView;
             return notif;
         }
     }

v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java

diff --git a/v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java b/v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java
index e2fd3b7..e332830 100644
--- a/v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java
+++ b/v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java
@@ -33,6 +33,8 @@
         private Notification.Builder b;
         private Bundle mExtras;
         private List<Bundle> mActionExtrasList = new ArrayList<Bundle>();
+        private RemoteViews mContentView;
+        private RemoteViews mBigContentView;
 
         public Builder(Context context, Notification n,
                 CharSequence contentTitle, CharSequence contentText, CharSequence contentInfo,
@@ -41,7 +43,7 @@
                 int progressMax, int progress, boolean progressIndeterminate, boolean showWhen,
                 boolean useChronometer, int priority, CharSequence subText, boolean localOnly,
                 ArrayList<String> people, Bundle extras, String groupKey, boolean groupSummary,
-                String sortKey) {
+                String sortKey, RemoteViews contentView, RemoteViews bigContentView) {
             b = new Notification.Builder(context)
                 .setWhen(n.when)
                 .setShowWhen(showWhen)
@@ -90,6 +92,8 @@
             if (sortKey != null) {
                 mExtras.putString(NotificationCompatJellybean.EXTRA_SORT_KEY, sortKey);
             }
+            mContentView = contentView;
+            mBigContentView = bigContentView;
         }
 
         @Override
@@ -112,7 +116,10 @@
                         NotificationCompatJellybean.EXTRA_ACTION_EXTRAS, actionExtrasMap);
             }
             b.setExtras(mExtras);
-            return b.build();
+            Notification notification = b.build();
+            notification.contentView = mContentView;
+            notification.bigContentView = mBigContentView;
+            return notification;
         }
     }
 

v7/appcompat/res/values-az-rAZ/strings.xml

diff --git a/v7/appcompat/res/values-az-rAZ/strings.xml b/v7/appcompat/res/values-az-rAZ/strings.xml
index 37d2399..0e03f58 100644
--- a/v7/appcompat/res/values-az-rAZ/strings.xml
+++ b/v7/appcompat/res/values-az-rAZ/strings.xml
@@ -19,7 +19,7 @@
     <string name="abc_action_mode_done" msgid="4076576682505996667">"Hazırdır"</string>
     <string name="abc_action_bar_home_description" msgid="4600421777120114993">"Evə get"</string>
     <string name="abc_action_bar_up_description" msgid="1594238315039666878">"Yuxarı get"</string>
-    <string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Daha çox seçim"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Digər variantlar"</string>
     <string name="abc_toolbar_collapse_description" msgid="1603543279005712093">"Dağıt"</string>
     <string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
     <string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>

v7/appcompat/res/values-bn-rBD/strings.xml

diff --git a/v7/appcompat/res/values-bn-rBD/strings.xml b/v7/appcompat/res/values-bn-rBD/strings.xml
index 07c4b54..ef5fa1b 100644
--- a/v7/appcompat/res/values-bn-rBD/strings.xml
+++ b/v7/appcompat/res/values-bn-rBD/strings.xml
@@ -29,7 +29,7 @@
     <string name="abc_searchview_description_clear" msgid="3691816814315814921">"ক্যোয়ারী সাফ করুন"</string>
     <string name="abc_searchview_description_submit" msgid="8928215447528550784">"ক্যোয়ারী জমা দিন"</string>
     <string name="abc_searchview_description_voice" msgid="893419373245838918">"ভয়েস অনুসন্ধান"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"একটি অ্যাপ্লিকেশান চয়ন করুন"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"একটি অ্যাপ্লিকেশান বেছে নিন"</string>
     <string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"সবগুলো দেখুন"</string>
     <string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"%s এর সাথে শেয়ার করুন"</string>
     <string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"এর সাথে শেয়ার করুন"</string>

v7/appcompat/res/values-gu-rIN/strings.xml

diff --git a/v7/appcompat/res/values-gu-rIN/strings.xml b/v7/appcompat/res/values-gu-rIN/strings.xml
index 6fea9bb..cbf7b5d 100644
--- a/v7/appcompat/res/values-gu-rIN/strings.xml
+++ b/v7/appcompat/res/values-gu-rIN/strings.xml
@@ -29,7 +29,7 @@
     <string name="abc_searchview_description_clear" msgid="3691816814315814921">"ક્વેરી સાફ કરો"</string>
     <string name="abc_searchview_description_submit" msgid="8928215447528550784">"ક્વેરી સબમિટ કરો"</string>
     <string name="abc_searchview_description_voice" msgid="893419373245838918">"વૉઇસ શોધ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"એક એપ્લિકેશન પસંદ કરો"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"એક ઍપ્લિકેશન પસંદ કરો"</string>
     <string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"બધું જુઓ"</string>
     <string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"%s સાથે શેર કરો"</string>
     <string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"આની સાથે શેર કરો"</string>

v7/appcompat/res/values-lt/strings.xml

diff --git a/v7/appcompat/res/values-lt/strings.xml b/v7/appcompat/res/values-lt/strings.xml
index 992910c..226565e 100644
--- a/v7/appcompat/res/values-lt/strings.xml
+++ b/v7/appcompat/res/values-lt/strings.xml
@@ -35,5 +35,5 @@
     <string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"Bendrinti naudojant"</string>
     <string name="status_bar_notification_info_overflow" msgid="2869576371154716097">"999+"</string>
     <string name="abc_capital_on" msgid="3405795526292276155">"ĮJUNGTI"</string>
-    <string name="abc_capital_off" msgid="121134116657445385">"IŠJUNGTI"</string>
+    <string name="abc_capital_off" msgid="121134116657445385">"IŠJUNGTA"</string>
 </resources>

v7/appcompat/res/values-my-rMM/strings.xml

diff --git a/v7/appcompat/res/values-my-rMM/strings.xml b/v7/appcompat/res/values-my-rMM/strings.xml
index f8690aa..4597cac 100644
--- a/v7/appcompat/res/values-my-rMM/strings.xml
+++ b/v7/appcompat/res/values-my-rMM/strings.xml
@@ -29,7 +29,7 @@
     <string name="abc_searchview_description_clear" msgid="3691816814315814921">"ရှာစရာ အချက်အလက်များ ရှင်းလင်းရန်"</string>
     <string name="abc_searchview_description_submit" msgid="8928215447528550784">"ရှာဖွေစရာ အချက်အလက်ကို အတည်ပြုရန်"</string>
     <string name="abc_searchview_description_voice" msgid="893419373245838918">"အသံဖြင့် ရှာဖွေခြင်း"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"အပလီကေးရှင်း တစ်ခုခုကို ရွေးချယ်ပါ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"အက်ပ် တစ်ခုခုကို ရွေးချယ်ပါ"</string>
     <string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"အားလုံးကို ကြည့်ရန်"</string>
     <string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"%s ကို မျှဝေပါရန်"</string>
     <string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"မျှဝေဖို့ ရွေးပါ"</string>

v7/appcompat/src/android/support/v7/app/AlertDialog.java

diff --git a/v7/appcompat/src/android/support/v7/app/AlertDialog.java b/v7/appcompat/src/android/support/v7/app/AlertDialog.java
index 78a1f50..5c0a1d7 100644
--- a/v7/appcompat/src/android/support/v7/app/AlertDialog.java
+++ b/v7/appcompat/src/android/support/v7/app/AlertDialog.java
@@ -26,7 +26,10 @@
 import android.support.annotation.ArrayRes;
 import android.support.annotation.AttrRes;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
+import android.support.annotation.StyleRes;
 import android.support.v7.appcompat.R;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
@@ -66,7 +69,7 @@
  */
 public class AlertDialog extends AppCompatDialog implements DialogInterface {
 
-    private AlertController mAlert;
+    private final AlertController mAlert;
 
     /**
      * No layout hint.
@@ -78,33 +81,29 @@
      */
     static final int LAYOUT_HINT_SIDE = 1;
 
-    protected AlertDialog(Context context) {
-        this(context, resolveDialogTheme(context, 0), true);
+    protected AlertDialog(@NonNull Context context) {
+        this(context, 0);
     }
 
     /**
      * Construct an AlertDialog that uses an explicit theme.  The actual style
      * that an AlertDialog uses is a private implementation, however you can
      * here supply either the name of an attribute in the theme from which
-     * to get the dialog's style (such as {@link android.R.attr#alertDialogTheme}.
+     * to get the dialog's style (such as {@link R.attr#alertDialogTheme}.
      */
-    protected AlertDialog(Context context, int theme) {
-        this(context, theme, true);
-    }
-
-    AlertDialog(Context context, int theme, boolean createThemeContextWrapper) {
-        super(context, resolveDialogTheme(context, theme));
+    protected AlertDialog(@NonNull Context context, @StyleRes int themeResId) {
+        super(context, resolveDialogTheme(context, themeResId));
         mAlert = new AlertController(getContext(), this, getWindow());
     }
 
-    protected AlertDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
-        super(context, resolveDialogTheme(context, 0));
+    protected AlertDialog(@NonNull Context context, boolean cancelable,
+            @Nullable OnCancelListener cancelListener) {
+        this(context, 0);
         setCancelable(cancelable);
         setOnCancelListener(cancelListener);
-        mAlert = new AlertController(context, this, getWindow());
     }
 
-    static int resolveDialogTheme(Context context, int resid) {
+    private static int resolveDialogTheme(@NonNull Context context, @StyleRes int resid) {
         if (resid >= 0x01000000) {   // start of real resource IDs.
             return resid;
         } else {
@@ -276,6 +275,7 @@
 
     public static class Builder {
         private final AlertController.AlertParams P;
+        private final int mTheme;
 
         /**
          * Creates a builder for an alert dialog that uses the default alert
@@ -287,7 +287,7 @@
          *
          * @param context the parent context
          */
-        public Builder(Context context) {
+        public Builder(@NonNull Context context) {
             this(context, resolveDialogTheme(context, 0));
         }
 
@@ -317,9 +317,10 @@
          *                   this dialog, or {@code 0} to use the parent
          *                   {@code context}'s default alert dialog theme
          */
-        public Builder(Context context, int themeResId) {
+        public Builder(@NonNull Context context, @StyleRes int themeResId) {
             P = new AlertController.AlertParams(new ContextThemeWrapper(
                     context, resolveDialogTheme(context, themeResId)));
+            mTheme = themeResId;
         }
 
         /**
@@ -330,6 +331,7 @@
          *
          * @return A Context for built Dialogs.
          */
+        @NonNull
         public Context getContext() {
             return P.mContext;
         }
@@ -873,6 +875,7 @@
          * be able to put padding around the view.
          * @hide
          */
+        @Deprecated
         public Builder setView(View view, int viewSpacingLeft, int viewSpacingTop,
                 int viewSpacingRight, int viewSpacingBottom) {
             P.mView = view;
@@ -919,8 +922,9 @@
          * create and display the dialog.
          */
         public AlertDialog create() {
-            // Context has already been wrapped with the appropriate theme.
-            final AlertDialog dialog = new AlertDialog(P.mContext, 0, false);
+            // We can't use Dialog's 3-arg constructor with the createThemeContextWrapper param,
+            // so we always have to re-set the theme
+            final AlertDialog dialog = new AlertDialog(P.mContext, mTheme);
             P.apply(dialog.mAlert);
             dialog.setCancelable(P.mCancelable);
             if (P.mCancelable) {

v7/appcompat/tests/src/android/support/v7/app/AlertDialogTest.java

diff --git a/v7/appcompat/tests/src/android/support/v7/app/AlertDialogTest.java b/v7/appcompat/tests/src/android/support/v7/app/AlertDialogTest.java
index 213a898..6a9d8c1 100644
--- a/v7/appcompat/tests/src/android/support/v7/app/AlertDialogTest.java
+++ b/v7/appcompat/tests/src/android/support/v7/app/AlertDialogTest.java
@@ -23,6 +23,7 @@
 import android.support.annotation.ColorInt;
 import android.support.annotation.StringRes;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.ViewInteraction;
 import android.support.v7.appcompat.test.R;
@@ -30,6 +31,7 @@
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -101,6 +103,21 @@
 
     @Test
     @SmallTest
+    @UiThreadTest
+    public void testBuilderTheme() {
+        final Context context = mActivityTestRule.getActivity();
+        final AlertDialog dialog = new AlertDialog.Builder(context, R.style.Theme_TextColors)
+                .setTitle(R.string.alert_dialog_title)
+                .setMessage(R.string.alert_dialog_content)
+                .create();
+
+        final TypedValue tv = new TypedValue();
+        dialog.getContext().getTheme().resolveAttribute(android.R.attr.textColorPrimary, tv, true);
+        assertEquals(0xFF0000FF, tv.data);
+    }
+
+    @Test
+    @SmallTest
     public void testBasicContent() {
         final Context context = mActivityTestRule.getActivity();
         AlertDialog.Builder builder = new AlertDialog.Builder(context)

v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png b/v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png
deleted file mode 100644
index 84c5a11..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png b/v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png
deleted file mode 100644
index 7fc993d..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png b/v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png
deleted file mode 100644
index 36adcd0..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_dark.png

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
new file mode 100644
index 0000000..d3dc80a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_light.png

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
new file mode 100644
index 0000000..ab54e17
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_00_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_dark.png

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
new file mode 100644
index 0000000..11984e7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_light.png

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
new file mode 100644
index 0000000..e4a7dd2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_01_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_dark.png

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
new file mode 100644
index 0000000..3c79c94
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_light.png

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
new file mode 100644
index 0000000..8f9d7e2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_02_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_dark.png

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
new file mode 100644
index 0000000..ad15549
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_light.png

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
new file mode 100644
index 0000000..b1486a8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_03_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_dark.png

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
new file mode 100644
index 0000000..f795413
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_light.png

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
new file mode 100644
index 0000000..07da2f6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_04_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_dark.png

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
new file mode 100644
index 0000000..0f37592
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_light.png

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
new file mode 100644
index 0000000..d384adc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_05_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_dark.png

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
new file mode 100644
index 0000000..df637c9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_light.png

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
new file mode 100644
index 0000000..30ba6f4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_06_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_dark.png

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
new file mode 100644
index 0000000..4815d29
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_light.png

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
new file mode 100644
index 0000000..83d8758
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_07_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_dark.png

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
new file mode 100644
index 0000000..dccaba1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_light.png

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
new file mode 100644
index 0000000..d332a9c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_08_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_dark.png

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
new file mode 100644
index 0000000..c738201
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_light.png

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
new file mode 100644
index 0000000..9f87111
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_09_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_dark.png

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
new file mode 100644
index 0000000..2bd60ab
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_light.png

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
new file mode 100644
index 0000000..9e28ebc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_10_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_dark.png

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
new file mode 100644
index 0000000..6d410d0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_light.png

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
new file mode 100644
index 0000000..345370d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_11_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_dark.png

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
new file mode 100644
index 0000000..e55c3aa
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_light.png

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
new file mode 100644
index 0000000..2f7a392
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_12_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_dark.png

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
new file mode 100644
index 0000000..0912127
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_light.png

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
new file mode 100644
index 0000000..60f223e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_13_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_dark.png

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
new file mode 100644
index 0000000..00a222e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_light.png

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
new file mode 100644
index 0000000..9357a0b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_14_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_dark.png

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
new file mode 100644
index 0000000..d6622d0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_light.png

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
new file mode 100644
index 0000000..28b7ac6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_15_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_dark.png

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
new file mode 100644
index 0000000..cd21fc3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_light.png

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
new file mode 100644
index 0000000..96031aa
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_16_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_dark.png

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
new file mode 100644
index 0000000..6151a79
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_light.png

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
new file mode 100644
index 0000000..cb56957
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_17_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_dark.png

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
new file mode 100644
index 0000000..cfcac2d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_light.png

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
new file mode 100644
index 0000000..bce0de2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_18_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_dark.png

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
new file mode 100644
index 0000000..cd4db3d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_light.png

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
new file mode 100644
index 0000000..caa5cc3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_19_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_dark.png

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
new file mode 100644
index 0000000..ee692b2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_light.png

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
new file mode 100644
index 0000000..2aba1b8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_20_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_dark.png

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
new file mode 100644
index 0000000..4984d26
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_light.png

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
new file mode 100644
index 0000000..748a3f5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_21_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_dark.png

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
new file mode 100644
index 0000000..e9f2c3c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_light.png

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
new file mode 100644
index 0000000..5601bd0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_connecting_22_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_dark.png

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
new file mode 100644
index 0000000..f33c9ac
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_light.png

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
new file mode 100644
index 0000000..0c6dca9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_00_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_dark.png

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
new file mode 100644
index 0000000..e1aa156
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_light.png

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
new file mode 100644
index 0000000..343808a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_01_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_dark.png

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
new file mode 100644
index 0000000..440cbef
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_light.png

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
new file mode 100644
index 0000000..1935743
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_02_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_dark.png

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
new file mode 100644
index 0000000..e9d0814
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_light.png

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
new file mode 100644
index 0000000..28e20ea
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_03_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_dark.png

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
new file mode 100644
index 0000000..ba41fd2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_light.png

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
new file mode 100644
index 0000000..ce4662c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_04_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_dark.png

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
new file mode 100644
index 0000000..acae734
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_light.png

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
new file mode 100644
index 0000000..4acd976
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_05_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_dark.png

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
new file mode 100644
index 0000000..1e2fda6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_light.png

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
new file mode 100644
index 0000000..eb9e848
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_06_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_dark.png

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
new file mode 100644
index 0000000..5403f97
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_light.png

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
new file mode 100644
index 0000000..85d6633
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_07_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_dark.png

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
new file mode 100644
index 0000000..5ebcdbc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_light.png

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
new file mode 100644
index 0000000..63a7d95
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_08_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_dark.png

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
new file mode 100644
index 0000000..c6d9358
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_light.png

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
new file mode 100644
index 0000000..801086e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_09_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png
deleted file mode 100644
index ac699cf..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_dark.png

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
new file mode 100644
index 0000000..33ff2b8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_light.png

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
new file mode 100644
index 0000000..639dd32
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_10_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_dark.png

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
new file mode 100644
index 0000000..86c7f1d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_light.png

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
new file mode 100644
index 0000000..a363c5f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_11_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_dark.png

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
new file mode 100644
index 0000000..88d87dd
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_light.png

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
new file mode 100644
index 0000000..48b68b4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_12_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_dark.png

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
new file mode 100644
index 0000000..80b004b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_light.png

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
new file mode 100644
index 0000000..e326b47
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_13_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_dark.png

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
new file mode 100644
index 0000000..6f85f52
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_light.png

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
new file mode 100644
index 0000000..a0202fe
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_14_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_dark.png

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
new file mode 100644
index 0000000..2d470d6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_light.png

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
new file mode 100644
index 0000000..f2f8973
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_15_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_dark.png

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
new file mode 100644
index 0000000..12fc467
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_light.png

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
new file mode 100644
index 0000000..284a67c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_16_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_dark.png

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
new file mode 100644
index 0000000..83b5a1e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_light.png

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
new file mode 100644
index 0000000..e85ecac
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_17_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_dark.png

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
new file mode 100644
index 0000000..4564484
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_light.png

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
new file mode 100644
index 0000000..0c82374
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_18_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_dark.png

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
new file mode 100644
index 0000000..f1a8a80
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_light.png

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
new file mode 100644
index 0000000..5a65260
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_19_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png
deleted file mode 100644
index 372ab35..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_dark.png

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
new file mode 100644
index 0000000..4aba31d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_light.png

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
new file mode 100644
index 0000000..0a2666e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_20_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_dark.png

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
new file mode 100644
index 0000000..da3c257
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_light.png

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
new file mode 100644
index 0000000..57c77e3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_21_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_dark.png

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
new file mode 100644
index 0000000..21aea95
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_light.png

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
new file mode 100644
index 0000000..e920b96
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_22_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png
deleted file mode 100644
index 3261626..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_light.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_cast_on_light.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_light.png
similarity index 100%
rename from v7/mediarouter/res/drawable-hdpi/ic_cast_on_light.png
rename to v7/mediarouter/res/drawable-hdpi/ic_media_route_on_light.png
Binary files differ

v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png
deleted file mode 100644
index 9fbc9b0..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png b/v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png
deleted file mode 100644
index 3029695..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png b/v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png
deleted file mode 100644
index 868c7f4..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png b/v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png
deleted file mode 100644
index 269ee8e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_dark.png

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
new file mode 100644
index 0000000..d087884
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_light.png

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
new file mode 100644
index 0000000..b10f4ce
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_00_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_dark.png

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
new file mode 100644
index 0000000..af63e07
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_light.png

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
new file mode 100644
index 0000000..a799a0c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_01_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_dark.png

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
new file mode 100644
index 0000000..ed9816b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_light.png

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
new file mode 100644
index 0000000..76299fb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_02_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_dark.png

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
new file mode 100644
index 0000000..ae64fc2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_light.png

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
new file mode 100644
index 0000000..c624824
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_03_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_dark.png

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
new file mode 100644
index 0000000..e91e52c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_light.png

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
new file mode 100644
index 0000000..296be3c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_04_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_dark.png

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
new file mode 100644
index 0000000..c25182c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_light.png

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
new file mode 100644
index 0000000..9f92507
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_05_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_dark.png

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
new file mode 100644
index 0000000..83cbee1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_light.png

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
new file mode 100644
index 0000000..4de75d7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_06_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_dark.png

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
new file mode 100644
index 0000000..b4d995a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_light.png

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
new file mode 100644
index 0000000..2a5de02
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_07_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_dark.png

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
new file mode 100644
index 0000000..4a9a300
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_light.png

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
new file mode 100644
index 0000000..11b5c3b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_08_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_dark.png

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
new file mode 100644
index 0000000..2b238b0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_light.png

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
new file mode 100644
index 0000000..77f82d8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_09_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_dark.png

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
new file mode 100644
index 0000000..edbbc02
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_light.png

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
new file mode 100644
index 0000000..735c564
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_10_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_dark.png

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
new file mode 100644
index 0000000..fc9d8e5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_light.png

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
new file mode 100644
index 0000000..b6c7e8a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_11_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_dark.png

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
new file mode 100644
index 0000000..1e3cf93
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_light.png

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
new file mode 100644
index 0000000..fe56c75
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_12_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_dark.png

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
new file mode 100644
index 0000000..9ccb10a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_light.png

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
new file mode 100644
index 0000000..312c0cb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_13_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_dark.png

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
new file mode 100644
index 0000000..d1c7a93
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_light.png

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
new file mode 100644
index 0000000..23c7457
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_14_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_dark.png

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
new file mode 100644
index 0000000..c566c1a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_light.png

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
new file mode 100644
index 0000000..8aaaabb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_15_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_dark.png

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
new file mode 100644
index 0000000..c79901e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_light.png

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
new file mode 100644
index 0000000..faeee27
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_16_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_dark.png

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
new file mode 100644
index 0000000..4c0168e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_light.png

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
new file mode 100644
index 0000000..c905fd1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_17_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_dark.png

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
new file mode 100644
index 0000000..cdbe967
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_light.png

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
new file mode 100644
index 0000000..a63beb2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_18_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_dark.png

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
new file mode 100644
index 0000000..a2e5d4e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_light.png

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
new file mode 100644
index 0000000..f0a31a7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_19_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_dark.png

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
new file mode 100644
index 0000000..e23cf40
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_light.png

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
new file mode 100644
index 0000000..564c167
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_20_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_dark.png

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
new file mode 100644
index 0000000..d49d1a8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_light.png

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
new file mode 100644
index 0000000..645145a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_21_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_dark.png

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
new file mode 100644
index 0000000..b2c9ef0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_light.png

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
new file mode 100644
index 0000000..1578c9e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_connecting_22_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_dark.png

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
new file mode 100644
index 0000000..883aef4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_light.png

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
new file mode 100644
index 0000000..a47e9a7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_00_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_dark.png

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
new file mode 100644
index 0000000..8b05ae3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_light.png

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
new file mode 100644
index 0000000..d8dbcc5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_01_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_dark.png

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
new file mode 100644
index 0000000..898f859
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_light.png

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
new file mode 100644
index 0000000..405f1c6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_02_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_dark.png

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
new file mode 100644
index 0000000..a850fe5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_light.png

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
new file mode 100644
index 0000000..f61484b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_03_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_dark.png

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
new file mode 100644
index 0000000..b68bead
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_light.png

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
new file mode 100644
index 0000000..93f50be
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_04_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_dark.png

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
new file mode 100644
index 0000000..e805614
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_light.png

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
new file mode 100644
index 0000000..2cbb915
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_05_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_dark.png

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
new file mode 100644
index 0000000..f611e71
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_light.png

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
new file mode 100644
index 0000000..0a66af9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_06_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_dark.png

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
new file mode 100644
index 0000000..aa011b1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_light.png

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
new file mode 100644
index 0000000..d9c3dff
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_07_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_dark.png

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
new file mode 100644
index 0000000..3594ee5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_light.png

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
new file mode 100644
index 0000000..1c524d8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_08_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_dark.png

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
new file mode 100644
index 0000000..1f2c004
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_light.png

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
new file mode 100644
index 0000000..7cf2bd0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_09_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png
deleted file mode 100644
index 5a9fea0..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_dark.png

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
new file mode 100644
index 0000000..e41184d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_light.png

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
new file mode 100644
index 0000000..9a56e23
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_10_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_dark.png

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
new file mode 100644
index 0000000..c0e7a08
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_light.png

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
new file mode 100644
index 0000000..d991612
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_11_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_dark.png

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
new file mode 100644
index 0000000..4069c8f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_light.png

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
new file mode 100644
index 0000000..fea3d15
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_12_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_dark.png

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
new file mode 100644
index 0000000..10a425c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_light.png

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
new file mode 100644
index 0000000..4594aab
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_13_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_dark.png

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
new file mode 100644
index 0000000..e16dc31
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_light.png

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
new file mode 100644
index 0000000..a45edd6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_14_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_dark.png

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
new file mode 100644
index 0000000..b6c69ba
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_light.png

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
new file mode 100644
index 0000000..b3834ea
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_15_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_dark.png

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
new file mode 100644
index 0000000..1b1fe86
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_light.png

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
new file mode 100644
index 0000000..04ffe76
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_16_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_dark.png

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
new file mode 100644
index 0000000..b9e98f9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_light.png

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
new file mode 100644
index 0000000..85d1a94
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_17_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_dark.png

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
new file mode 100644
index 0000000..040d1e0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_light.png

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
new file mode 100644
index 0000000..ab750bc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_18_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_dark.png

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
new file mode 100644
index 0000000..68f92f1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_light.png

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
new file mode 100644
index 0000000..6dba74a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_19_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png
deleted file mode 100644
index d8d0b7b..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_dark.png

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
new file mode 100644
index 0000000..af2346d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_light.png

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
new file mode 100644
index 0000000..e2d4e27
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_20_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_dark.png

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
new file mode 100644
index 0000000..e13a057
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_light.png

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
new file mode 100644
index 0000000..b1567c2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_21_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_dark.png

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
new file mode 100644
index 0000000..98d3a5e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_light.png

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
new file mode 100644
index 0000000..75ff3c3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_22_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png
deleted file mode 100644
index 83a1b69..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_light.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_cast_on_light.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_light.png
similarity index 100%
rename from v7/mediarouter/res/drawable-mdpi/ic_cast_on_light.png
rename to v7/mediarouter/res/drawable-mdpi/ic_media_route_on_light.png
Binary files differ

v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png
deleted file mode 100644
index 9f3d12e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png
deleted file mode 100644
index 2cf94ce..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png
deleted file mode 100644
index 0af22be..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png
deleted file mode 100644
index 9577e7b..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_dark.png

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
new file mode 100644
index 0000000..b0a34f6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_light.png

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
new file mode 100644
index 0000000..bae0b42
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_00_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_dark.png

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
new file mode 100644
index 0000000..4d8e2a1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_light.png

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
new file mode 100644
index 0000000..0d4dc81
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_01_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_dark.png

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
new file mode 100644
index 0000000..d55ef43
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_light.png

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
new file mode 100644
index 0000000..354a702
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_02_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_dark.png

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
new file mode 100644
index 0000000..86de1ae
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_light.png

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
new file mode 100644
index 0000000..f374fd1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_03_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_dark.png

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
new file mode 100644
index 0000000..6106d9a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_light.png

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
new file mode 100644
index 0000000..c2114ce
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_04_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_dark.png

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
new file mode 100644
index 0000000..b8589bc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_light.png

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
new file mode 100644
index 0000000..5d2e03a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_05_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_dark.png

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
new file mode 100644
index 0000000..c1c8d30
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_light.png

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
new file mode 100644
index 0000000..5df34dc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_06_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_dark.png

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
new file mode 100644
index 0000000..004860a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_light.png

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
new file mode 100644
index 0000000..d25e42f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_07_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_dark.png

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
new file mode 100644
index 0000000..37ea2d7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_light.png

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
new file mode 100644
index 0000000..cb34b0c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_08_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_dark.png

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
new file mode 100644
index 0000000..d90f767
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_light.png

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
new file mode 100644
index 0000000..f4f8fea
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_09_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_dark.png

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
new file mode 100644
index 0000000..d4bb447
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_light.png

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
new file mode 100644
index 0000000..eb36549
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_10_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_dark.png

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
new file mode 100644
index 0000000..898bc73
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_light.png

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
new file mode 100644
index 0000000..3336c22
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_11_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_dark.png

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
new file mode 100644
index 0000000..f3c335f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_light.png

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
new file mode 100644
index 0000000..1cc8e9c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_12_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_dark.png

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
new file mode 100644
index 0000000..27d6ce3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_light.png

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
new file mode 100644
index 0000000..0341aa3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_13_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_dark.png

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
new file mode 100644
index 0000000..b6ad4bc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_light.png

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
new file mode 100644
index 0000000..1268ed8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_14_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_dark.png

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
new file mode 100644
index 0000000..847658e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_light.png

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
new file mode 100644
index 0000000..197017c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_15_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_dark.png

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
new file mode 100644
index 0000000..3bfba88
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_light.png

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
new file mode 100644
index 0000000..64516c3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_16_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_dark.png

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
new file mode 100644
index 0000000..41810e6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_light.png

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
new file mode 100644
index 0000000..6388eab
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_17_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_dark.png

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
new file mode 100644
index 0000000..afddc85
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_light.png

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
new file mode 100644
index 0000000..6aef69b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_18_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_dark.png

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
new file mode 100644
index 0000000..1713a64
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_light.png

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
new file mode 100644
index 0000000..f83539f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_19_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_dark.png

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
new file mode 100644
index 0000000..d18bd20
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_light.png

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
new file mode 100644
index 0000000..806d8f0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_20_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_dark.png

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
new file mode 100644
index 0000000..5afc741
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_light.png

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
new file mode 100644
index 0000000..350b0a4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_21_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_dark.png

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
new file mode 100644
index 0000000..caa6ba4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_light.png

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
new file mode 100644
index 0000000..92e5937
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_connecting_22_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_dark.png

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
new file mode 100644
index 0000000..86dc6db
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_light.png

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
new file mode 100644
index 0000000..b5847d2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_00_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_dark.png

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
new file mode 100644
index 0000000..d58d0bb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_light.png

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
new file mode 100644
index 0000000..e950f3f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_01_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_dark.png

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
new file mode 100644
index 0000000..d2341ab
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_light.png

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
new file mode 100644
index 0000000..514ab96
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_02_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_dark.png

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
new file mode 100644
index 0000000..6c7d956
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_light.png

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
new file mode 100644
index 0000000..021c61e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_03_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_dark.png

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
new file mode 100644
index 0000000..3374644
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_light.png

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
new file mode 100644
index 0000000..f41c1d6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_04_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_dark.png

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
new file mode 100644
index 0000000..2dd3e4d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_light.png

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
new file mode 100644
index 0000000..ba8a40d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_05_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_dark.png

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
new file mode 100644
index 0000000..03bd9be
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_light.png

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
new file mode 100644
index 0000000..4982edf
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_06_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_dark.png

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
new file mode 100644
index 0000000..d78c86c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_light.png

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
new file mode 100644
index 0000000..504af84
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_07_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_dark.png

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
new file mode 100644
index 0000000..1cb6cc0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_light.png

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
new file mode 100644
index 0000000..bedaf2d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_08_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_dark.png

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
new file mode 100644
index 0000000..e1ac366
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_light.png

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
new file mode 100644
index 0000000..f210b6d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_09_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png
deleted file mode 100644
index 8690cf4..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_dark.png

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
new file mode 100644
index 0000000..71dd950
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_light.png

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
new file mode 100644
index 0000000..a1f387a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_10_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_dark.png

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
new file mode 100644
index 0000000..e190e33
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_light.png

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
new file mode 100644
index 0000000..e7a2c68
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_11_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_dark.png

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
new file mode 100644
index 0000000..2c0dc55
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_light.png

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
new file mode 100644
index 0000000..de3131d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_12_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_dark.png

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
new file mode 100644
index 0000000..2934a6c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_light.png

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
new file mode 100644
index 0000000..1f65148
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_13_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_dark.png

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
new file mode 100644
index 0000000..b61db6b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_light.png

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
new file mode 100644
index 0000000..4b8758b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_14_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_dark.png

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
new file mode 100644
index 0000000..7d193aa
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_light.png

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
new file mode 100644
index 0000000..61642cc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_15_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_dark.png

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
new file mode 100644
index 0000000..5be5110
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_light.png

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
new file mode 100644
index 0000000..ae9f11d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_16_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_dark.png

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
new file mode 100644
index 0000000..b2993b9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_light.png

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
new file mode 100644
index 0000000..d54d867
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_17_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_dark.png

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
new file mode 100644
index 0000000..6c91068
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_light.png

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
new file mode 100644
index 0000000..ca5a89e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_18_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_dark.png

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
new file mode 100644
index 0000000..14fba92
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_light.png

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
new file mode 100644
index 0000000..1cb7cdc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_19_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png
deleted file mode 100644
index e3fd200..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_dark.png

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
new file mode 100644
index 0000000..7bd7b83
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_light.png

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
new file mode 100644
index 0000000..8cc8109
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_20_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_dark.png

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
new file mode 100644
index 0000000..eccdb95
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_light.png

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
new file mode 100644
index 0000000..9da4e0b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_21_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_dark.png

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
new file mode 100644
index 0000000..1a51ef5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_light.png

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
new file mode 100644
index 0000000..d9f3f43
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_22_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png
deleted file mode 100644
index 6cb970c..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png
similarity index 100%
rename from v7/mediarouter/res/drawable-xhdpi/ic_cast_on_light.png
rename to v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_light.png
Binary files differ

v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png
deleted file mode 100644
index 8290b98..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png
deleted file mode 100644
index ef5039c..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png
deleted file mode 100644
index 8cd82da..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png
deleted file mode 100644
index d25288d..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_dark.png

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
new file mode 100644
index 0000000..4adfb9f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_light.png

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
new file mode 100644
index 0000000..ae0770f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_00_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_dark.png

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
new file mode 100644
index 0000000..9dcdb32
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_light.png

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
new file mode 100644
index 0000000..51d8eb8
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_01_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_dark.png

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
new file mode 100644
index 0000000..6530c29
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_light.png

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
new file mode 100644
index 0000000..00e145f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_02_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_dark.png

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
new file mode 100644
index 0000000..2e1e374
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_light.png

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
new file mode 100644
index 0000000..5ae66cf
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_03_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_dark.png

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
new file mode 100644
index 0000000..f0a5c64
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_light.png

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
new file mode 100644
index 0000000..82811dc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_04_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_dark.png

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
new file mode 100644
index 0000000..123e4dc
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_light.png

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
new file mode 100644
index 0000000..d589f5f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_05_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_dark.png

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
new file mode 100644
index 0000000..473ab36
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_light.png

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
new file mode 100644
index 0000000..8b1ec75
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_06_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_dark.png

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
new file mode 100644
index 0000000..f04095f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_light.png

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
new file mode 100644
index 0000000..70edb33
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_07_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_dark.png

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
new file mode 100644
index 0000000..38768b3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_light.png

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
new file mode 100644
index 0000000..9122174
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_08_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_dark.png

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
new file mode 100644
index 0000000..687d224
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_light.png

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
new file mode 100644
index 0000000..e860d18
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_09_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_dark.png

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
new file mode 100644
index 0000000..dc16761
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_light.png

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
new file mode 100644
index 0000000..63121aa
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_10_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_dark.png

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
new file mode 100644
index 0000000..99716f0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_light.png

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
new file mode 100644
index 0000000..418a0c3
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_11_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_dark.png

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
new file mode 100644
index 0000000..c96b35c
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_light.png

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
new file mode 100644
index 0000000..ff3da39
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_12_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_dark.png

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
new file mode 100644
index 0000000..f9235a4
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_light.png

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
new file mode 100644
index 0000000..8aa1b50
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_13_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_dark.png

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
new file mode 100644
index 0000000..70e8489
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_light.png

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
new file mode 100644
index 0000000..e46efdf
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_14_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_dark.png

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
new file mode 100644
index 0000000..82a1fec
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_light.png

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
new file mode 100644
index 0000000..f8a3229
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_15_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_dark.png

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
new file mode 100644
index 0000000..d7acac0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_light.png

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
new file mode 100644
index 0000000..8021b77
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_16_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_dark.png

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
new file mode 100644
index 0000000..437bd0d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_light.png

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
new file mode 100644
index 0000000..6f95113
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_17_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_dark.png

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
new file mode 100644
index 0000000..b12e965
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_light.png

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
new file mode 100644
index 0000000..7711297
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_18_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_dark.png

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
new file mode 100644
index 0000000..54bfa19
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_light.png

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
new file mode 100644
index 0000000..366bd83
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_19_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_dark.png

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
new file mode 100644
index 0000000..8af8eca
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_light.png

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
new file mode 100644
index 0000000..668d90a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_20_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_dark.png

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
new file mode 100644
index 0000000..ef2b541
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_light.png

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
new file mode 100644
index 0000000..5fa1e69
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_21_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_dark.png

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
new file mode 100644
index 0000000..2f8ebef
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_light.png

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
new file mode 100644
index 0000000..5da4070
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_connecting_22_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_dark.png

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
new file mode 100644
index 0000000..8500685
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_light.png

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
new file mode 100644
index 0000000..98fc370
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_00_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_dark.png

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
new file mode 100644
index 0000000..0a90238
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_light.png

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
new file mode 100644
index 0000000..79be598
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_01_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_dark.png

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
new file mode 100644
index 0000000..3754643
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_light.png

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
new file mode 100644
index 0000000..2b1dead
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_02_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_dark.png

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
new file mode 100644
index 0000000..bc684d6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_light.png

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
new file mode 100644
index 0000000..ee16f3d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_03_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_dark.png

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
new file mode 100644
index 0000000..d85fe45
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_light.png

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
new file mode 100644
index 0000000..d73d55f
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_04_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_dark.png

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
new file mode 100644
index 0000000..5b954e2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_light.png

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
new file mode 100644
index 0000000..c5fbe4d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_05_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_dark.png

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
new file mode 100644
index 0000000..679c094
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_light.png

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
new file mode 100644
index 0000000..29c6ed0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_06_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_dark.png

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
new file mode 100644
index 0000000..f5b9b84
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_light.png

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
new file mode 100644
index 0000000..3df6a15
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_07_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_dark.png

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
new file mode 100644
index 0000000..caf32c6
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_light.png

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
new file mode 100644
index 0000000..64897f1
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_08_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_dark.png

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
new file mode 100644
index 0000000..bb31d59
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_light.png

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
new file mode 100644
index 0000000..bd29373
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_09_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png
deleted file mode 100644
index 23d8ba8..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_dark.png

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
new file mode 100644
index 0000000..944a5e0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_light.png

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
new file mode 100644
index 0000000..2872fcb
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_10_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_dark.png

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
new file mode 100644
index 0000000..350a6ef
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_light.png

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
new file mode 100644
index 0000000..074e939
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_11_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_dark.png

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
new file mode 100644
index 0000000..cadce32
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_light.png

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
new file mode 100644
index 0000000..27396fd
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_12_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_dark.png

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
new file mode 100644
index 0000000..dfe5fc7
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_light.png

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
new file mode 100644
index 0000000..538e4de
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_13_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_dark.png

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
new file mode 100644
index 0000000..831e514
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_light.png

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
new file mode 100644
index 0000000..16dd579
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_14_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_dark.png

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
new file mode 100644
index 0000000..cd4ce9b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_light.png

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
new file mode 100644
index 0000000..fd450e2
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_15_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_dark.png

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
new file mode 100644
index 0000000..5b9f16b
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_light.png

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
new file mode 100644
index 0000000..cc45b86
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_16_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_dark.png

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
new file mode 100644
index 0000000..c8442c9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_light.png

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
new file mode 100644
index 0000000..c9de27a
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_17_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_dark.png

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
new file mode 100644
index 0000000..36e164d
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_light.png

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
new file mode 100644
index 0000000..e9d6a34
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_18_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_dark.png

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
new file mode 100644
index 0000000..08052bf
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_light.png

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
new file mode 100644
index 0000000..5a39372
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_19_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png
deleted file mode 100644
index 4c0f0e0..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_dark.png

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
new file mode 100644
index 0000000..f9b0e07
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_light.png

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
new file mode 100644
index 0000000..3a13705
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_20_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_dark.png

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
new file mode 100644
index 0000000..f051b45
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_light.png

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
new file mode 100644
index 0000000..51e1299
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_21_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_dark.png

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
new file mode 100644
index 0000000..63cc2ad
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_dark.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_light.png

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
new file mode 100644
index 0000000..aebdf75
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_22_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png
deleted file mode 100644
index ecfe346..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png
similarity index 100%
rename from v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_light.png
rename to v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_light.png
Binary files differ

v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png

diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png
deleted file mode 100644
index 8e47095..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png
+++ /dev/null
Binary files differ

v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml

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_mono_dark.xml
index 2d593c3..f1c1b38 100644
--- a/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
@@ -17,8 +17,27 @@
 <animation-list
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:oneshot="false">
-    <item android:drawable="@drawable/ic_media_route_on_0_mono_dark" android:duration="500" />
-    <item android:drawable="@drawable/ic_media_route_on_1_mono_dark" android:duration="500" />
-    <item android:drawable="@drawable/ic_media_route_on_2_mono_dark" android:duration="500" />
-    <item android:drawable="@drawable/ic_media_route_on_1_mono_dark" android:duration="500" />
+    <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" />
 </animation-list>

v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_light.xml

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
index d495d99..e387276 100644
--- 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
@@ -17,8 +17,27 @@
 <animation-list
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:oneshot="false">
-    <item android:drawable="@drawable/ic_cast_on_0_light" android:duration="500" />
-    <item android:drawable="@drawable/ic_cast_on_1_light" android:duration="500" />
-    <item android:drawable="@drawable/ic_cast_on_2_light" android:duration="500" />
-    <item android:drawable="@drawable/ic_cast_on_1_light" android:duration="500" />
+    <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>

v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml

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 6ae3b0b..abf4634 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,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:state_enabled="true"
-            android:drawable="@drawable/ic_media_route_on_mono_dark" />
+            android:drawable="@drawable/mr_ic_media_route_on_mono_dark" />
     <item android:state_checkable="true" android:state_enabled="true"
             android:drawable="@drawable/mr_ic_media_route_connecting_mono_dark" />
     <item android:state_enabled="true"

v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.xml

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 a8cf6c8..2512b66 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,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:state_enabled="true"
-            android:drawable="@drawable/ic_cast_on_light" />
+            android:drawable="@drawable/mr_ic_media_route_on_mono_light" />
     <item android:state_checkable="true" android:state_enabled="true"
             android:drawable="@drawable/mr_ic_media_route_connecting_mono_light" />
     <item android:state_enabled="true"

v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_dark.xml

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
new file mode 100644
index 0000000..de183a3
--- /dev/null
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_dark.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_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>

v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_light.xml

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
new file mode 100644
index 0000000..2d4775b
--- /dev/null
+++ b/v7/mediarouter/res/drawable/mr_ic_media_route_on_mono_light.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_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>

v7/mediarouter/res/values-ky-rKG/strings.xml

diff --git a/v7/mediarouter/res/values-ky-rKG/strings.xml b/v7/mediarouter/res/values-ky-rKG/strings.xml
index 04a307c..99201dc 100644
--- a/v7/mediarouter/res/values-ky-rKG/strings.xml
+++ b/v7/mediarouter/res/values-ky-rKG/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="5441529851481176817">"Систем"</string>
+    <string name="mr_system_route_name" msgid="5441529851481176817">"Тутум"</string>
     <string name="mr_user_route_category_name" msgid="7498112907524977311">"Түзмөктөр"</string>
     <string name="mr_button_content_description" msgid="3698378085901466129">"Тышкы экранга чыгаруу баскычы"</string>
     <string name="mr_chooser_title" msgid="414301941546135990">"Төмөнкүгө чыгаруу"</string>

v7/mediarouter/res/values-ta-rIN/strings.xml

diff --git a/v7/mediarouter/res/values-ta-rIN/strings.xml b/v7/mediarouter/res/values-ta-rIN/strings.xml
index c394746..c314178 100644
--- a/v7/mediarouter/res/values-ta-rIN/strings.xml
+++ b/v7/mediarouter/res/values-ta-rIN/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="mr_system_route_name" msgid="5441529851481176817">"அமைப்பு"</string>
     <string name="mr_user_route_category_name" msgid="7498112907524977311">"சாதனங்கள்"</string>
-    <string name="mr_button_content_description" msgid="3698378085901466129">"அனுப்புதல் பொத்தான்"</string>
-    <string name="mr_chooser_title" msgid="414301941546135990">"இதற்கு அனுப்பு"</string>
+    <string name="mr_button_content_description" msgid="3698378085901466129">"திரையிடு பட்டன்"</string>
+    <string name="mr_chooser_title" msgid="414301941546135990">"இதில் திரையிடு"</string>
     <string name="mr_chooser_searching" msgid="6349900579507521956">"சாதனங்களைத் தேடுகிறது"</string>
     <string name="mr_controller_disconnect" msgid="1227264889412989580">"தொடர்பைத் துண்டி"</string>
     <string name="mr_controller_stop" msgid="4570331844078181931">"அனுப்புவதை நிறுத்து"</string>

v7/mediarouter/res/values/themes.xml

diff --git a/v7/mediarouter/res/values/themes.xml b/v7/mediarouter/res/values/themes.xml
index 009e5b7..cf1c303 100644
--- a/v7/mediarouter/res/values/themes.xml
+++ b/v7/mediarouter/res/values/themes.xml
@@ -23,7 +23,7 @@
         <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/ic_media_route_on_mono_dark</item>
+        <item name="mediaRouteOnDrawable">@drawable/mr_ic_media_route_on_mono_dark</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>
@@ -55,7 +55,7 @@
         <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/ic_cast_on_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>

v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java

diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
index 766ec16..da5c194 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
@@ -508,7 +508,7 @@
 
             if (needsRefresh) {
                 refreshDrawableState();
-                if (mIsConnecting && mRemoteIndicator.getCurrent() instanceof AnimationDrawable) {
+                if (mRemoteIndicator.getCurrent() instanceof AnimationDrawable) {
                     AnimationDrawable curDrawable =
                             (AnimationDrawable) mRemoteIndicator.getCurrent();
                     if (!curDrawable.isRunning()) {

v7/recyclerview/src/android/support/v7/widget/RecyclerView.java

diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index f242f5b..e7bff81 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -277,7 +277,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:
@@ -2132,6 +2132,7 @@
                 needsFocusFailureLayout = found == null;
             }
             if (needsFocusFailureLayout) {
+                consumePendingUpdateOperations();
                 eatRequestLayout();
                 mLayout.onFocusSearchFailed(focused, direction, mRecycler, mState);
                 resumeRequestLayout(false);
@@ -2140,6 +2141,7 @@
         } else {
             result = ff.findNextFocus(this, focused, direction);
             if (result == null && canRunFocusFailure) {
+                consumePendingUpdateOperations();
                 eatRequestLayout();
                 result = mLayout.onFocusSearchFailed(focused, direction, mRecycler, mState);
                 resumeRequestLayout(false);
@@ -5181,9 +5183,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);

v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewLayoutTest.java

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);

v8/renderscript/rs_support/Android.mk

diff --git a/v8/renderscript/rs_support/Android.mk b/v8/renderscript/rs_support/Android.mk
index dbac81c..de8fae0 100644
--- a/v8/renderscript/rs_support/Android.mk
+++ b/v8/renderscript/rs_support/Android.mk
@@ -142,18 +142,34 @@
 ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
 LOCAL_CFLAGS_arm := -DARCH_ARM_HAVE_VFP -DARCH_ARM_USE_INTRINSICS
 LOCAL_ASFLAGS_arm := -mfpu=neon
-# Clang does not support nested .irp in *_Blur.S
-LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
 LOCAL_SRC_FILES_arm := \
-        cpu_ref/rsCpuIntrinsics_neon_3DLUT.S \
-	cpu_ref/rsCpuIntrinsics_neon_ColorMatrix.S \
-        cpu_ref/rsCpuIntrinsics_neon_Blend.S \
-        cpu_ref/rsCpuIntrinsics_neon_Blur.S \
-	cpu_ref/rsCpuIntrinsics_neon_Convolve.S \
-	cpu_ref/rsCpuIntrinsics_neon_Resize.S \
-        cpu_ref/rsCpuIntrinsics_neon_YuvToRGB.S
+    cpu_ref/rsCpuIntrinsics_neon_3DLUT.S \
+    cpu_ref/rsCpuIntrinsics_neon_Blend.S \
+    cpu_ref/rsCpuIntrinsics_neon_Blur.S \
+    cpu_ref/rsCpuIntrinsics_neon_ColorMatrix.S \
+    cpu_ref/rsCpuIntrinsics_neon_Convolve.S \
+    cpu_ref/rsCpuIntrinsics_neon_Resize.S \
+    cpu_ref/rsCpuIntrinsics_neon_YuvToRGB.S
 endif
 
+LOCAL_CFLAGS_arm64 += \
+    -DARCH_ARM_USE_INTRINSICS \
+    -DARCH_ARM64_USE_INTRINSICS \
+    -DARCH_ARM64_HAVE_NEON
+LOCAL_SRC_FILES_arm64 += \
+    cpu_ref/rsCpuIntrinsics_advsimd_3DLUT.S \
+    cpu_ref/rsCpuIntrinsics_advsimd_Blend.S \
+    cpu_ref/rsCpuIntrinsics_advsimd_Blur.S \
+    cpu_ref/rsCpuIntrinsics_advsimd_ColorMatrix.S \
+    cpu_ref/rsCpuIntrinsics_advsimd_Convolve.S \
+    cpu_ref/rsCpuIntrinsics_advsimd_Resize.S \
+    cpu_ref/rsCpuIntrinsics_advsimd_YuvToRGB.S
+
+LOCAL_CFLAGS_x86 += -DARCH_X86_HAVE_SSSE3
+LOCAL_SRC_FILES_x86 += cpu_ref/rsCpuIntrinsics_x86.cpp
+LOCAL_CFLAGS_x86_64 += -DARCH_X86_HAVE_SSSE3
+LOCAL_SRC_FILES_x86_64 += cpu_ref/rsCpuIntrinsics_x86.cpp
+
 LOCAL_REQUIRED_MODULES := libblasV8
 LOCAL_STATIC_LIBRARIES := libbnnmlowpV8
 LOCAL_LDFLAGS += -llog -ldl -Wl,--exclude-libs,libc++_static.a