commit 2f93cbdf078099dee48d666f95cc842e064974cb
author Mady Mellor <madym@google.com> Fri Mar 09 18:06:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 18:06:53 2018 +0000
tree a8d4e2411a840129b7f9acb87808a376d9fd9b95
parent a0275943c14222bfe846ffd59100c6ad9c3cb9a7
parent 09ec20c424ec3e546b10424a401c2343c2df205a

Merge "HeaderBuilder should have overloaded methods for loading" into pi-preview1-androidx-dev

cardview/api/current.txt

diff --git a/v7/cardview/api/current.txt b/cardview/api/current.txt
similarity index 100%
rename from v7/cardview/api/current.txt
rename to cardview/api/current.txt

cardview/api_legacy/26.0.0.txt

diff --git a/v7/cardview/api_legacy/26.0.0.txt b/cardview/api_legacy/26.0.0.txt
similarity index 100%
rename from v7/cardview/api_legacy/26.0.0.txt
rename to cardview/api_legacy/26.0.0.txt

cardview/api_legacy/26.1.0.txt

diff --git a/v7/cardview/api_legacy/26.1.0.txt b/cardview/api_legacy/26.1.0.txt
similarity index 100%
rename from v7/cardview/api_legacy/26.1.0.txt
rename to cardview/api_legacy/26.1.0.txt

cardview/api_legacy/27.0.0.txt

diff --git a/v7/cardview/api_legacy/27.0.0.txt b/cardview/api_legacy/27.0.0.txt
similarity index 100%
rename from v7/cardview/api_legacy/27.0.0.txt
rename to cardview/api_legacy/27.0.0.txt

cardview/api_legacy/27.1.0.txt

diff --git a/v7/cardview/api_legacy/27.1.0.txt b/cardview/api_legacy/27.1.0.txt
similarity index 100%
rename from v7/cardview/api_legacy/27.1.0.txt
rename to cardview/api_legacy/27.1.0.txt

cardview/api_legacy/28.0.0-alpha1.txt

diff --git a/v7/cardview/api_legacy/28.0.0-alpha1.txt b/cardview/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v7/cardview/api_legacy/28.0.0-alpha1.txt
rename to cardview/api_legacy/28.0.0-alpha1.txt

cardview/api_legacy/current.txt

diff --git a/v7/cardview/api_legacy/current.txt b/cardview/api_legacy/current.txt
similarity index 100%
rename from v7/cardview/api_legacy/current.txt
rename to cardview/api_legacy/current.txt

cardview/build.gradle

diff --git a/v7/cardview/build.gradle b/cardview/build.gradle
similarity index 100%
rename from v7/cardview/build.gradle
rename to cardview/build.gradle

cardview/res/values-v23/styles.xml

diff --git a/v7/cardview/res/values-v23/styles.xml b/cardview/res/values-v23/styles.xml
similarity index 100%
rename from v7/cardview/res/values-v23/styles.xml
rename to cardview/res/values-v23/styles.xml

cardview/res/values/attrs.xml

diff --git a/v7/cardview/res/values/attrs.xml b/cardview/res/values/attrs.xml
similarity index 100%
rename from v7/cardview/res/values/attrs.xml
rename to cardview/res/values/attrs.xml

cardview/res/values/colors.xml

diff --git a/v7/cardview/res/values/colors.xml b/cardview/res/values/colors.xml
similarity index 100%
rename from v7/cardview/res/values/colors.xml
rename to cardview/res/values/colors.xml

cardview/res/values/dimens.xml

diff --git a/v7/cardview/res/values/dimens.xml b/cardview/res/values/dimens.xml
similarity index 100%
rename from v7/cardview/res/values/dimens.xml
rename to cardview/res/values/dimens.xml

cardview/res/values/styles.xml

diff --git a/v7/cardview/res/values/styles.xml b/cardview/res/values/styles.xml
similarity index 100%
rename from v7/cardview/res/values/styles.xml
rename to cardview/res/values/styles.xml

cardview/src/main/AndroidManifest.xml

diff --git a/v7/cardview/src/main/AndroidManifest.xml b/cardview/src/main/AndroidManifest.xml
similarity index 100%
rename from v7/cardview/src/main/AndroidManifest.xml
rename to cardview/src/main/AndroidManifest.xml

cardview/src/main/java/androidx/cardview/widget/CardView.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/CardView.java b/cardview/src/main/java/androidx/cardview/widget/CardView.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/CardView.java
rename to cardview/src/main/java/androidx/cardview/widget/CardView.java

cardview/src/main/java/androidx/cardview/widget/CardViewApi17Impl.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/CardViewApi17Impl.java b/cardview/src/main/java/androidx/cardview/widget/CardViewApi17Impl.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/CardViewApi17Impl.java
rename to cardview/src/main/java/androidx/cardview/widget/CardViewApi17Impl.java

cardview/src/main/java/androidx/cardview/widget/CardViewApi21Impl.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/CardViewApi21Impl.java b/cardview/src/main/java/androidx/cardview/widget/CardViewApi21Impl.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/CardViewApi21Impl.java
rename to cardview/src/main/java/androidx/cardview/widget/CardViewApi21Impl.java

cardview/src/main/java/androidx/cardview/widget/CardViewBaseImpl.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/CardViewBaseImpl.java b/cardview/src/main/java/androidx/cardview/widget/CardViewBaseImpl.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/CardViewBaseImpl.java
rename to cardview/src/main/java/androidx/cardview/widget/CardViewBaseImpl.java

cardview/src/main/java/androidx/cardview/widget/CardViewDelegate.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/CardViewDelegate.java b/cardview/src/main/java/androidx/cardview/widget/CardViewDelegate.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/CardViewDelegate.java
rename to cardview/src/main/java/androidx/cardview/widget/CardViewDelegate.java

cardview/src/main/java/androidx/cardview/widget/CardViewImpl.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/CardViewImpl.java b/cardview/src/main/java/androidx/cardview/widget/CardViewImpl.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/CardViewImpl.java
rename to cardview/src/main/java/androidx/cardview/widget/CardViewImpl.java

cardview/src/main/java/androidx/cardview/widget/RoundRectDrawable.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/RoundRectDrawable.java b/cardview/src/main/java/androidx/cardview/widget/RoundRectDrawable.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/RoundRectDrawable.java
rename to cardview/src/main/java/androidx/cardview/widget/RoundRectDrawable.java

cardview/src/main/java/androidx/cardview/widget/RoundRectDrawableWithShadow.java

diff --git a/v7/cardview/src/main/java/androidx/cardview/widget/RoundRectDrawableWithShadow.java b/cardview/src/main/java/androidx/cardview/widget/RoundRectDrawableWithShadow.java
similarity index 100%
rename from v7/cardview/src/main/java/androidx/cardview/widget/RoundRectDrawableWithShadow.java
rename to cardview/src/main/java/androidx/cardview/widget/RoundRectDrawableWithShadow.java

collection/build.gradle

diff --git a/collections/build.gradle b/collection/build.gradle
similarity index 100%
rename from collections/build.gradle
rename to collection/build.gradle

collection/src/main/java/androidx/collection/ArrayMap.java

diff --git a/collections/src/main/java/androidx/collection/ArrayMap.java b/collection/src/main/java/androidx/collection/ArrayMap.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/ArrayMap.java
rename to collection/src/main/java/androidx/collection/ArrayMap.java

collection/src/main/java/androidx/collection/ArraySet.java

diff --git a/collections/src/main/java/androidx/collection/ArraySet.java b/collection/src/main/java/androidx/collection/ArraySet.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/ArraySet.java
rename to collection/src/main/java/androidx/collection/ArraySet.java

collection/src/main/java/androidx/collection/CircularArray.java

diff --git a/collections/src/main/java/androidx/collection/CircularArray.java b/collection/src/main/java/androidx/collection/CircularArray.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/CircularArray.java
rename to collection/src/main/java/androidx/collection/CircularArray.java

collection/src/main/java/androidx/collection/CircularIntArray.java

diff --git a/collections/src/main/java/androidx/collection/CircularIntArray.java b/collection/src/main/java/androidx/collection/CircularIntArray.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/CircularIntArray.java
rename to collection/src/main/java/androidx/collection/CircularIntArray.java

collection/src/main/java/androidx/collection/ContainerHelpers.java

diff --git a/collections/src/main/java/androidx/collection/ContainerHelpers.java b/collection/src/main/java/androidx/collection/ContainerHelpers.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/ContainerHelpers.java
rename to collection/src/main/java/androidx/collection/ContainerHelpers.java

collection/src/main/java/androidx/collection/LongSparseArray.java

diff --git a/collections/src/main/java/androidx/collection/LongSparseArray.java b/collection/src/main/java/androidx/collection/LongSparseArray.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/LongSparseArray.java
rename to collection/src/main/java/androidx/collection/LongSparseArray.java

collection/src/main/java/androidx/collection/LruCache.java

diff --git a/collections/src/main/java/androidx/collection/LruCache.java b/collection/src/main/java/androidx/collection/LruCache.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/LruCache.java
rename to collection/src/main/java/androidx/collection/LruCache.java

collection/src/main/java/androidx/collection/MapCollections.java

diff --git a/collections/src/main/java/androidx/collection/MapCollections.java b/collection/src/main/java/androidx/collection/MapCollections.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/MapCollections.java
rename to collection/src/main/java/androidx/collection/MapCollections.java

collection/src/main/java/androidx/collection/SimpleArrayMap.java

diff --git a/collections/src/main/java/androidx/collection/SimpleArrayMap.java b/collection/src/main/java/androidx/collection/SimpleArrayMap.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/SimpleArrayMap.java
rename to collection/src/main/java/androidx/collection/SimpleArrayMap.java

collection/src/main/java/androidx/collection/SparseArrayCompat.java

diff --git a/collections/src/main/java/androidx/collection/SparseArrayCompat.java b/collection/src/main/java/androidx/collection/SparseArrayCompat.java
similarity index 100%
rename from collections/src/main/java/androidx/collection/SparseArrayCompat.java
rename to collection/src/main/java/androidx/collection/SparseArrayCompat.java

collection/src/test/java/androidx/collection/ArrayMapCompatTest.java

diff --git a/collections/src/test/java/androidx/collection/ArrayMapCompatTest.java b/collection/src/test/java/androidx/collection/ArrayMapCompatTest.java
similarity index 100%
rename from collections/src/test/java/androidx/collection/ArrayMapCompatTest.java
rename to collection/src/test/java/androidx/collection/ArrayMapCompatTest.java

collection/src/test/java/androidx/collection/ArraySetCompatTest.java

diff --git a/collections/src/test/java/androidx/collection/ArraySetCompatTest.java b/collection/src/test/java/androidx/collection/ArraySetCompatTest.java
similarity index 100%
rename from collections/src/test/java/androidx/collection/ArraySetCompatTest.java
rename to collection/src/test/java/androidx/collection/ArraySetCompatTest.java

collection/src/test/java/androidx/collection/LongSparseArrayTest.java

diff --git a/collections/src/test/java/androidx/collection/LongSparseArrayTest.java b/collection/src/test/java/androidx/collection/LongSparseArrayTest.java
similarity index 100%
rename from collections/src/test/java/androidx/collection/LongSparseArrayTest.java
rename to collection/src/test/java/androidx/collection/LongSparseArrayTest.java

collection/src/test/java/androidx/collection/SimpleArrayMapTest.java

diff --git a/collections/src/test/java/androidx/collection/SimpleArrayMapTest.java b/collection/src/test/java/androidx/collection/SimpleArrayMapTest.java
similarity index 100%
rename from collections/src/test/java/androidx/collection/SimpleArrayMapTest.java
rename to collection/src/test/java/androidx/collection/SimpleArrayMapTest.java

collection/src/test/java/androidx/collection/SparseArrayCompatTest.java

diff --git a/collections/src/test/java/androidx/collection/SparseArrayCompatTest.java b/collection/src/test/java/androidx/collection/SparseArrayCompatTest.java
similarity index 100%
rename from collections/src/test/java/androidx/collection/SparseArrayCompatTest.java
rename to collection/src/test/java/androidx/collection/SparseArrayCompatTest.java

compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java

diff --git a/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java b/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
index d3705c0..d02557b 100644
--- a/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
@@ -16,6 +16,13 @@
 
 package androidx.core.app;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import static androidx.core.app.NotificationCompat.DEFAULT_ALL;
 import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS;
 import static androidx.core.app.NotificationCompat.DEFAULT_SOUND;
@@ -23,12 +30,6 @@
 import static androidx.core.app.NotificationCompat.GROUP_ALERT_ALL;
 import static androidx.core.app.NotificationCompat.GROUP_ALERT_CHILDREN;
 import static androidx.core.app.NotificationCompat.GROUP_ALERT_SUMMARY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 import android.app.Notification;
 import android.content.Context;
@@ -635,7 +636,10 @@
     }
 
     private static final NotificationCompat.Action TEST_INVISIBLE_ACTION =
-            new NotificationCompat.Action.Builder(0, "Test Title", null).build();
+            new NotificationCompat.Action.Builder(0, "Test Title", null)
+                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE)
+                    .setShowsUserInterface(false)
+                    .build();
 
     @Test
     @SdkSuppress(minSdkVersion = 21)
@@ -663,6 +667,10 @@
         NotificationCompat.Action resultAction = result.get(0);
         assertEquals(resultAction.getIcon(), TEST_INVISIBLE_ACTION.getIcon());
         assertEquals(resultAction.getTitle(), TEST_INVISIBLE_ACTION.getTitle());
+        assertEquals(
+                resultAction.getShowsUserInterface(),
+                TEST_INVISIBLE_ACTION.getShowsUserInterface());
+        assertEquals(resultAction.getSemanticAction(), TEST_INVISIBLE_ACTION.getSemanticAction());
     }
 
     private static RemoteInput newDataOnlyRemoteInput() {

compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java

diff --git a/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java b/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java
index e2e3cb0..c7b0160 100644
--- a/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java
+++ b/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java
@@ -20,7 +20,6 @@
 import android.app.PendingIntent;
 import android.os.Bundle;
 import android.os.Parcelable;
-import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -31,6 +30,8 @@
 import java.util.List;
 import java.util.Set;
 
+import androidx.annotation.RequiresApi;
+
 @RequiresApi(16)
 class NotificationCompatJellybean {
     public static final String TAG = "NotificationCompat";
@@ -51,6 +52,8 @@
     private static final String KEY_CHOICES = "choices";
     private static final String KEY_ALLOW_FREE_FORM_INPUT = "allowFreeFormInput";
     private static final String KEY_ALLOWED_DATA_TYPES = "allowedDataTypes";
+    private static final String KEY_SEMANTIC_ACTION = "semanticAction";
+    private static final String KEY_SHOWS_USER_INTERFACE = "showsUserInterface";
 
     private static final Object sExtrasLock = new Object();
     private static Field sExtrasField;
@@ -238,8 +241,8 @@
                 fromBundleArray(getBundleArrayFromBundle(bundle, KEY_REMOTE_INPUTS)),
                 fromBundleArray(getBundleArrayFromBundle(bundle, KEY_DATA_ONLY_REMOTE_INPUTS)),
                 allowGeneratedReplies,
-                NotificationCompat.Action.SEMANTIC_ACTION_NONE,
-                true);
+                bundle.getInt(KEY_SEMANTIC_ACTION),
+                bundle.getBoolean(KEY_SHOWS_USER_INTERFACE));
     }
 
     static Bundle getBundleForAction(NotificationCompat.Action action) {
@@ -257,6 +260,8 @@
                 action.getAllowGeneratedReplies());
         bundle.putBundle(KEY_EXTRAS, actionExtras);
         bundle.putParcelableArray(KEY_REMOTE_INPUTS, toBundleArray(action.getRemoteInputs()));
+        bundle.putBoolean(KEY_SHOWS_USER_INTERFACE, action.getShowsUserInterface());
+        bundle.putInt(KEY_SEMANTIC_ACTION, action.getSemanticAction());
         return bundle;
     }
 

gridlayout/api/current.txt

diff --git a/v7/gridlayout/api/current.txt b/gridlayout/api/current.txt
similarity index 100%
rename from v7/gridlayout/api/current.txt
rename to gridlayout/api/current.txt

gridlayout/api_legacy/26.0.0.txt

diff --git a/v7/gridlayout/api_legacy/26.0.0.txt b/gridlayout/api_legacy/26.0.0.txt
similarity index 100%
rename from v7/gridlayout/api_legacy/26.0.0.txt
rename to gridlayout/api_legacy/26.0.0.txt

gridlayout/api_legacy/26.1.0.txt

diff --git a/v7/gridlayout/api_legacy/26.1.0.txt b/gridlayout/api_legacy/26.1.0.txt
similarity index 100%
rename from v7/gridlayout/api_legacy/26.1.0.txt
rename to gridlayout/api_legacy/26.1.0.txt

gridlayout/api_legacy/27.0.0.ignore

diff --git a/v7/gridlayout/api_legacy/27.0.0.ignore b/gridlayout/api_legacy/27.0.0.ignore
similarity index 100%
rename from v7/gridlayout/api_legacy/27.0.0.ignore
rename to gridlayout/api_legacy/27.0.0.ignore

gridlayout/api_legacy/27.0.0.txt

diff --git a/v7/gridlayout/api_legacy/27.0.0.txt b/gridlayout/api_legacy/27.0.0.txt
similarity index 100%
rename from v7/gridlayout/api_legacy/27.0.0.txt
rename to gridlayout/api_legacy/27.0.0.txt

gridlayout/api_legacy/27.1.0.txt

diff --git a/v7/gridlayout/api_legacy/27.1.0.txt b/gridlayout/api_legacy/27.1.0.txt
similarity index 100%
rename from v7/gridlayout/api_legacy/27.1.0.txt
rename to gridlayout/api_legacy/27.1.0.txt

gridlayout/api_legacy/28.0.0-alpha1.txt

diff --git a/v7/gridlayout/api_legacy/28.0.0-alpha1.txt b/gridlayout/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v7/gridlayout/api_legacy/28.0.0-alpha1.txt
rename to gridlayout/api_legacy/28.0.0-alpha1.txt

gridlayout/api_legacy/current.txt

diff --git a/v7/gridlayout/api_legacy/current.txt b/gridlayout/api_legacy/current.txt
similarity index 100%
rename from v7/gridlayout/api_legacy/current.txt
rename to gridlayout/api_legacy/current.txt

gridlayout/build.gradle

diff --git a/v7/gridlayout/build.gradle b/gridlayout/build.gradle
similarity index 100%
rename from v7/gridlayout/build.gradle
rename to gridlayout/build.gradle

gridlayout/src/androidTest/AndroidManifest.xml

diff --git a/v7/gridlayout/src/androidTest/AndroidManifest.xml b/gridlayout/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from v7/gridlayout/src/androidTest/AndroidManifest.xml
rename to gridlayout/src/androidTest/AndroidManifest.xml

gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java

diff --git a/v7/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java b/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
similarity index 100%
rename from v7/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
rename to gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java

gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java

diff --git a/v7/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java b/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java
similarity index 100%
rename from v7/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java
rename to gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java

gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml

diff --git a/v7/gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml b/gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml
similarity index 100%
rename from v7/gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml
rename to gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml

gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml

diff --git a/v7/gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml b/gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml
similarity index 100%
rename from v7/gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml
rename to gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml

gridlayout/src/androidTest/res/layout/make_view_gone_test.xml

diff --git a/v7/gridlayout/src/androidTest/res/layout/make_view_gone_test.xml b/gridlayout/src/androidTest/res/layout/make_view_gone_test.xml
similarity index 100%
rename from v7/gridlayout/src/androidTest/res/layout/make_view_gone_test.xml
rename to gridlayout/src/androidTest/res/layout/make_view_gone_test.xml

gridlayout/src/androidTest/res/layout/use_default_margin_test.xml

diff --git a/v7/gridlayout/src/androidTest/res/layout/use_default_margin_test.xml b/gridlayout/src/androidTest/res/layout/use_default_margin_test.xml
similarity index 100%
rename from v7/gridlayout/src/androidTest/res/layout/use_default_margin_test.xml
rename to gridlayout/src/androidTest/res/layout/use_default_margin_test.xml

gridlayout/src/androidTest/res/values/colors.xml

diff --git a/v7/gridlayout/src/androidTest/res/values/colors.xml b/gridlayout/src/androidTest/res/values/colors.xml
similarity index 100%
rename from v7/gridlayout/src/androidTest/res/values/colors.xml
rename to gridlayout/src/androidTest/res/values/colors.xml

gridlayout/src/main/AndroidManifest.xml

diff --git a/v7/gridlayout/src/main/AndroidManifest.xml b/gridlayout/src/main/AndroidManifest.xml
similarity index 100%
rename from v7/gridlayout/src/main/AndroidManifest.xml
rename to gridlayout/src/main/AndroidManifest.xml

gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java

diff --git a/v7/gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java b/gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java
similarity index 100%
rename from v7/gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java
rename to gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java

gridlayout/src/main/res/values/attrs.xml

diff --git a/v7/gridlayout/src/main/res/values/attrs.xml b/gridlayout/src/main/res/values/attrs.xml
similarity index 100%
rename from v7/gridlayout/src/main/res/values/attrs.xml
rename to gridlayout/src/main/res/values/attrs.xml

gridlayout/src/main/res/values/dimens.xml

diff --git a/v7/gridlayout/src/main/res/values/dimens.xml b/gridlayout/src/main/res/values/dimens.xml
similarity index 100%
rename from v7/gridlayout/src/main/res/values/dimens.xml
rename to gridlayout/src/main/res/values/dimens.xml

legacy/core-ui/NOTICES.md

diff --git a/core-ui/NOTICES.md b/legacy/core-ui/NOTICES.md
similarity index 100%
rename from core-ui/NOTICES.md
rename to legacy/core-ui/NOTICES.md

legacy/core-ui/api/current.txt

diff --git a/core-ui/api/current.txt b/legacy/core-ui/api/current.txt
similarity index 100%
rename from core-ui/api/current.txt
rename to legacy/core-ui/api/current.txt

legacy/core-ui/api_legacy/26.0.0.txt

diff --git a/core-ui/api_legacy/26.0.0.txt b/legacy/core-ui/api_legacy/26.0.0.txt
similarity index 100%
rename from core-ui/api_legacy/26.0.0.txt
rename to legacy/core-ui/api_legacy/26.0.0.txt

legacy/core-ui/api_legacy/26.1.0.txt

diff --git a/core-ui/api_legacy/26.1.0.txt b/legacy/core-ui/api_legacy/26.1.0.txt
similarity index 100%
rename from core-ui/api_legacy/26.1.0.txt
rename to legacy/core-ui/api_legacy/26.1.0.txt

legacy/core-ui/api_legacy/27.0.0.ignore

diff --git a/core-ui/api_legacy/27.0.0.ignore b/legacy/core-ui/api_legacy/27.0.0.ignore
similarity index 100%
rename from core-ui/api_legacy/27.0.0.ignore
rename to legacy/core-ui/api_legacy/27.0.0.ignore

legacy/core-ui/api_legacy/27.0.0.txt

diff --git a/core-ui/api_legacy/27.0.0.txt b/legacy/core-ui/api_legacy/27.0.0.txt
similarity index 100%
rename from core-ui/api_legacy/27.0.0.txt
rename to legacy/core-ui/api_legacy/27.0.0.txt

legacy/core-ui/api_legacy/27.1.0.ignore

diff --git a/core-ui/api_legacy/27.1.0.ignore b/legacy/core-ui/api_legacy/27.1.0.ignore
similarity index 100%
rename from core-ui/api_legacy/27.1.0.ignore
rename to legacy/core-ui/api_legacy/27.1.0.ignore

legacy/core-ui/api_legacy/27.1.0.txt

diff --git a/core-ui/api_legacy/27.1.0.txt b/legacy/core-ui/api_legacy/27.1.0.txt
similarity index 100%
rename from core-ui/api_legacy/27.1.0.txt
rename to legacy/core-ui/api_legacy/27.1.0.txt

legacy/core-ui/api_legacy/28.0.0-alpha1.txt

diff --git a/core-ui/api_legacy/28.0.0-alpha1.txt b/legacy/core-ui/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from core-ui/api_legacy/28.0.0-alpha1.txt
rename to legacy/core-ui/api_legacy/28.0.0-alpha1.txt

legacy/core-ui/api_legacy/current.txt

diff --git a/core-ui/api_legacy/current.txt b/legacy/core-ui/api_legacy/current.txt
similarity index 100%
rename from core-ui/api_legacy/current.txt
rename to legacy/core-ui/api_legacy/current.txt

legacy/core-ui/build.gradle

diff --git a/core-ui/build.gradle b/legacy/core-ui/build.gradle
similarity index 100%
rename from core-ui/build.gradle
rename to legacy/core-ui/build.gradle

legacy/core-ui/src/main/AndroidManifest.xml

diff --git a/core-ui/src/main/AndroidManifest.xml b/legacy/core-ui/src/main/AndroidManifest.xml
similarity index 100%
rename from core-ui/src/main/AndroidManifest.xml
rename to legacy/core-ui/src/main/AndroidManifest.xml

legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java

diff --git a/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java b/legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
similarity index 100%
rename from core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
rename to legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java

legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java

diff --git a/core-ui/src/main/java/androidx/legacy/widget/Space.java b/legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java
similarity index 100%
rename from core-ui/src/main/java/androidx/legacy/widget/Space.java
rename to legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java

legacy/core-utils/api/current.txt

diff --git a/core-utils/api/current.txt b/legacy/core-utils/api/current.txt
similarity index 100%
rename from core-utils/api/current.txt
rename to legacy/core-utils/api/current.txt

legacy/core-utils/api_legacy/26.0.0.txt

diff --git a/core-utils/api_legacy/26.0.0.txt b/legacy/core-utils/api_legacy/26.0.0.txt
similarity index 100%
rename from core-utils/api_legacy/26.0.0.txt
rename to legacy/core-utils/api_legacy/26.0.0.txt

legacy/core-utils/api_legacy/26.1.0.txt

diff --git a/core-utils/api_legacy/26.1.0.txt b/legacy/core-utils/api_legacy/26.1.0.txt
similarity index 100%
rename from core-utils/api_legacy/26.1.0.txt
rename to legacy/core-utils/api_legacy/26.1.0.txt

legacy/core-utils/api_legacy/27.0.0.txt

diff --git a/core-utils/api_legacy/27.0.0.txt b/legacy/core-utils/api_legacy/27.0.0.txt
similarity index 100%
rename from core-utils/api_legacy/27.0.0.txt
rename to legacy/core-utils/api_legacy/27.0.0.txt

legacy/core-utils/api_legacy/27.1.0.ignore

diff --git a/core-utils/api_legacy/27.1.0.ignore b/legacy/core-utils/api_legacy/27.1.0.ignore
similarity index 100%
rename from core-utils/api_legacy/27.1.0.ignore
rename to legacy/core-utils/api_legacy/27.1.0.ignore

legacy/core-utils/api_legacy/27.1.0.txt

diff --git a/core-utils/api_legacy/27.1.0.txt b/legacy/core-utils/api_legacy/27.1.0.txt
similarity index 100%
rename from core-utils/api_legacy/27.1.0.txt
rename to legacy/core-utils/api_legacy/27.1.0.txt

legacy/core-utils/api_legacy/28.0.0-alpha1.txt

diff --git a/core-utils/api_legacy/28.0.0-alpha1.txt b/legacy/core-utils/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from core-utils/api_legacy/28.0.0-alpha1.txt
rename to legacy/core-utils/api_legacy/28.0.0-alpha1.txt

legacy/core-utils/api_legacy/current.txt

diff --git a/core-utils/api_legacy/current.txt b/legacy/core-utils/api_legacy/current.txt
similarity index 100%
rename from core-utils/api_legacy/current.txt
rename to legacy/core-utils/api_legacy/current.txt

legacy/core-utils/build.gradle

diff --git a/core-utils/build.gradle b/legacy/core-utils/build.gradle
similarity index 100%
rename from core-utils/build.gradle
rename to legacy/core-utils/build.gradle

legacy/core-utils/src/main/AndroidManifest.xml

diff --git a/core-utils/src/main/AndroidManifest.xml b/legacy/core-utils/src/main/AndroidManifest.xml
similarity index 100%
rename from core-utils/src/main/AndroidManifest.xml
rename to legacy/core-utils/src/main/AndroidManifest.xml

legacy/core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java

diff --git a/core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java b/legacy/core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
similarity index 100%
rename from core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
rename to legacy/core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java

legacy/preference-v14/OWNERS

diff --git a/v14/preference/OWNERS b/legacy/preference-v14/OWNERS
similarity index 100%
rename from v14/preference/OWNERS
rename to legacy/preference-v14/OWNERS

legacy/preference-v14/api_legacy/26.0.0.txt

diff --git a/v14/preference/api_legacy/26.0.0.txt b/legacy/preference-v14/api_legacy/26.0.0.txt
similarity index 100%
rename from v14/preference/api_legacy/26.0.0.txt
rename to legacy/preference-v14/api_legacy/26.0.0.txt

legacy/preference-v14/api_legacy/26.1.0.txt

diff --git a/v14/preference/api_legacy/26.1.0.txt b/legacy/preference-v14/api_legacy/26.1.0.txt
similarity index 100%
rename from v14/preference/api_legacy/26.1.0.txt
rename to legacy/preference-v14/api_legacy/26.1.0.txt

legacy/preference-v14/api_legacy/27.0.0.txt

diff --git a/v14/preference/api_legacy/27.0.0.txt b/legacy/preference-v14/api_legacy/27.0.0.txt
similarity index 100%
rename from v14/preference/api_legacy/27.0.0.txt
rename to legacy/preference-v14/api_legacy/27.0.0.txt

legacy/preference-v14/api_legacy/28.0.0-alpha1.txt

diff --git a/v14/preference/api_legacy/28.0.0-alpha1.txt b/legacy/preference-v14/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v14/preference/api_legacy/28.0.0-alpha1.txt
rename to legacy/preference-v14/api_legacy/28.0.0-alpha1.txt

legacy/preference-v14/api_legacy/current.txt

diff --git a/v14/preference/api_legacy/current.txt b/legacy/preference-v14/api_legacy/current.txt
similarity index 100%
rename from v14/preference/api_legacy/current.txt
rename to legacy/preference-v14/api_legacy/current.txt

legacy/preference-v14/build.gradle

diff --git a/v14/preference/build.gradle b/legacy/preference-v14/build.gradle
similarity index 100%
rename from v14/preference/build.gradle
rename to legacy/preference-v14/build.gradle

legacy/preference-v14/src/main/AndroidManifest.xml

diff --git a/v14/preference/src/main/AndroidManifest.xml b/legacy/preference-v14/src/main/AndroidManifest.xml
similarity index 100%
rename from v14/preference/src/main/AndroidManifest.xml
rename to legacy/preference-v14/src/main/AndroidManifest.xml

legacy/v13/api/current.txt

diff --git a/v13/api/current.txt b/legacy/v13/api/current.txt
similarity index 100%
rename from v13/api/current.txt
rename to legacy/v13/api/current.txt

legacy/v13/api_legacy/26.0.0.txt

diff --git a/v13/api_legacy/26.0.0.txt b/legacy/v13/api_legacy/26.0.0.txt
similarity index 100%
rename from v13/api_legacy/26.0.0.txt
rename to legacy/v13/api_legacy/26.0.0.txt

legacy/v13/api_legacy/26.1.0.txt

diff --git a/v13/api_legacy/26.1.0.txt b/legacy/v13/api_legacy/26.1.0.txt
similarity index 100%
rename from v13/api_legacy/26.1.0.txt
rename to legacy/v13/api_legacy/26.1.0.txt

legacy/v13/api_legacy/27.0.0.ignore

diff --git a/v13/api_legacy/27.0.0.ignore b/legacy/v13/api_legacy/27.0.0.ignore
similarity index 100%
rename from v13/api_legacy/27.0.0.ignore
rename to legacy/v13/api_legacy/27.0.0.ignore

legacy/v13/api_legacy/27.0.0.txt

diff --git a/v13/api_legacy/27.0.0.txt b/legacy/v13/api_legacy/27.0.0.txt
similarity index 100%
rename from v13/api_legacy/27.0.0.txt
rename to legacy/v13/api_legacy/27.0.0.txt

legacy/v13/api_legacy/27.1.0.txt

diff --git a/v13/api_legacy/27.1.0.txt b/legacy/v13/api_legacy/27.1.0.txt
similarity index 100%
rename from v13/api_legacy/27.1.0.txt
rename to legacy/v13/api_legacy/27.1.0.txt

legacy/v13/api_legacy/28.0.0-alpha1.txt

diff --git a/v13/api_legacy/28.0.0-alpha1.txt b/legacy/v13/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v13/api_legacy/28.0.0-alpha1.txt
rename to legacy/v13/api_legacy/28.0.0-alpha1.txt

legacy/v13/api_legacy/current.txt

diff --git a/v13/api_legacy/current.txt b/legacy/v13/api_legacy/current.txt
similarity index 100%
rename from v13/api_legacy/current.txt
rename to legacy/v13/api_legacy/current.txt

legacy/v13/build.gradle

diff --git a/v13/build.gradle b/legacy/v13/build.gradle
similarity index 100%
rename from v13/build.gradle
rename to legacy/v13/build.gradle

legacy/v13/src/main/AndroidManifest.xml

diff --git a/v13/src/main/AndroidManifest.xml b/legacy/v13/src/main/AndroidManifest.xml
similarity index 100%
rename from v13/src/main/AndroidManifest.xml
rename to legacy/v13/src/main/AndroidManifest.xml

legacy/v13/src/main/java/androidx/legacy/app/ActivityCompat.java

diff --git a/v13/src/main/java/androidx/legacy/app/ActivityCompat.java b/legacy/v13/src/main/java/androidx/legacy/app/ActivityCompat.java
similarity index 100%
rename from v13/src/main/java/androidx/legacy/app/ActivityCompat.java
rename to legacy/v13/src/main/java/androidx/legacy/app/ActivityCompat.java

legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java

diff --git a/v13/src/main/java/androidx/legacy/app/FragmentCompat.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java
similarity index 100%
rename from v13/src/main/java/androidx/legacy/app/FragmentCompat.java
rename to legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java

legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java

diff --git a/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java
similarity index 100%
rename from v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java
rename to legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java

legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java

diff --git a/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java
similarity index 100%
rename from v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java
rename to legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java

legacy/v13/src/main/java/androidx/legacy/app/FragmentTabHost.java

diff --git a/v13/src/main/java/androidx/legacy/app/FragmentTabHost.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentTabHost.java
similarity index 100%
rename from v13/src/main/java/androidx/legacy/app/FragmentTabHost.java
rename to legacy/v13/src/main/java/androidx/legacy/app/FragmentTabHost.java

legacy/v13/src/main/java/androidx/legacy/view/ViewCompat.java

diff --git a/v13/src/main/java/androidx/legacy/view/ViewCompat.java b/legacy/v13/src/main/java/androidx/legacy/view/ViewCompat.java
similarity index 100%
rename from v13/src/main/java/androidx/legacy/view/ViewCompat.java
rename to legacy/v13/src/main/java/androidx/legacy/view/ViewCompat.java

legacy/v4/build.gradle

diff --git a/v4/build.gradle b/legacy/v4/build.gradle
similarity index 100%
rename from v4/build.gradle
rename to legacy/v4/build.gradle

legacy/v4/src/main/AndroidManifest.xml

diff --git a/v4/src/main/AndroidManifest.xml b/legacy/v4/src/main/AndroidManifest.xml
similarity index 100%
rename from v4/src/main/AndroidManifest.xml
rename to legacy/v4/src/main/AndroidManifest.xml

mediarouter/OWNERS

diff --git a/v7/mediarouter/OWNERS b/mediarouter/OWNERS
similarity index 100%
rename from v7/mediarouter/OWNERS
rename to mediarouter/OWNERS

mediarouter/api/current.txt

diff --git a/v7/mediarouter/api/current.txt b/mediarouter/api/current.txt
similarity index 100%
rename from v7/mediarouter/api/current.txt
rename to mediarouter/api/current.txt

mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java

diff --git a/v7/mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java b/mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java
similarity index 100%
rename from v7/mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java
rename to mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java

mediarouter/api_legacy/26.0.0.txt

diff --git a/v7/mediarouter/api_legacy/26.0.0.txt b/mediarouter/api_legacy/26.0.0.txt
similarity index 100%
rename from v7/mediarouter/api_legacy/26.0.0.txt
rename to mediarouter/api_legacy/26.0.0.txt

mediarouter/api_legacy/26.1.0.txt

diff --git a/v7/mediarouter/api_legacy/26.1.0.txt b/mediarouter/api_legacy/26.1.0.txt
similarity index 100%
rename from v7/mediarouter/api_legacy/26.1.0.txt
rename to mediarouter/api_legacy/26.1.0.txt

mediarouter/api_legacy/27.0.0.txt

diff --git a/v7/mediarouter/api_legacy/27.0.0.txt b/mediarouter/api_legacy/27.0.0.txt
similarity index 100%
rename from v7/mediarouter/api_legacy/27.0.0.txt
rename to mediarouter/api_legacy/27.0.0.txt

mediarouter/api_legacy/27.1.0.txt

diff --git a/v7/mediarouter/api_legacy/27.1.0.txt b/mediarouter/api_legacy/27.1.0.txt
similarity index 100%
rename from v7/mediarouter/api_legacy/27.1.0.txt
rename to mediarouter/api_legacy/27.1.0.txt

mediarouter/api_legacy/28.0.0-alpha1.txt

diff --git a/v7/mediarouter/api_legacy/28.0.0-alpha1.txt b/mediarouter/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v7/mediarouter/api_legacy/28.0.0-alpha1.txt
rename to mediarouter/api_legacy/28.0.0-alpha1.txt

mediarouter/api_legacy/current.txt

diff --git a/v7/mediarouter/api_legacy/current.txt b/mediarouter/api_legacy/current.txt
similarity index 100%
rename from v7/mediarouter/api_legacy/current.txt
rename to mediarouter/api_legacy/current.txt

mediarouter/build.gradle

diff --git a/v7/mediarouter/build.gradle b/mediarouter/build.gradle
similarity index 100%
rename from v7/mediarouter/build.gradle
rename to mediarouter/build.gradle

mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java

diff --git a/v7/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java b/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
similarity index 100%
rename from v7/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
rename to mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java

mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java

diff --git a/v7/mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java b/mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
similarity index 100%
rename from v7/mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
rename to mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java

mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java

diff --git a/v7/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java b/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
similarity index 100%
rename from v7/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
rename to mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java

mediarouter/lint-baseline.xml

diff --git a/v7/mediarouter/lint-baseline.xml b/mediarouter/lint-baseline.xml
similarity index 100%
rename from v7/mediarouter/lint-baseline.xml
rename to mediarouter/lint-baseline.xml

mediarouter/src/androidTest/AndroidManifest.xml

diff --git a/v7/mediarouter/src/androidTest/AndroidManifest.xml b/mediarouter/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from v7/mediarouter/src/androidTest/AndroidManifest.xml
rename to mediarouter/src/androidTest/AndroidManifest.xml

mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java

diff --git a/v7/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
similarity index 100%
rename from v7/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
rename to mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java

mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java

diff --git a/v7/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java
similarity index 100%
rename from v7/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java
rename to mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java

mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java

diff --git a/v7/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java
similarity index 100%
rename from v7/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java
rename to mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java

mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java

diff --git a/v7/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
similarity index 100%
rename from v7/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
rename to mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java

mediarouter/src/androidTest/java/androidx/mediarouter/media/TestUtils.java

diff --git a/v7/mediarouter/src/androidTest/java/androidx/mediarouter/media/TestUtils.java b/mediarouter/src/androidTest/java/androidx/mediarouter/media/TestUtils.java
similarity index 100%
rename from v7/mediarouter/src/androidTest/java/androidx/mediarouter/media/TestUtils.java
rename to mediarouter/src/androidTest/java/androidx/mediarouter/media/TestUtils.java

mediarouter/src/androidTest/res/layout/mr_chooser_dialog_activity.xml

diff --git a/v7/mediarouter/src/androidTest/res/layout/mr_chooser_dialog_activity.xml b/mediarouter/src/androidTest/res/layout/mr_chooser_dialog_activity.xml
similarity index 100%
rename from v7/mediarouter/src/androidTest/res/layout/mr_chooser_dialog_activity.xml
rename to mediarouter/src/androidTest/res/layout/mr_chooser_dialog_activity.xml

mediarouter/src/androidTest/res/values/themes.xml

diff --git a/v7/mediarouter/src/androidTest/res/values/themes.xml b/mediarouter/src/androidTest/res/values/themes.xml
similarity index 100%
rename from v7/mediarouter/src/androidTest/res/values/themes.xml
rename to mediarouter/src/androidTest/res/values/themes.xml

mediarouter/src/main/AndroidManifest.xml

diff --git a/v7/mediarouter/src/main/AndroidManifest.xml b/mediarouter/src/main/AndroidManifest.xml
similarity index 100%
rename from v7/mediarouter/src/main/AndroidManifest.xml
rename to mediarouter/src/main/AndroidManifest.xml

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogFactory.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogFactory.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogFactory.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogFactory.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogFactory.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java

mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java

mediarouter/src/main/java/androidx/mediarouter/app/OverlayListView.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/app/OverlayListView.java b/mediarouter/src/main/java/androidx/mediarouter/app/OverlayListView.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/app/OverlayListView.java
rename to mediarouter/src/main/java/androidx/mediarouter/app/OverlayListView.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaControlIntent.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaControlIntent.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaControlIntent.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaControlIntent.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaControlIntent.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaItemMetadata.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemMetadata.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemMetadata.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemMetadata.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaItemMetadata.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderProtocol.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderProtocol.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderProtocol.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderProtocol.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderProtocol.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java

mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java

mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java b/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java

mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java b/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java

mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java b/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java

mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java b/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java

mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java b/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
rename to mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java

mediarouter/src/main/java/androidx/mediarouter/media/package.html

diff --git a/v7/mediarouter/src/main/java/androidx/mediarouter/media/package.html b/mediarouter/src/main/java/androidx/mediarouter/media/package.html
similarity index 100%
rename from v7/mediarouter/src/main/java/androidx/mediarouter/media/package.html
rename to mediarouter/src/main/java/androidx/mediarouter/media/package.html

mediarouter/src/main/res/drawable-hdpi/ic_audiotrack_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_audiotrack_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_dialog_close_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_dialog_close_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_media_pause_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_media_pause_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_media_play_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_media_play_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_media_stop_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_media_stop_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_mr_button_disabled_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_mr_button_disabled_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_mr_button_disconnected_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_mr_button_disconnected_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_mr_button_grey.png

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

mediarouter/src/main/res/drawable-hdpi/ic_vol_type_speaker_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_vol_type_speaker_group_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_vol_type_speaker_group_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_vol_type_speaker_light.png

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

mediarouter/src/main/res/drawable-hdpi/ic_vol_type_tv_dark.png

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

mediarouter/src/main/res/drawable-hdpi/ic_vol_type_tv_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_audiotrack_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_audiotrack_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_dialog_close_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_dialog_close_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_media_pause_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_media_pause_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_media_play_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_media_play_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_media_stop_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_media_stop_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_mr_button_disabled_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_mr_button_disabled_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_mr_button_disconnected_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_mr_button_disconnected_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_mr_button_grey.png

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

mediarouter/src/main/res/drawable-mdpi/ic_vol_type_speaker_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_vol_type_speaker_group_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_vol_type_speaker_group_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_vol_type_speaker_light.png

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

mediarouter/src/main/res/drawable-mdpi/ic_vol_type_tv_dark.png

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

mediarouter/src/main/res/drawable-mdpi/ic_vol_type_tv_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_audiotrack_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_audiotrack_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_dialog_close_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_dialog_close_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_media_pause_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_media_pause_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_media_play_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_media_play_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_media_stop_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_media_stop_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_00_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_00_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_01_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_01_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_02_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_02_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_03_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_03_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_04_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_04_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_05_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_05_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_06_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_06_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_07_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_07_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_08_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_08_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_09_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_09_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_10_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_10_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_11_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_11_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_12_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_12_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_13_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_13_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_14_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_14_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_15_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_15_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_16_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_16_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_17_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_17_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_18_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_18_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_19_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_19_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_20_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_20_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_21_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_21_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_22_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_22_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_23_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_23_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_24_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_24_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_25_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_25_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_26_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_26_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_27_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_27_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_28_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_28_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_29_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_29_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_30_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connected_30_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_00_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_00_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_01_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_01_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_02_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_02_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_03_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_03_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_04_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_04_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_05_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_05_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_06_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_06_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_07_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_07_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_08_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_08_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_09_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_09_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_10_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_10_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_11_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_11_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_12_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_12_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_13_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_13_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_14_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_14_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_15_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_15_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_16_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_16_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_17_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_17_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_18_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_18_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_19_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_19_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_20_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_20_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_21_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_21_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_22_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_22_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_23_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_23_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_24_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_24_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_25_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_25_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_26_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_26_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_27_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_27_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_28_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_28_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_29_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_29_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_30_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_connecting_30_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_disabled_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_disabled_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_disconnected_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_disconnected_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_mr_button_grey.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_vol_type_speaker_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_vol_type_speaker_group_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_vol_type_speaker_group_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_vol_type_speaker_light.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_vol_type_tv_dark.png

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

mediarouter/src/main/res/drawable-xhdpi/ic_vol_type_tv_light.png

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

mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_dialog_close_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_media_pause_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_media_play_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_media_stop_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_00_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_01_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_02_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_03_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_04_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_05_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_06_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_07_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_08_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_09_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_10_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_11_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_12_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_13_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_14_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_15_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_16_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_17_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_18_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_19_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_20_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_21_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_22_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_23_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_24_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_25_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_26_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_27_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_28_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_29_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connected_30_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_00_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_01_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_02_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_03_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_04_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_05_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_06_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_07_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_08_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_09_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_10_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_11_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_12_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_13_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_14_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_15_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_16_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_17_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_18_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_19_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_20_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_21_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_22_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_23_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_24_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_25_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_26_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_27_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_28_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_29_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_connecting_30_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disabled_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_disconnected_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_grey.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_grey.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_grey.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_grey.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_mr_button_grey.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_group_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_speaker_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_dark.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_dark.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_dark.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_dark.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_dark.png
Binary files differ

mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_light.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_light.png b/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_light.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_light.png
rename to mediarouter/src/main/res/drawable-xxhdpi/ic_vol_type_tv_light.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_00.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_00.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_00.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_00.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_00.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_01.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_01.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_01.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_01.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_01.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_02.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_02.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_02.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_02.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_02.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_03.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_03.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_03.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_03.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_03.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_04.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_04.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_04.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_04.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_04.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_05.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_05.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_05.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_05.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_05.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_06.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_06.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_06.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_06.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_06.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_07.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_07.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_07.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_07.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_07.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_08.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_08.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_08.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_08.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_08.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_09.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_09.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_09.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_09.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_09.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_10.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_10.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_10.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_10.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_10.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_11.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_11.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_11.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_11.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_11.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_12.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_12.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_12.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_12.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_12.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_13.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_13.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_13.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_13.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_13.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_14.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_14.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_14.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_14.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_14.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_15.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_15.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_15.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_15.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_collapse_15.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_00.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_00.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_00.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_00.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_00.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_01.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_01.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_01.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_01.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_01.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_02.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_02.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_02.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_02.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_02.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_03.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_03.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_03.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_03.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_03.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_04.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_04.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_04.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_04.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_04.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_05.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_05.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_05.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_05.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_05.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_06.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_06.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_06.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_06.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_06.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_07.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_07.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_07.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_07.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_07.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_08.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_08.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_08.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_08.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_08.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_09.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_09.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_09.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_09.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_09.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_10.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_10.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_10.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_10.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_10.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_11.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_11.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_11.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_11.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_11.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_12.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_12.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_12.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_12.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_12.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_13.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_13.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_13.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_13.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_13.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_14.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_14.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_14.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_14.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_14.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_15.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_15.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_15.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_15.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_group_expand_15.png
Binary files differ

mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_button_grey.png

diff --git a/v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_button_grey.png b/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_button_grey.png
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_button_grey.png
rename to mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_button_grey.png
Binary files differ

mediarouter/src/main/res/drawable/mr_button_connected_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_button_connected_dark.xml b/mediarouter/src/main/res/drawable/mr_button_connected_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_button_connected_dark.xml
rename to mediarouter/src/main/res/drawable/mr_button_connected_dark.xml

mediarouter/src/main/res/drawable/mr_button_connected_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_button_connected_light.xml b/mediarouter/src/main/res/drawable/mr_button_connected_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_button_connected_light.xml
rename to mediarouter/src/main/res/drawable/mr_button_connected_light.xml

mediarouter/src/main/res/drawable/mr_button_connecting_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_button_connecting_dark.xml b/mediarouter/src/main/res/drawable/mr_button_connecting_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_button_connecting_dark.xml
rename to mediarouter/src/main/res/drawable/mr_button_connecting_dark.xml

mediarouter/src/main/res/drawable/mr_button_connecting_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_button_connecting_light.xml b/mediarouter/src/main/res/drawable/mr_button_connecting_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_button_connecting_light.xml
rename to mediarouter/src/main/res/drawable/mr_button_connecting_light.xml

mediarouter/src/main/res/drawable/mr_button_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_button_dark.xml b/mediarouter/src/main/res/drawable/mr_button_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_button_dark.xml
rename to mediarouter/src/main/res/drawable/mr_button_dark.xml

mediarouter/src/main/res/drawable/mr_button_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_button_light.xml b/mediarouter/src/main/res/drawable/mr_button_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_button_light.xml
rename to mediarouter/src/main/res/drawable/mr_button_light.xml

mediarouter/src/main/res/drawable/mr_dialog_close_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_dialog_close_dark.xml b/mediarouter/src/main/res/drawable/mr_dialog_close_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_dialog_close_dark.xml
rename to mediarouter/src/main/res/drawable/mr_dialog_close_dark.xml

mediarouter/src/main/res/drawable/mr_dialog_close_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_dialog_close_light.xml b/mediarouter/src/main/res/drawable/mr_dialog_close_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_dialog_close_light.xml
rename to mediarouter/src/main/res/drawable/mr_dialog_close_light.xml

mediarouter/src/main/res/drawable/mr_dialog_material_background_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_dialog_material_background_dark.xml b/mediarouter/src/main/res/drawable/mr_dialog_material_background_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_dialog_material_background_dark.xml
rename to mediarouter/src/main/res/drawable/mr_dialog_material_background_dark.xml

mediarouter/src/main/res/drawable/mr_dialog_material_background_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_dialog_material_background_light.xml b/mediarouter/src/main/res/drawable/mr_dialog_material_background_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_dialog_material_background_light.xml
rename to mediarouter/src/main/res/drawable/mr_dialog_material_background_light.xml

mediarouter/src/main/res/drawable/mr_group_collapse.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_group_collapse.xml b/mediarouter/src/main/res/drawable/mr_group_collapse.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_group_collapse.xml
rename to mediarouter/src/main/res/drawable/mr_group_collapse.xml

mediarouter/src/main/res/drawable/mr_group_expand.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_group_expand.xml b/mediarouter/src/main/res/drawable/mr_group_expand.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_group_expand.xml
rename to mediarouter/src/main/res/drawable/mr_group_expand.xml

mediarouter/src/main/res/drawable/mr_media_pause_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_media_pause_dark.xml b/mediarouter/src/main/res/drawable/mr_media_pause_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_media_pause_dark.xml
rename to mediarouter/src/main/res/drawable/mr_media_pause_dark.xml

mediarouter/src/main/res/drawable/mr_media_pause_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_media_pause_light.xml b/mediarouter/src/main/res/drawable/mr_media_pause_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_media_pause_light.xml
rename to mediarouter/src/main/res/drawable/mr_media_pause_light.xml

mediarouter/src/main/res/drawable/mr_media_play_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_media_play_dark.xml b/mediarouter/src/main/res/drawable/mr_media_play_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_media_play_dark.xml
rename to mediarouter/src/main/res/drawable/mr_media_play_dark.xml

mediarouter/src/main/res/drawable/mr_media_play_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_media_play_light.xml b/mediarouter/src/main/res/drawable/mr_media_play_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_media_play_light.xml
rename to mediarouter/src/main/res/drawable/mr_media_play_light.xml

mediarouter/src/main/res/drawable/mr_media_stop_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_media_stop_dark.xml b/mediarouter/src/main/res/drawable/mr_media_stop_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_media_stop_dark.xml
rename to mediarouter/src/main/res/drawable/mr_media_stop_dark.xml

mediarouter/src/main/res/drawable/mr_media_stop_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_media_stop_light.xml b/mediarouter/src/main/res/drawable/mr_media_stop_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_media_stop_light.xml
rename to mediarouter/src/main/res/drawable/mr_media_stop_light.xml

mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_dark.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_dark.xml b/mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_dark.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_dark.xml
rename to mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_dark.xml

mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_light.xml

diff --git a/v7/mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_light.xml b/mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_light.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_light.xml
rename to mediarouter/src/main/res/drawable/mr_vol_type_audiotrack_light.xml

mediarouter/src/main/res/interpolator/mr_fast_out_slow_in.xml

diff --git a/v7/mediarouter/src/main/res/interpolator/mr_fast_out_slow_in.xml b/mediarouter/src/main/res/interpolator/mr_fast_out_slow_in.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/interpolator/mr_fast_out_slow_in.xml
rename to mediarouter/src/main/res/interpolator/mr_fast_out_slow_in.xml

mediarouter/src/main/res/interpolator/mr_linear_out_slow_in.xml

diff --git a/v7/mediarouter/src/main/res/interpolator/mr_linear_out_slow_in.xml b/mediarouter/src/main/res/interpolator/mr_linear_out_slow_in.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/interpolator/mr_linear_out_slow_in.xml
rename to mediarouter/src/main/res/interpolator/mr_linear_out_slow_in.xml

mediarouter/src/main/res/layout/mr_chooser_dialog.xml

diff --git a/v7/mediarouter/src/main/res/layout/mr_chooser_dialog.xml b/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
rename to mediarouter/src/main/res/layout/mr_chooser_dialog.xml

mediarouter/src/main/res/layout/mr_chooser_list_item.xml

diff --git a/v7/mediarouter/src/main/res/layout/mr_chooser_list_item.xml b/mediarouter/src/main/res/layout/mr_chooser_list_item.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/layout/mr_chooser_list_item.xml
rename to mediarouter/src/main/res/layout/mr_chooser_list_item.xml

mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml

diff --git a/v7/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml b/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml
rename to mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml

mediarouter/src/main/res/layout/mr_controller_volume_item.xml

diff --git a/v7/mediarouter/src/main/res/layout/mr_controller_volume_item.xml b/mediarouter/src/main/res/layout/mr_controller_volume_item.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/layout/mr_controller_volume_item.xml
rename to mediarouter/src/main/res/layout/mr_controller_volume_item.xml

mediarouter/src/main/res/layout/mr_playback_control.xml

diff --git a/v7/mediarouter/src/main/res/layout/mr_playback_control.xml b/mediarouter/src/main/res/layout/mr_playback_control.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/layout/mr_playback_control.xml
rename to mediarouter/src/main/res/layout/mr_playback_control.xml

mediarouter/src/main/res/layout/mr_volume_control.xml

diff --git a/v7/mediarouter/src/main/res/layout/mr_volume_control.xml b/mediarouter/src/main/res/layout/mr_volume_control.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/layout/mr_volume_control.xml
rename to mediarouter/src/main/res/layout/mr_volume_control.xml

mediarouter/src/main/res/values-af/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-af/strings.xml b/mediarouter/src/main/res/values-af/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-af/strings.xml
rename to mediarouter/src/main/res/values-af/strings.xml

mediarouter/src/main/res/values-am/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-am/strings.xml b/mediarouter/src/main/res/values-am/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-am/strings.xml
rename to mediarouter/src/main/res/values-am/strings.xml

mediarouter/src/main/res/values-ar/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ar/strings.xml b/mediarouter/src/main/res/values-ar/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ar/strings.xml
rename to mediarouter/src/main/res/values-ar/strings.xml

mediarouter/src/main/res/values-az/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-az/strings.xml b/mediarouter/src/main/res/values-az/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-az/strings.xml
rename to mediarouter/src/main/res/values-az/strings.xml

mediarouter/src/main/res/values-b+sr+Latn/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-b+sr+Latn/strings.xml b/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
rename to mediarouter/src/main/res/values-b+sr+Latn/strings.xml

mediarouter/src/main/res/values-be/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-be/strings.xml b/mediarouter/src/main/res/values-be/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-be/strings.xml
rename to mediarouter/src/main/res/values-be/strings.xml

mediarouter/src/main/res/values-bg/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-bg/strings.xml b/mediarouter/src/main/res/values-bg/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-bg/strings.xml
rename to mediarouter/src/main/res/values-bg/strings.xml

mediarouter/src/main/res/values-bn/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-bn/strings.xml b/mediarouter/src/main/res/values-bn/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-bn/strings.xml
rename to mediarouter/src/main/res/values-bn/strings.xml

mediarouter/src/main/res/values-bs/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-bs/strings.xml b/mediarouter/src/main/res/values-bs/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-bs/strings.xml
rename to mediarouter/src/main/res/values-bs/strings.xml

mediarouter/src/main/res/values-ca/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ca/strings.xml b/mediarouter/src/main/res/values-ca/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ca/strings.xml
rename to mediarouter/src/main/res/values-ca/strings.xml

mediarouter/src/main/res/values-cs/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-cs/strings.xml b/mediarouter/src/main/res/values-cs/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-cs/strings.xml
rename to mediarouter/src/main/res/values-cs/strings.xml

mediarouter/src/main/res/values-da/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-da/strings.xml b/mediarouter/src/main/res/values-da/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-da/strings.xml
rename to mediarouter/src/main/res/values-da/strings.xml

mediarouter/src/main/res/values-de/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-de/strings.xml b/mediarouter/src/main/res/values-de/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-de/strings.xml
rename to mediarouter/src/main/res/values-de/strings.xml

mediarouter/src/main/res/values-el/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-el/strings.xml b/mediarouter/src/main/res/values-el/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-el/strings.xml
rename to mediarouter/src/main/res/values-el/strings.xml

mediarouter/src/main/res/values-en-rAU/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-en-rAU/strings.xml b/mediarouter/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-en-rAU/strings.xml
rename to mediarouter/src/main/res/values-en-rAU/strings.xml

mediarouter/src/main/res/values-en-rCA/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-en-rCA/strings.xml b/mediarouter/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-en-rCA/strings.xml
rename to mediarouter/src/main/res/values-en-rCA/strings.xml

mediarouter/src/main/res/values-en-rGB/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-en-rGB/strings.xml b/mediarouter/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-en-rGB/strings.xml
rename to mediarouter/src/main/res/values-en-rGB/strings.xml

mediarouter/src/main/res/values-en-rIN/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-en-rIN/strings.xml b/mediarouter/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-en-rIN/strings.xml
rename to mediarouter/src/main/res/values-en-rIN/strings.xml

mediarouter/src/main/res/values-en-rXC/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-en-rXC/strings.xml b/mediarouter/src/main/res/values-en-rXC/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-en-rXC/strings.xml
rename to mediarouter/src/main/res/values-en-rXC/strings.xml

mediarouter/src/main/res/values-es-rUS/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-es-rUS/strings.xml b/mediarouter/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-es-rUS/strings.xml
rename to mediarouter/src/main/res/values-es-rUS/strings.xml

mediarouter/src/main/res/values-es/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-es/strings.xml b/mediarouter/src/main/res/values-es/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-es/strings.xml
rename to mediarouter/src/main/res/values-es/strings.xml

mediarouter/src/main/res/values-et/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-et/strings.xml b/mediarouter/src/main/res/values-et/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-et/strings.xml
rename to mediarouter/src/main/res/values-et/strings.xml

mediarouter/src/main/res/values-eu/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-eu/strings.xml b/mediarouter/src/main/res/values-eu/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-eu/strings.xml
rename to mediarouter/src/main/res/values-eu/strings.xml

mediarouter/src/main/res/values-fa/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-fa/strings.xml b/mediarouter/src/main/res/values-fa/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-fa/strings.xml
rename to mediarouter/src/main/res/values-fa/strings.xml

mediarouter/src/main/res/values-fi/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-fi/strings.xml b/mediarouter/src/main/res/values-fi/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-fi/strings.xml
rename to mediarouter/src/main/res/values-fi/strings.xml

mediarouter/src/main/res/values-fr-rCA/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-fr-rCA/strings.xml b/mediarouter/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-fr-rCA/strings.xml
rename to mediarouter/src/main/res/values-fr-rCA/strings.xml

mediarouter/src/main/res/values-fr/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-fr/strings.xml b/mediarouter/src/main/res/values-fr/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-fr/strings.xml
rename to mediarouter/src/main/res/values-fr/strings.xml

mediarouter/src/main/res/values-gl/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-gl/strings.xml b/mediarouter/src/main/res/values-gl/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-gl/strings.xml
rename to mediarouter/src/main/res/values-gl/strings.xml

mediarouter/src/main/res/values-gu/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-gu/strings.xml b/mediarouter/src/main/res/values-gu/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-gu/strings.xml
rename to mediarouter/src/main/res/values-gu/strings.xml

mediarouter/src/main/res/values-hi/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-hi/strings.xml b/mediarouter/src/main/res/values-hi/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-hi/strings.xml
rename to mediarouter/src/main/res/values-hi/strings.xml

mediarouter/src/main/res/values-hr/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-hr/strings.xml b/mediarouter/src/main/res/values-hr/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-hr/strings.xml
rename to mediarouter/src/main/res/values-hr/strings.xml

mediarouter/src/main/res/values-hu/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-hu/strings.xml b/mediarouter/src/main/res/values-hu/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-hu/strings.xml
rename to mediarouter/src/main/res/values-hu/strings.xml

mediarouter/src/main/res/values-hy/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-hy/strings.xml b/mediarouter/src/main/res/values-hy/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-hy/strings.xml
rename to mediarouter/src/main/res/values-hy/strings.xml

mediarouter/src/main/res/values-in/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-in/strings.xml b/mediarouter/src/main/res/values-in/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-in/strings.xml
rename to mediarouter/src/main/res/values-in/strings.xml

mediarouter/src/main/res/values-is/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-is/strings.xml b/mediarouter/src/main/res/values-is/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-is/strings.xml
rename to mediarouter/src/main/res/values-is/strings.xml

mediarouter/src/main/res/values-it/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-it/strings.xml b/mediarouter/src/main/res/values-it/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-it/strings.xml
rename to mediarouter/src/main/res/values-it/strings.xml

mediarouter/src/main/res/values-iw/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-iw/strings.xml b/mediarouter/src/main/res/values-iw/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-iw/strings.xml
rename to mediarouter/src/main/res/values-iw/strings.xml

mediarouter/src/main/res/values-ja/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ja/strings.xml b/mediarouter/src/main/res/values-ja/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ja/strings.xml
rename to mediarouter/src/main/res/values-ja/strings.xml

mediarouter/src/main/res/values-ka/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ka/strings.xml b/mediarouter/src/main/res/values-ka/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ka/strings.xml
rename to mediarouter/src/main/res/values-ka/strings.xml

mediarouter/src/main/res/values-kk/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-kk/strings.xml b/mediarouter/src/main/res/values-kk/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-kk/strings.xml
rename to mediarouter/src/main/res/values-kk/strings.xml

mediarouter/src/main/res/values-km/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-km/strings.xml b/mediarouter/src/main/res/values-km/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-km/strings.xml
rename to mediarouter/src/main/res/values-km/strings.xml

mediarouter/src/main/res/values-kn/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-kn/strings.xml b/mediarouter/src/main/res/values-kn/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-kn/strings.xml
rename to mediarouter/src/main/res/values-kn/strings.xml

mediarouter/src/main/res/values-ko/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ko/strings.xml b/mediarouter/src/main/res/values-ko/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ko/strings.xml
rename to mediarouter/src/main/res/values-ko/strings.xml

mediarouter/src/main/res/values-ky/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ky/strings.xml b/mediarouter/src/main/res/values-ky/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ky/strings.xml
rename to mediarouter/src/main/res/values-ky/strings.xml

mediarouter/src/main/res/values-land/dimens.xml

diff --git a/v7/mediarouter/src/main/res/values-land/dimens.xml b/mediarouter/src/main/res/values-land/dimens.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-land/dimens.xml
rename to mediarouter/src/main/res/values-land/dimens.xml

mediarouter/src/main/res/values-lo/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-lo/strings.xml b/mediarouter/src/main/res/values-lo/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-lo/strings.xml
rename to mediarouter/src/main/res/values-lo/strings.xml

mediarouter/src/main/res/values-lt/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-lt/strings.xml b/mediarouter/src/main/res/values-lt/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-lt/strings.xml
rename to mediarouter/src/main/res/values-lt/strings.xml

mediarouter/src/main/res/values-lv/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-lv/strings.xml b/mediarouter/src/main/res/values-lv/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-lv/strings.xml
rename to mediarouter/src/main/res/values-lv/strings.xml

mediarouter/src/main/res/values-mk/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-mk/strings.xml b/mediarouter/src/main/res/values-mk/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-mk/strings.xml
rename to mediarouter/src/main/res/values-mk/strings.xml

mediarouter/src/main/res/values-ml/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ml/strings.xml b/mediarouter/src/main/res/values-ml/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ml/strings.xml
rename to mediarouter/src/main/res/values-ml/strings.xml

mediarouter/src/main/res/values-mn/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-mn/strings.xml b/mediarouter/src/main/res/values-mn/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-mn/strings.xml
rename to mediarouter/src/main/res/values-mn/strings.xml

mediarouter/src/main/res/values-mr/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-mr/strings.xml b/mediarouter/src/main/res/values-mr/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-mr/strings.xml
rename to mediarouter/src/main/res/values-mr/strings.xml

mediarouter/src/main/res/values-ms/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ms/strings.xml b/mediarouter/src/main/res/values-ms/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ms/strings.xml
rename to mediarouter/src/main/res/values-ms/strings.xml

mediarouter/src/main/res/values-my/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-my/strings.xml b/mediarouter/src/main/res/values-my/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-my/strings.xml
rename to mediarouter/src/main/res/values-my/strings.xml

mediarouter/src/main/res/values-nb/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-nb/strings.xml b/mediarouter/src/main/res/values-nb/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-nb/strings.xml
rename to mediarouter/src/main/res/values-nb/strings.xml

mediarouter/src/main/res/values-ne/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ne/strings.xml b/mediarouter/src/main/res/values-ne/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ne/strings.xml
rename to mediarouter/src/main/res/values-ne/strings.xml

mediarouter/src/main/res/values-nl/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-nl/strings.xml b/mediarouter/src/main/res/values-nl/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-nl/strings.xml
rename to mediarouter/src/main/res/values-nl/strings.xml

mediarouter/src/main/res/values-pa/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-pa/strings.xml b/mediarouter/src/main/res/values-pa/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-pa/strings.xml
rename to mediarouter/src/main/res/values-pa/strings.xml

mediarouter/src/main/res/values-pl/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-pl/strings.xml b/mediarouter/src/main/res/values-pl/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-pl/strings.xml
rename to mediarouter/src/main/res/values-pl/strings.xml

mediarouter/src/main/res/values-pt-rBR/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-pt-rBR/strings.xml b/mediarouter/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-pt-rBR/strings.xml
rename to mediarouter/src/main/res/values-pt-rBR/strings.xml

mediarouter/src/main/res/values-pt-rPT/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-pt-rPT/strings.xml b/mediarouter/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-pt-rPT/strings.xml
rename to mediarouter/src/main/res/values-pt-rPT/strings.xml

mediarouter/src/main/res/values-pt/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-pt/strings.xml b/mediarouter/src/main/res/values-pt/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-pt/strings.xml
rename to mediarouter/src/main/res/values-pt/strings.xml

mediarouter/src/main/res/values-ro/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ro/strings.xml b/mediarouter/src/main/res/values-ro/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ro/strings.xml
rename to mediarouter/src/main/res/values-ro/strings.xml

mediarouter/src/main/res/values-ru/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ru/strings.xml b/mediarouter/src/main/res/values-ru/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ru/strings.xml
rename to mediarouter/src/main/res/values-ru/strings.xml

mediarouter/src/main/res/values-si/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-si/strings.xml b/mediarouter/src/main/res/values-si/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-si/strings.xml
rename to mediarouter/src/main/res/values-si/strings.xml

mediarouter/src/main/res/values-sk/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-sk/strings.xml b/mediarouter/src/main/res/values-sk/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sk/strings.xml
rename to mediarouter/src/main/res/values-sk/strings.xml

mediarouter/src/main/res/values-sl/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-sl/strings.xml b/mediarouter/src/main/res/values-sl/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sl/strings.xml
rename to mediarouter/src/main/res/values-sl/strings.xml

mediarouter/src/main/res/values-sq/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-sq/strings.xml b/mediarouter/src/main/res/values-sq/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sq/strings.xml
rename to mediarouter/src/main/res/values-sq/strings.xml

mediarouter/src/main/res/values-sr/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-sr/strings.xml b/mediarouter/src/main/res/values-sr/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sr/strings.xml
rename to mediarouter/src/main/res/values-sr/strings.xml

mediarouter/src/main/res/values-sv/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-sv/strings.xml b/mediarouter/src/main/res/values-sv/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sv/strings.xml
rename to mediarouter/src/main/res/values-sv/strings.xml

mediarouter/src/main/res/values-sw/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-sw/strings.xml b/mediarouter/src/main/res/values-sw/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sw/strings.xml
rename to mediarouter/src/main/res/values-sw/strings.xml

mediarouter/src/main/res/values-sw600dp/dimens.xml

diff --git a/v7/mediarouter/src/main/res/values-sw600dp/dimens.xml b/mediarouter/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sw600dp/dimens.xml
rename to mediarouter/src/main/res/values-sw600dp/dimens.xml

mediarouter/src/main/res/values-sw720dp/dimens.xml

diff --git a/v7/mediarouter/src/main/res/values-sw720dp/dimens.xml b/mediarouter/src/main/res/values-sw720dp/dimens.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-sw720dp/dimens.xml
rename to mediarouter/src/main/res/values-sw720dp/dimens.xml

mediarouter/src/main/res/values-ta/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ta/strings.xml b/mediarouter/src/main/res/values-ta/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ta/strings.xml
rename to mediarouter/src/main/res/values-ta/strings.xml

mediarouter/src/main/res/values-te/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-te/strings.xml b/mediarouter/src/main/res/values-te/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-te/strings.xml
rename to mediarouter/src/main/res/values-te/strings.xml

mediarouter/src/main/res/values-th/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-th/strings.xml b/mediarouter/src/main/res/values-th/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-th/strings.xml
rename to mediarouter/src/main/res/values-th/strings.xml

mediarouter/src/main/res/values-tl/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-tl/strings.xml b/mediarouter/src/main/res/values-tl/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-tl/strings.xml
rename to mediarouter/src/main/res/values-tl/strings.xml

mediarouter/src/main/res/values-tr/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-tr/strings.xml b/mediarouter/src/main/res/values-tr/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-tr/strings.xml
rename to mediarouter/src/main/res/values-tr/strings.xml

mediarouter/src/main/res/values-uk/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-uk/strings.xml b/mediarouter/src/main/res/values-uk/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-uk/strings.xml
rename to mediarouter/src/main/res/values-uk/strings.xml

mediarouter/src/main/res/values-ur/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-ur/strings.xml b/mediarouter/src/main/res/values-ur/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-ur/strings.xml
rename to mediarouter/src/main/res/values-ur/strings.xml

mediarouter/src/main/res/values-uz/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-uz/strings.xml b/mediarouter/src/main/res/values-uz/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-uz/strings.xml
rename to mediarouter/src/main/res/values-uz/strings.xml

mediarouter/src/main/res/values-vi/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-vi/strings.xml b/mediarouter/src/main/res/values-vi/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-vi/strings.xml
rename to mediarouter/src/main/res/values-vi/strings.xml

mediarouter/src/main/res/values-zh-rCN/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-zh-rCN/strings.xml b/mediarouter/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-zh-rCN/strings.xml
rename to mediarouter/src/main/res/values-zh-rCN/strings.xml

mediarouter/src/main/res/values-zh-rHK/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-zh-rHK/strings.xml b/mediarouter/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-zh-rHK/strings.xml
rename to mediarouter/src/main/res/values-zh-rHK/strings.xml

mediarouter/src/main/res/values-zh-rTW/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-zh-rTW/strings.xml b/mediarouter/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-zh-rTW/strings.xml
rename to mediarouter/src/main/res/values-zh-rTW/strings.xml

mediarouter/src/main/res/values-zu/strings.xml

diff --git a/v7/mediarouter/src/main/res/values-zu/strings.xml b/mediarouter/src/main/res/values-zu/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values-zu/strings.xml
rename to mediarouter/src/main/res/values-zu/strings.xml

mediarouter/src/main/res/values/attrs.xml

diff --git a/v7/mediarouter/src/main/res/values/attrs.xml b/mediarouter/src/main/res/values/attrs.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values/attrs.xml
rename to mediarouter/src/main/res/values/attrs.xml

mediarouter/src/main/res/values/dimens.xml

diff --git a/v7/mediarouter/src/main/res/values/dimens.xml b/mediarouter/src/main/res/values/dimens.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values/dimens.xml
rename to mediarouter/src/main/res/values/dimens.xml

mediarouter/src/main/res/values/strings.xml

diff --git a/v7/mediarouter/src/main/res/values/strings.xml b/mediarouter/src/main/res/values/strings.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values/strings.xml
rename to mediarouter/src/main/res/values/strings.xml

mediarouter/src/main/res/values/styles.xml

diff --git a/v7/mediarouter/src/main/res/values/styles.xml b/mediarouter/src/main/res/values/styles.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values/styles.xml
rename to mediarouter/src/main/res/values/styles.xml

mediarouter/src/main/res/values/themes.xml

diff --git a/v7/mediarouter/src/main/res/values/themes.xml b/mediarouter/src/main/res/values/themes.xml
similarity index 100%
rename from v7/mediarouter/src/main/res/values/themes.xml
rename to mediarouter/src/main/res/values/themes.xml

palette/api/current.txt

diff --git a/v7/palette/api/current.txt b/palette/api/current.txt
similarity index 100%
rename from v7/palette/api/current.txt
rename to palette/api/current.txt

palette/api_legacy/26.0.0.txt

diff --git a/v7/palette/api_legacy/26.0.0.txt b/palette/api_legacy/26.0.0.txt
similarity index 100%
rename from v7/palette/api_legacy/26.0.0.txt
rename to palette/api_legacy/26.0.0.txt

palette/api_legacy/26.1.0.txt

diff --git a/v7/palette/api_legacy/26.1.0.txt b/palette/api_legacy/26.1.0.txt
similarity index 100%
rename from v7/palette/api_legacy/26.1.0.txt
rename to palette/api_legacy/26.1.0.txt

palette/api_legacy/27.0.0.txt

diff --git a/v7/palette/api_legacy/27.0.0.txt b/palette/api_legacy/27.0.0.txt
similarity index 100%
rename from v7/palette/api_legacy/27.0.0.txt
rename to palette/api_legacy/27.0.0.txt

palette/api_legacy/27.1.0.txt

diff --git a/v7/palette/api_legacy/27.1.0.txt b/palette/api_legacy/27.1.0.txt
similarity index 100%
rename from v7/palette/api_legacy/27.1.0.txt
rename to palette/api_legacy/27.1.0.txt

palette/api_legacy/28.0.0-alpha1.txt

diff --git a/v7/palette/api_legacy/28.0.0-alpha1.txt b/palette/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v7/palette/api_legacy/28.0.0-alpha1.txt
rename to palette/api_legacy/28.0.0-alpha1.txt

palette/api_legacy/current.txt

diff --git a/v7/palette/api_legacy/current.txt b/palette/api_legacy/current.txt
similarity index 100%
rename from v7/palette/api_legacy/current.txt
rename to palette/api_legacy/current.txt

palette/build.gradle

diff --git a/v7/palette/build.gradle b/palette/build.gradle
similarity index 100%
rename from v7/palette/build.gradle
rename to palette/build.gradle

palette/src/androidTest/AndroidManifest.xml

diff --git a/v7/palette/src/androidTest/AndroidManifest.xml b/palette/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from v7/palette/src/androidTest/AndroidManifest.xml
rename to palette/src/androidTest/AndroidManifest.xml

palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java

diff --git a/v7/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java b/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
similarity index 100%
rename from v7/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
rename to palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java

palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java

diff --git a/v7/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java b/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
similarity index 100%
rename from v7/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
rename to palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java

palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java

diff --git a/v7/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java b/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
similarity index 100%
rename from v7/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
rename to palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java

palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java

diff --git a/v7/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java b/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
similarity index 100%
rename from v7/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
rename to palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java

palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java

diff --git a/v7/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
similarity index 100%
rename from v7/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
rename to palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java

palette/src/androidTest/res/drawable-nodpi/photo.jpg

diff --git a/v7/palette/src/androidTest/res/drawable-nodpi/photo.jpg b/palette/src/androidTest/res/drawable-nodpi/photo.jpg
similarity index 100%
rename from v7/palette/src/androidTest/res/drawable-nodpi/photo.jpg
rename to palette/src/androidTest/res/drawable-nodpi/photo.jpg
Binary files differ

palette/src/main/AndroidManifest.xml

diff --git a/v7/palette/src/main/AndroidManifest.xml b/palette/src/main/AndroidManifest.xml
similarity index 100%
rename from v7/palette/src/main/AndroidManifest.xml
rename to palette/src/main/AndroidManifest.xml

palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java

diff --git a/v7/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java b/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java
similarity index 100%
rename from v7/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java
rename to palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java

palette/src/main/java/androidx/palette/graphics/Palette.java

diff --git a/v7/palette/src/main/java/androidx/palette/graphics/Palette.java b/palette/src/main/java/androidx/palette/graphics/Palette.java
similarity index 100%
rename from v7/palette/src/main/java/androidx/palette/graphics/Palette.java
rename to palette/src/main/java/androidx/palette/graphics/Palette.java

palette/src/main/java/androidx/palette/graphics/Target.java

diff --git a/v7/palette/src/main/java/androidx/palette/graphics/Target.java b/palette/src/main/java/androidx/palette/graphics/Target.java
similarity index 100%
rename from v7/palette/src/main/java/androidx/palette/graphics/Target.java
rename to palette/src/main/java/androidx/palette/graphics/Target.java

preference/NOTICES.md

diff --git a/v7/preference/NOTICES.md b/preference/NOTICES.md
similarity index 100%
rename from v7/preference/NOTICES.md
rename to preference/NOTICES.md

preference/OWNERS

diff --git a/v7/preference/OWNERS b/preference/OWNERS
similarity index 100%
rename from v7/preference/OWNERS
rename to preference/OWNERS

preference/api/current.txt

diff --git a/v7/preference/api/current.txt b/preference/api/current.txt
similarity index 100%
rename from v7/preference/api/current.txt
rename to preference/api/current.txt

preference/api_legacy/26.0.0.txt

diff --git a/v7/preference/api_legacy/26.0.0.txt b/preference/api_legacy/26.0.0.txt
similarity index 100%
rename from v7/preference/api_legacy/26.0.0.txt
rename to preference/api_legacy/26.0.0.txt

preference/api_legacy/26.1.0.txt

diff --git a/v7/preference/api_legacy/26.1.0.txt b/preference/api_legacy/26.1.0.txt
similarity index 100%
rename from v7/preference/api_legacy/26.1.0.txt
rename to preference/api_legacy/26.1.0.txt

preference/api_legacy/27.0.0.txt

diff --git a/v7/preference/api_legacy/27.0.0.txt b/preference/api_legacy/27.0.0.txt
similarity index 100%
rename from v7/preference/api_legacy/27.0.0.txt
rename to preference/api_legacy/27.0.0.txt

preference/api_legacy/27.1.0.txt

diff --git a/v7/preference/api_legacy/27.1.0.txt b/preference/api_legacy/27.1.0.txt
similarity index 100%
rename from v7/preference/api_legacy/27.1.0.txt
rename to preference/api_legacy/27.1.0.txt

preference/api_legacy/28.0.0-alpha1.txt

diff --git a/v7/preference/api_legacy/28.0.0-alpha1.txt b/preference/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from v7/preference/api_legacy/28.0.0-alpha1.txt
rename to preference/api_legacy/28.0.0-alpha1.txt

preference/api_legacy/current.txt

diff --git a/v7/preference/api_legacy/current.txt b/preference/api_legacy/current.txt
similarity index 100%
rename from v7/preference/api_legacy/current.txt
rename to preference/api_legacy/current.txt

preference/build.gradle

diff --git a/v7/preference/build.gradle b/preference/build.gradle
similarity index 100%
rename from v7/preference/build.gradle
rename to preference/build.gradle

preference/lint-baseline.xml

diff --git a/v7/preference/lint-baseline.xml b/preference/lint-baseline.xml
similarity index 100%
rename from v7/preference/lint-baseline.xml
rename to preference/lint-baseline.xml

preference/proguard-rules.pro

diff --git a/v7/preference/proguard-rules.pro b/preference/proguard-rules.pro
similarity index 100%
rename from v7/preference/proguard-rules.pro
rename to preference/proguard-rules.pro

preference/res-public/values/public_attrs.xml

diff --git a/v7/preference/res-public/values/public_attrs.xml b/preference/res-public/values/public_attrs.xml
similarity index 100%
rename from v7/preference/res-public/values/public_attrs.xml
rename to preference/res-public/values/public_attrs.xml

preference/res-public/values/public_styles.xml

diff --git a/v7/preference/res-public/values/public_styles.xml b/preference/res-public/values/public_styles.xml
similarity index 100%
rename from v7/preference/res-public/values/public_styles.xml
rename to preference/res-public/values/public_styles.xml

preference/res-public/values/public_themes.xml

diff --git a/v7/preference/res-public/values/public_themes.xml b/preference/res-public/values/public_themes.xml
similarity index 100%
rename from v7/preference/res-public/values/public_themes.xml
rename to preference/res-public/values/public_themes.xml

preference/res/drawable-v21/ic_arrow_down_24dp.xml

diff --git a/v7/preference/res/drawable-v21/ic_arrow_down_24dp.xml b/preference/res/drawable-v21/ic_arrow_down_24dp.xml
similarity index 100%
rename from v7/preference/res/drawable-v21/ic_arrow_down_24dp.xml
rename to preference/res/drawable-v21/ic_arrow_down_24dp.xml

preference/res/drawable-v21/preference_list_divider_material.xml

diff --git a/v7/preference/res/drawable-v21/preference_list_divider_material.xml b/preference/res/drawable-v21/preference_list_divider_material.xml
similarity index 100%
rename from v7/preference/res/drawable-v21/preference_list_divider_material.xml
rename to preference/res/drawable-v21/preference_list_divider_material.xml

preference/res/drawable/ic_arrow_down_24dp.xml

diff --git a/v7/preference/res/drawable/ic_arrow_down_24dp.xml b/preference/res/drawable/ic_arrow_down_24dp.xml
similarity index 100%
rename from v7/preference/res/drawable/ic_arrow_down_24dp.xml
rename to preference/res/drawable/ic_arrow_down_24dp.xml

preference/res/drawable/preference_list_divider_material.xml

diff --git a/v7/preference/res/drawable/preference_list_divider_material.xml b/preference/res/drawable/preference_list_divider_material.xml
similarity index 100%
rename from v7/preference/res/drawable/preference_list_divider_material.xml
rename to preference/res/drawable/preference_list_divider_material.xml

preference/res/layout-v17/preference_category_material.xml

diff --git a/v7/preference/res/layout-v17/preference_category_material.xml b/preference/res/layout-v17/preference_category_material.xml
similarity index 100%
rename from v7/preference/res/layout-v17/preference_category_material.xml
rename to preference/res/layout-v17/preference_category_material.xml

preference/res/layout-v17/preference_dropdown_material.xml

diff --git a/v7/preference/res/layout-v17/preference_dropdown_material.xml b/preference/res/layout-v17/preference_dropdown_material.xml
similarity index 100%
rename from v7/preference/res/layout-v17/preference_dropdown_material.xml
rename to preference/res/layout-v17/preference_dropdown_material.xml

preference/res/layout-v17/preference_information_material.xml

diff --git a/v7/preference/res/layout-v17/preference_information_material.xml b/preference/res/layout-v17/preference_information_material.xml
similarity index 100%
rename from v7/preference/res/layout-v17/preference_information_material.xml
rename to preference/res/layout-v17/preference_information_material.xml

preference/res/layout-v17/preference_material.xml

diff --git a/v7/preference/res/layout-v17/preference_material.xml b/preference/res/layout-v17/preference_material.xml
similarity index 100%
rename from v7/preference/res/layout-v17/preference_material.xml
rename to preference/res/layout-v17/preference_material.xml

preference/res/layout-v21/preference_category_material.xml

diff --git a/v7/preference/res/layout-v21/preference_category_material.xml b/preference/res/layout-v21/preference_category_material.xml
similarity index 100%
rename from v7/preference/res/layout-v21/preference_category_material.xml
rename to preference/res/layout-v21/preference_category_material.xml

preference/res/layout-v21/preference_dropdown_material.xml

diff --git a/v7/preference/res/layout-v21/preference_dropdown_material.xml b/preference/res/layout-v21/preference_dropdown_material.xml
similarity index 100%
rename from v7/preference/res/layout-v21/preference_dropdown_material.xml
rename to preference/res/layout-v21/preference_dropdown_material.xml

preference/res/layout-v21/preference_information_material.xml

diff --git a/v7/preference/res/layout-v21/preference_information_material.xml b/preference/res/layout-v21/preference_information_material.xml
similarity index 100%
rename from v7/preference/res/layout-v21/preference_information_material.xml
rename to preference/res/layout-v21/preference_information_material.xml

preference/res/layout-v21/preference_material.xml

diff --git a/v7/preference/res/layout-v21/preference_material.xml b/preference/res/layout-v21/preference_material.xml
similarity index 100%
rename from v7/preference/res/layout-v21/preference_material.xml
rename to preference/res/layout-v21/preference_material.xml

preference/res/layout/expand_button.xml

diff --git a/v7/preference/res/layout/expand_button.xml b/preference/res/layout/expand_button.xml
similarity index 100%
rename from v7/preference/res/layout/expand_button.xml
rename to preference/res/layout/expand_button.xml

preference/res/layout/preference.xml

diff --git a/v7/preference/res/layout/preference.xml b/preference/res/layout/preference.xml
similarity index 100%
rename from v7/preference/res/layout/preference.xml
rename to preference/res/layout/preference.xml

preference/res/layout/preference_category.xml

diff --git a/v7/preference/res/layout/preference_category.xml b/preference/res/layout/preference_category.xml
similarity index 100%
rename from v7/preference/res/layout/preference_category.xml
rename to preference/res/layout/preference_category.xml

preference/res/layout/preference_category_material.xml

diff --git a/v7/preference/res/layout/preference_category_material.xml b/preference/res/layout/preference_category_material.xml
similarity index 100%
rename from v7/preference/res/layout/preference_category_material.xml
rename to preference/res/layout/preference_category_material.xml

preference/res/layout/preference_dialog_edittext.xml

diff --git a/v7/preference/res/layout/preference_dialog_edittext.xml b/preference/res/layout/preference_dialog_edittext.xml
similarity index 100%
rename from v7/preference/res/layout/preference_dialog_edittext.xml
rename to preference/res/layout/preference_dialog_edittext.xml

preference/res/layout/preference_dropdown.xml

diff --git a/v7/preference/res/layout/preference_dropdown.xml b/preference/res/layout/preference_dropdown.xml
similarity index 100%
rename from v7/preference/res/layout/preference_dropdown.xml
rename to preference/res/layout/preference_dropdown.xml

preference/res/layout/preference_dropdown_material.xml

diff --git a/v7/preference/res/layout/preference_dropdown_material.xml b/preference/res/layout/preference_dropdown_material.xml
similarity index 100%
rename from v7/preference/res/layout/preference_dropdown_material.xml
rename to preference/res/layout/preference_dropdown_material.xml

preference/res/layout/preference_information.xml

diff --git a/v7/preference/res/layout/preference_information.xml b/preference/res/layout/preference_information.xml
similarity index 100%
rename from v7/preference/res/layout/preference_information.xml
rename to preference/res/layout/preference_information.xml

preference/res/layout/preference_information_material.xml

diff --git a/v7/preference/res/layout/preference_information_material.xml b/preference/res/layout/preference_information_material.xml
similarity index 100%
rename from v7/preference/res/layout/preference_information_material.xml
rename to preference/res/layout/preference_information_material.xml

preference/res/layout/preference_list_fragment.xml

diff --git a/v7/preference/res/layout/preference_list_fragment.xml b/preference/res/layout/preference_list_fragment.xml
similarity index 100%
rename from v7/preference/res/layout/preference_list_fragment.xml
rename to preference/res/layout/preference_list_fragment.xml

preference/res/layout/preference_material.xml

diff --git a/v7/preference/res/layout/preference_material.xml b/preference/res/layout/preference_material.xml
similarity index 100%
rename from v7/preference/res/layout/preference_material.xml
rename to preference/res/layout/preference_material.xml

preference/res/layout/preference_recyclerview.xml

diff --git a/v7/preference/res/layout/preference_recyclerview.xml b/preference/res/layout/preference_recyclerview.xml
similarity index 100%
rename from v7/preference/res/layout/preference_recyclerview.xml
rename to preference/res/layout/preference_recyclerview.xml

preference/res/layout/preference_widget_checkbox.xml

diff --git a/v7/preference/res/layout/preference_widget_checkbox.xml b/preference/res/layout/preference_widget_checkbox.xml
similarity index 100%
rename from v7/preference/res/layout/preference_widget_checkbox.xml
rename to preference/res/layout/preference_widget_checkbox.xml

preference/res/layout/preference_widget_seekbar.xml

diff --git a/v7/preference/res/layout/preference_widget_seekbar.xml b/preference/res/layout/preference_widget_seekbar.xml
similarity index 100%
rename from v7/preference/res/layout/preference_widget_seekbar.xml
rename to preference/res/layout/preference_widget_seekbar.xml

preference/res/layout/preference_widget_seekbar_material.xml

diff --git a/v7/preference/res/layout/preference_widget_seekbar_material.xml b/preference/res/layout/preference_widget_seekbar_material.xml
similarity index 100%
rename from v7/preference/res/layout/preference_widget_seekbar_material.xml
rename to preference/res/layout/preference_widget_seekbar_material.xml

preference/res/layout/preference_widget_switch.xml

diff --git a/v7/preference/res/layout/preference_widget_switch.xml b/preference/res/layout/preference_widget_switch.xml
similarity index 100%
rename from v7/preference/res/layout/preference_widget_switch.xml
rename to preference/res/layout/preference_widget_switch.xml

preference/res/layout/preference_widget_switch_compat.xml

diff --git a/v7/preference/res/layout/preference_widget_switch_compat.xml b/preference/res/layout/preference_widget_switch_compat.xml
similarity index 100%
rename from v7/preference/res/layout/preference_widget_switch_compat.xml
rename to preference/res/layout/preference_widget_switch_compat.xml

preference/res/values-af/strings.xml

diff --git a/v7/preference/res/values-af/strings.xml b/preference/res/values-af/strings.xml
similarity index 100%
rename from v7/preference/res/values-af/strings.xml
rename to preference/res/values-af/strings.xml

preference/res/values-am/strings.xml

diff --git a/v7/preference/res/values-am/strings.xml b/preference/res/values-am/strings.xml
similarity index 100%
rename from v7/preference/res/values-am/strings.xml
rename to preference/res/values-am/strings.xml

preference/res/values-ar/strings.xml

diff --git a/v7/preference/res/values-ar/strings.xml b/preference/res/values-ar/strings.xml
similarity index 100%
rename from v7/preference/res/values-ar/strings.xml
rename to preference/res/values-ar/strings.xml

preference/res/values-az/strings.xml

diff --git a/v7/preference/res/values-az/strings.xml b/preference/res/values-az/strings.xml
similarity index 100%
rename from v7/preference/res/values-az/strings.xml
rename to preference/res/values-az/strings.xml

preference/res/values-b+sr+Latn/strings.xml

diff --git a/v7/preference/res/values-b+sr+Latn/strings.xml b/preference/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from v7/preference/res/values-b+sr+Latn/strings.xml
rename to preference/res/values-b+sr+Latn/strings.xml

preference/res/values-be/strings.xml

diff --git a/v7/preference/res/values-be/strings.xml b/preference/res/values-be/strings.xml
similarity index 100%
rename from v7/preference/res/values-be/strings.xml
rename to preference/res/values-be/strings.xml

preference/res/values-bg/strings.xml

diff --git a/v7/preference/res/values-bg/strings.xml b/preference/res/values-bg/strings.xml
similarity index 100%
rename from v7/preference/res/values-bg/strings.xml
rename to preference/res/values-bg/strings.xml

preference/res/values-bn/strings.xml

diff --git a/v7/preference/res/values-bn/strings.xml b/preference/res/values-bn/strings.xml
similarity index 100%
rename from v7/preference/res/values-bn/strings.xml
rename to preference/res/values-bn/strings.xml

preference/res/values-bs/strings.xml

diff --git a/v7/preference/res/values-bs/strings.xml b/preference/res/values-bs/strings.xml
similarity index 100%
rename from v7/preference/res/values-bs/strings.xml
rename to preference/res/values-bs/strings.xml

preference/res/values-ca/strings.xml

diff --git a/v7/preference/res/values-ca/strings.xml b/preference/res/values-ca/strings.xml
similarity index 100%
rename from v7/preference/res/values-ca/strings.xml
rename to preference/res/values-ca/strings.xml

preference/res/values-cs/strings.xml

diff --git a/v7/preference/res/values-cs/strings.xml b/preference/res/values-cs/strings.xml
similarity index 100%
rename from v7/preference/res/values-cs/strings.xml
rename to preference/res/values-cs/strings.xml

preference/res/values-da/strings.xml

diff --git a/v7/preference/res/values-da/strings.xml b/preference/res/values-da/strings.xml
similarity index 100%
rename from v7/preference/res/values-da/strings.xml
rename to preference/res/values-da/strings.xml

preference/res/values-de/strings.xml

diff --git a/v7/preference/res/values-de/strings.xml b/preference/res/values-de/strings.xml
similarity index 100%
rename from v7/preference/res/values-de/strings.xml
rename to preference/res/values-de/strings.xml

preference/res/values-el/strings.xml

diff --git a/v7/preference/res/values-el/strings.xml b/preference/res/values-el/strings.xml
similarity index 100%
rename from v7/preference/res/values-el/strings.xml
rename to preference/res/values-el/strings.xml

preference/res/values-en-rAU/strings.xml

diff --git a/v7/preference/res/values-en-rAU/strings.xml b/preference/res/values-en-rAU/strings.xml
similarity index 100%
rename from v7/preference/res/values-en-rAU/strings.xml
rename to preference/res/values-en-rAU/strings.xml

preference/res/values-en-rCA/strings.xml

diff --git a/v7/preference/res/values-en-rCA/strings.xml b/preference/res/values-en-rCA/strings.xml
similarity index 100%
rename from v7/preference/res/values-en-rCA/strings.xml
rename to preference/res/values-en-rCA/strings.xml

preference/res/values-en-rGB/strings.xml

diff --git a/v7/preference/res/values-en-rGB/strings.xml b/preference/res/values-en-rGB/strings.xml
similarity index 100%
rename from v7/preference/res/values-en-rGB/strings.xml
rename to preference/res/values-en-rGB/strings.xml

preference/res/values-en-rIN/strings.xml

diff --git a/v7/preference/res/values-en-rIN/strings.xml b/preference/res/values-en-rIN/strings.xml
similarity index 100%
rename from v7/preference/res/values-en-rIN/strings.xml
rename to preference/res/values-en-rIN/strings.xml

preference/res/values-en-rXC/strings.xml

diff --git a/v7/preference/res/values-en-rXC/strings.xml b/preference/res/values-en-rXC/strings.xml
similarity index 100%
rename from v7/preference/res/values-en-rXC/strings.xml
rename to preference/res/values-en-rXC/strings.xml

preference/res/values-es-rUS/strings.xml

diff --git a/v7/preference/res/values-es-rUS/strings.xml b/preference/res/values-es-rUS/strings.xml
similarity index 100%
rename from v7/preference/res/values-es-rUS/strings.xml
rename to preference/res/values-es-rUS/strings.xml

preference/res/values-es/strings.xml

diff --git a/v7/preference/res/values-es/strings.xml b/preference/res/values-es/strings.xml
similarity index 100%
rename from v7/preference/res/values-es/strings.xml
rename to preference/res/values-es/strings.xml

preference/res/values-et/strings.xml

diff --git a/v7/preference/res/values-et/strings.xml b/preference/res/values-et/strings.xml
similarity index 100%
rename from v7/preference/res/values-et/strings.xml
rename to preference/res/values-et/strings.xml

preference/res/values-eu/strings.xml

diff --git a/v7/preference/res/values-eu/strings.xml b/preference/res/values-eu/strings.xml
similarity index 100%
rename from v7/preference/res/values-eu/strings.xml
rename to preference/res/values-eu/strings.xml

preference/res/values-fa/strings.xml

diff --git a/v7/preference/res/values-fa/strings.xml b/preference/res/values-fa/strings.xml
similarity index 100%
rename from v7/preference/res/values-fa/strings.xml
rename to preference/res/values-fa/strings.xml

preference/res/values-fi/strings.xml

diff --git a/v7/preference/res/values-fi/strings.xml b/preference/res/values-fi/strings.xml
similarity index 100%
rename from v7/preference/res/values-fi/strings.xml
rename to preference/res/values-fi/strings.xml

preference/res/values-fr-rCA/strings.xml

diff --git a/v7/preference/res/values-fr-rCA/strings.xml b/preference/res/values-fr-rCA/strings.xml
similarity index 100%
rename from v7/preference/res/values-fr-rCA/strings.xml
rename to preference/res/values-fr-rCA/strings.xml

preference/res/values-fr/strings.xml

diff --git a/v7/preference/res/values-fr/strings.xml b/preference/res/values-fr/strings.xml
similarity index 100%
rename from v7/preference/res/values-fr/strings.xml
rename to preference/res/values-fr/strings.xml

preference/res/values-gl/strings.xml

diff --git a/v7/preference/res/values-gl/strings.xml b/preference/res/values-gl/strings.xml
similarity index 100%
rename from v7/preference/res/values-gl/strings.xml
rename to preference/res/values-gl/strings.xml

preference/res/values-gu/strings.xml

diff --git a/v7/preference/res/values-gu/strings.xml b/preference/res/values-gu/strings.xml
similarity index 100%
rename from v7/preference/res/values-gu/strings.xml
rename to preference/res/values-gu/strings.xml

preference/res/values-hi/strings.xml

diff --git a/v7/preference/res/values-hi/strings.xml b/preference/res/values-hi/strings.xml
similarity index 100%
rename from v7/preference/res/values-hi/strings.xml
rename to preference/res/values-hi/strings.xml

preference/res/values-hr/strings.xml

diff --git a/v7/preference/res/values-hr/strings.xml b/preference/res/values-hr/strings.xml
similarity index 100%
rename from v7/preference/res/values-hr/strings.xml
rename to preference/res/values-hr/strings.xml

preference/res/values-hu/strings.xml

diff --git a/v7/preference/res/values-hu/strings.xml b/preference/res/values-hu/strings.xml
similarity index 100%
rename from v7/preference/res/values-hu/strings.xml
rename to preference/res/values-hu/strings.xml

preference/res/values-hy/strings.xml

diff --git a/v7/preference/res/values-hy/strings.xml b/preference/res/values-hy/strings.xml
similarity index 100%
rename from v7/preference/res/values-hy/strings.xml
rename to preference/res/values-hy/strings.xml

preference/res/values-in/strings.xml

diff --git a/v7/preference/res/values-in/strings.xml b/preference/res/values-in/strings.xml
similarity index 100%
rename from v7/preference/res/values-in/strings.xml
rename to preference/res/values-in/strings.xml

preference/res/values-is/strings.xml

diff --git a/v7/preference/res/values-is/strings.xml b/preference/res/values-is/strings.xml
similarity index 100%
rename from v7/preference/res/values-is/strings.xml
rename to preference/res/values-is/strings.xml

preference/res/values-it/strings.xml

diff --git a/v7/preference/res/values-it/strings.xml b/preference/res/values-it/strings.xml
similarity index 100%
rename from v7/preference/res/values-it/strings.xml
rename to preference/res/values-it/strings.xml

preference/res/values-iw/strings.xml

diff --git a/v7/preference/res/values-iw/strings.xml b/preference/res/values-iw/strings.xml
similarity index 100%
rename from v7/preference/res/values-iw/strings.xml
rename to preference/res/values-iw/strings.xml

preference/res/values-ja/strings.xml

diff --git a/v7/preference/res/values-ja/strings.xml b/preference/res/values-ja/strings.xml
similarity index 100%
rename from v7/preference/res/values-ja/strings.xml
rename to preference/res/values-ja/strings.xml

preference/res/values-ka/strings.xml

diff --git a/v7/preference/res/values-ka/strings.xml b/preference/res/values-ka/strings.xml
similarity index 100%
rename from v7/preference/res/values-ka/strings.xml
rename to preference/res/values-ka/strings.xml

preference/res/values-kk/strings.xml

diff --git a/v7/preference/res/values-kk/strings.xml b/preference/res/values-kk/strings.xml
similarity index 100%
rename from v7/preference/res/values-kk/strings.xml
rename to preference/res/values-kk/strings.xml

preference/res/values-km/strings.xml

diff --git a/v7/preference/res/values-km/strings.xml b/preference/res/values-km/strings.xml
similarity index 100%
rename from v7/preference/res/values-km/strings.xml
rename to preference/res/values-km/strings.xml

preference/res/values-kn/strings.xml

diff --git a/v7/preference/res/values-kn/strings.xml b/preference/res/values-kn/strings.xml
similarity index 100%
rename from v7/preference/res/values-kn/strings.xml
rename to preference/res/values-kn/strings.xml

preference/res/values-ko/strings.xml

diff --git a/v7/preference/res/values-ko/strings.xml b/preference/res/values-ko/strings.xml
similarity index 100%
rename from v7/preference/res/values-ko/strings.xml
rename to preference/res/values-ko/strings.xml

preference/res/values-ky/strings.xml

diff --git a/v7/preference/res/values-ky/strings.xml b/preference/res/values-ky/strings.xml
similarity index 100%
rename from v7/preference/res/values-ky/strings.xml
rename to preference/res/values-ky/strings.xml

preference/res/values-lo/strings.xml

diff --git a/v7/preference/res/values-lo/strings.xml b/preference/res/values-lo/strings.xml
similarity index 100%
rename from v7/preference/res/values-lo/strings.xml
rename to preference/res/values-lo/strings.xml

preference/res/values-lt/strings.xml

diff --git a/v7/preference/res/values-lt/strings.xml b/preference/res/values-lt/strings.xml
similarity index 100%
rename from v7/preference/res/values-lt/strings.xml
rename to preference/res/values-lt/strings.xml

preference/res/values-lv/strings.xml

diff --git a/v7/preference/res/values-lv/strings.xml b/preference/res/values-lv/strings.xml
similarity index 100%
rename from v7/preference/res/values-lv/strings.xml
rename to preference/res/values-lv/strings.xml

preference/res/values-mk/strings.xml

diff --git a/v7/preference/res/values-mk/strings.xml b/preference/res/values-mk/strings.xml
similarity index 100%
rename from v7/preference/res/values-mk/strings.xml
rename to preference/res/values-mk/strings.xml

preference/res/values-ml/strings.xml

diff --git a/v7/preference/res/values-ml/strings.xml b/preference/res/values-ml/strings.xml
similarity index 100%
rename from v7/preference/res/values-ml/strings.xml
rename to preference/res/values-ml/strings.xml

preference/res/values-mn/strings.xml

diff --git a/v7/preference/res/values-mn/strings.xml b/preference/res/values-mn/strings.xml
similarity index 100%
rename from v7/preference/res/values-mn/strings.xml
rename to preference/res/values-mn/strings.xml

preference/res/values-mr/strings.xml

diff --git a/v7/preference/res/values-mr/strings.xml b/preference/res/values-mr/strings.xml
similarity index 100%
rename from v7/preference/res/values-mr/strings.xml
rename to preference/res/values-mr/strings.xml

preference/res/values-ms/strings.xml

diff --git a/v7/preference/res/values-ms/strings.xml b/preference/res/values-ms/strings.xml
similarity index 100%
rename from v7/preference/res/values-ms/strings.xml
rename to preference/res/values-ms/strings.xml

preference/res/values-my/strings.xml

diff --git a/v7/preference/res/values-my/strings.xml b/preference/res/values-my/strings.xml
similarity index 100%
rename from v7/preference/res/values-my/strings.xml
rename to preference/res/values-my/strings.xml

preference/res/values-nb/strings.xml

diff --git a/v7/preference/res/values-nb/strings.xml b/preference/res/values-nb/strings.xml
similarity index 100%
rename from v7/preference/res/values-nb/strings.xml
rename to preference/res/values-nb/strings.xml

preference/res/values-ne/strings.xml

diff --git a/v7/preference/res/values-ne/strings.xml b/preference/res/values-ne/strings.xml
similarity index 100%
rename from v7/preference/res/values-ne/strings.xml
rename to preference/res/values-ne/strings.xml

preference/res/values-nl/strings.xml

diff --git a/v7/preference/res/values-nl/strings.xml b/preference/res/values-nl/strings.xml
similarity index 100%
rename from v7/preference/res/values-nl/strings.xml
rename to preference/res/values-nl/strings.xml

preference/res/values-pa/strings.xml

diff --git a/v7/preference/res/values-pa/strings.xml b/preference/res/values-pa/strings.xml
similarity index 100%
rename from v7/preference/res/values-pa/strings.xml
rename to preference/res/values-pa/strings.xml

preference/res/values-pl/strings.xml

diff --git a/v7/preference/res/values-pl/strings.xml b/preference/res/values-pl/strings.xml
similarity index 100%
rename from v7/preference/res/values-pl/strings.xml
rename to preference/res/values-pl/strings.xml

preference/res/values-pt-rBR/strings.xml

diff --git a/v7/preference/res/values-pt-rBR/strings.xml b/preference/res/values-pt-rBR/strings.xml
similarity index 100%
rename from v7/preference/res/values-pt-rBR/strings.xml
rename to preference/res/values-pt-rBR/strings.xml

preference/res/values-pt-rPT/strings.xml

diff --git a/v7/preference/res/values-pt-rPT/strings.xml b/preference/res/values-pt-rPT/strings.xml
similarity index 100%
rename from v7/preference/res/values-pt-rPT/strings.xml
rename to preference/res/values-pt-rPT/strings.xml

preference/res/values-pt/strings.xml

diff --git a/v7/preference/res/values-pt/strings.xml b/preference/res/values-pt/strings.xml
similarity index 100%
rename from v7/preference/res/values-pt/strings.xml
rename to preference/res/values-pt/strings.xml

preference/res/values-ro/strings.xml

diff --git a/v7/preference/res/values-ro/strings.xml b/preference/res/values-ro/strings.xml
similarity index 100%
rename from v7/preference/res/values-ro/strings.xml
rename to preference/res/values-ro/strings.xml

preference/res/values-ru/strings.xml

diff --git a/v7/preference/res/values-ru/strings.xml b/preference/res/values-ru/strings.xml
similarity index 100%
rename from v7/preference/res/values-ru/strings.xml
rename to preference/res/values-ru/strings.xml

preference/res/values-si/strings.xml

diff --git a/v7/preference/res/values-si/strings.xml b/preference/res/values-si/strings.xml
similarity index 100%
rename from v7/preference/res/values-si/strings.xml
rename to preference/res/values-si/strings.xml

preference/res/values-sk/strings.xml

diff --git a/v7/preference/res/values-sk/strings.xml b/preference/res/values-sk/strings.xml
similarity index 100%
rename from v7/preference/res/values-sk/strings.xml
rename to preference/res/values-sk/strings.xml

preference/res/values-sl/strings.xml

diff --git a/v7/preference/res/values-sl/strings.xml b/preference/res/values-sl/strings.xml
similarity index 100%
rename from v7/preference/res/values-sl/strings.xml
rename to preference/res/values-sl/strings.xml

preference/res/values-sq/strings.xml

diff --git a/v7/preference/res/values-sq/strings.xml b/preference/res/values-sq/strings.xml
similarity index 100%
rename from v7/preference/res/values-sq/strings.xml
rename to preference/res/values-sq/strings.xml

preference/res/values-sr/strings.xml

diff --git a/v7/preference/res/values-sr/strings.xml b/preference/res/values-sr/strings.xml
similarity index 100%
rename from v7/preference/res/values-sr/strings.xml
rename to preference/res/values-sr/strings.xml

preference/res/values-sv/strings.xml

diff --git a/v7/preference/res/values-sv/strings.xml b/preference/res/values-sv/strings.xml
similarity index 100%
rename from v7/preference/res/values-sv/strings.xml
rename to preference/res/values-sv/strings.xml

preference/res/values-sw/strings.xml

diff --git a/v7/preference/res/values-sw/strings.xml b/preference/res/values-sw/strings.xml
similarity index 100%
rename from v7/preference/res/values-sw/strings.xml
rename to preference/res/values-sw/strings.xml

preference/res/values-ta/strings.xml

diff --git a/v7/preference/res/values-ta/strings.xml b/preference/res/values-ta/strings.xml
similarity index 100%
rename from v7/preference/res/values-ta/strings.xml
rename to preference/res/values-ta/strings.xml

preference/res/values-te/strings.xml

diff --git a/v7/preference/res/values-te/strings.xml b/preference/res/values-te/strings.xml
similarity index 100%
rename from v7/preference/res/values-te/strings.xml
rename to preference/res/values-te/strings.xml

preference/res/values-th/strings.xml

diff --git a/v7/preference/res/values-th/strings.xml b/preference/res/values-th/strings.xml
similarity index 100%
rename from v7/preference/res/values-th/strings.xml
rename to preference/res/values-th/strings.xml

preference/res/values-tl/strings.xml

diff --git a/v7/preference/res/values-tl/strings.xml b/preference/res/values-tl/strings.xml
similarity index 100%
rename from v7/preference/res/values-tl/strings.xml
rename to preference/res/values-tl/strings.xml

preference/res/values-tr/strings.xml

diff --git a/v7/preference/res/values-tr/strings.xml b/preference/res/values-tr/strings.xml
similarity index 100%
rename from v7/preference/res/values-tr/strings.xml
rename to preference/res/values-tr/strings.xml

preference/res/values-uk/strings.xml

diff --git a/v7/preference/res/values-uk/strings.xml b/preference/res/values-uk/strings.xml
similarity index 100%
rename from v7/preference/res/values-uk/strings.xml
rename to preference/res/values-uk/strings.xml

preference/res/values-ur/strings.xml

diff --git a/v7/preference/res/values-ur/strings.xml b/preference/res/values-ur/strings.xml
similarity index 100%
rename from v7/preference/res/values-ur/strings.xml
rename to preference/res/values-ur/strings.xml

preference/res/values-uz/strings.xml

diff --git a/v7/preference/res/values-uz/strings.xml b/preference/res/values-uz/strings.xml
similarity index 100%
rename from v7/preference/res/values-uz/strings.xml
rename to preference/res/values-uz/strings.xml

preference/res/values-v17/styles.xml

diff --git a/v7/preference/res/values-v17/styles.xml b/preference/res/values-v17/styles.xml
similarity index 100%
rename from v7/preference/res/values-v17/styles.xml
rename to preference/res/values-v17/styles.xml

preference/res/values-vi/strings.xml

diff --git a/v7/preference/res/values-vi/strings.xml b/preference/res/values-vi/strings.xml
similarity index 100%
rename from v7/preference/res/values-vi/strings.xml
rename to preference/res/values-vi/strings.xml

preference/res/values-zh-rCN/strings.xml

diff --git a/v7/preference/res/values-zh-rCN/strings.xml b/preference/res/values-zh-rCN/strings.xml
similarity index 100%
rename from v7/preference/res/values-zh-rCN/strings.xml
rename to preference/res/values-zh-rCN/strings.xml

preference/res/values-zh-rHK/strings.xml

diff --git a/v7/preference/res/values-zh-rHK/strings.xml b/preference/res/values-zh-rHK/strings.xml
similarity index 100%
rename from v7/preference/res/values-zh-rHK/strings.xml
rename to preference/res/values-zh-rHK/strings.xml

preference/res/values-zh-rTW/strings.xml

diff --git a/v7/preference/res/values-zh-rTW/strings.xml b/preference/res/values-zh-rTW/strings.xml
similarity index 100%
rename from v7/preference/res/values-zh-rTW/strings.xml
rename to preference/res/values-zh-rTW/strings.xml

preference/res/values-zu/strings.xml

diff --git a/v7/preference/res/values-zu/strings.xml b/preference/res/values-zu/strings.xml
similarity index 100%
rename from v7/preference/res/values-zu/strings.xml
rename to preference/res/values-zu/strings.xml

preference/res/values/attrs.xml

diff --git a/v7/preference/res/values/attrs.xml b/preference/res/values/attrs.xml
similarity index 100%
rename from v7/preference/res/values/attrs.xml
rename to preference/res/values/attrs.xml

preference/res/values/colors.xml

diff --git a/v7/preference/res/values/colors.xml b/preference/res/values/colors.xml
similarity index 100%
rename from v7/preference/res/values/colors.xml
rename to preference/res/values/colors.xml

preference/res/values/dimens.xml

diff --git a/v7/preference/res/values/dimens.xml b/preference/res/values/dimens.xml
similarity index 100%
rename from v7/preference/res/values/dimens.xml
rename to preference/res/values/dimens.xml

preference/res/values/strings.xml

diff --git a/v7/preference/res/values/strings.xml b/preference/res/values/strings.xml
similarity index 100%
rename from v7/preference/res/values/strings.xml
rename to preference/res/values/strings.xml

preference/res/values/styles.xml

diff --git a/v7/preference/res/values/styles.xml b/preference/res/values/styles.xml
similarity index 100%
rename from v7/preference/res/values/styles.xml
rename to preference/res/values/styles.xml

preference/res/values/themes.xml

diff --git a/v7/preference/res/values/themes.xml b/preference/res/values/themes.xml
similarity index 100%
rename from v7/preference/res/values/themes.xml
rename to preference/res/values/themes.xml

preference/src/androidTest/AndroidManifest.xml

diff --git a/v7/preference/src/androidTest/AndroidManifest.xml b/preference/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from v7/preference/src/androidTest/AndroidManifest.xml
rename to preference/src/androidTest/AndroidManifest.xml

preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java b/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java
rename to preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java

preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java

preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java

preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java

preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java

preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java

preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java

preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java b/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java
rename to preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java

preference/src/androidTest/java/androidx/preference/tests/helpers/PreferenceWrapper.java

diff --git a/v7/preference/src/androidTest/java/androidx/preference/tests/helpers/PreferenceWrapper.java b/preference/src/androidTest/java/androidx/preference/tests/helpers/PreferenceWrapper.java
similarity index 100%
rename from v7/preference/src/androidTest/java/androidx/preference/tests/helpers/PreferenceWrapper.java
rename to preference/src/androidTest/java/androidx/preference/tests/helpers/PreferenceWrapper.java

preference/src/androidTest/res/layout/test_visibility.xml

diff --git a/v7/preference/src/androidTest/res/layout/test_visibility.xml b/preference/src/androidTest/res/layout/test_visibility.xml
similarity index 100%
rename from v7/preference/src/androidTest/res/layout/test_visibility.xml
rename to preference/src/androidTest/res/layout/test_visibility.xml

preference/src/main/AndroidManifest.xml

diff --git a/v7/preference/src/main/AndroidManifest.xml b/preference/src/main/AndroidManifest.xml
similarity index 100%
rename from v7/preference/src/main/AndroidManifest.xml
rename to preference/src/main/AndroidManifest.xml

preference/src/main/java/androidx/preference/AndroidResources.java

diff --git a/v7/preference/src/main/java/androidx/preference/AndroidResources.java b/preference/src/main/java/androidx/preference/AndroidResources.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/AndroidResources.java
rename to preference/src/main/java/androidx/preference/AndroidResources.java

preference/src/main/java/androidx/preference/CheckBoxPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/CheckBoxPreference.java b/preference/src/main/java/androidx/preference/CheckBoxPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/CheckBoxPreference.java
rename to preference/src/main/java/androidx/preference/CheckBoxPreference.java

preference/src/main/java/androidx/preference/CollapsiblePreferenceGroupController.java

diff --git a/v7/preference/src/main/java/androidx/preference/CollapsiblePreferenceGroupController.java b/preference/src/main/java/androidx/preference/CollapsiblePreferenceGroupController.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/CollapsiblePreferenceGroupController.java
rename to preference/src/main/java/androidx/preference/CollapsiblePreferenceGroupController.java

preference/src/main/java/androidx/preference/DialogPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/DialogPreference.java b/preference/src/main/java/androidx/preference/DialogPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/DialogPreference.java
rename to preference/src/main/java/androidx/preference/DialogPreference.java

preference/src/main/java/androidx/preference/DropDownPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/DropDownPreference.java b/preference/src/main/java/androidx/preference/DropDownPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/DropDownPreference.java
rename to preference/src/main/java/androidx/preference/DropDownPreference.java

preference/src/main/java/androidx/preference/EditTextPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/EditTextPreference.java b/preference/src/main/java/androidx/preference/EditTextPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/EditTextPreference.java
rename to preference/src/main/java/androidx/preference/EditTextPreference.java

preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java

diff --git a/v7/preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java b/preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java
rename to preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java

preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java

diff --git a/v7/preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java b/preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java
rename to preference/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java

preference/src/main/java/androidx/preference/ListPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/ListPreference.java b/preference/src/main/java/androidx/preference/ListPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/ListPreference.java
rename to preference/src/main/java/androidx/preference/ListPreference.java

preference/src/main/java/androidx/preference/ListPreferenceDialogFragment.java

diff --git a/v7/preference/src/main/java/androidx/preference/ListPreferenceDialogFragment.java b/preference/src/main/java/androidx/preference/ListPreferenceDialogFragment.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/ListPreferenceDialogFragment.java
rename to preference/src/main/java/androidx/preference/ListPreferenceDialogFragment.java

preference/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java

diff --git a/v7/preference/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java b/preference/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java
rename to preference/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java

preference/src/main/java/androidx/preference/MultiSelectListPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/MultiSelectListPreference.java b/preference/src/main/java/androidx/preference/MultiSelectListPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/MultiSelectListPreference.java
rename to preference/src/main/java/androidx/preference/MultiSelectListPreference.java

preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java

diff --git a/v7/preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java b/preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java
rename to preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java

preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java

diff --git a/v7/preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java b/preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java
rename to preference/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java

preference/src/main/java/androidx/preference/Preference.java

diff --git a/v7/preference/src/main/java/androidx/preference/Preference.java b/preference/src/main/java/androidx/preference/Preference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/Preference.java
rename to preference/src/main/java/androidx/preference/Preference.java

preference/src/main/java/androidx/preference/PreferenceCategory.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceCategory.java b/preference/src/main/java/androidx/preference/PreferenceCategory.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceCategory.java
rename to preference/src/main/java/androidx/preference/PreferenceCategory.java

preference/src/main/java/androidx/preference/PreferenceDataStore.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceDataStore.java b/preference/src/main/java/androidx/preference/PreferenceDataStore.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceDataStore.java
rename to preference/src/main/java/androidx/preference/PreferenceDataStore.java

preference/src/main/java/androidx/preference/PreferenceDialogFragment.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java b/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java
rename to preference/src/main/java/androidx/preference/PreferenceDialogFragment.java

preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java b/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
rename to preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java

preference/src/main/java/androidx/preference/PreferenceFragment.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceFragment.java b/preference/src/main/java/androidx/preference/PreferenceFragment.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceFragment.java
rename to preference/src/main/java/androidx/preference/PreferenceFragment.java

preference/src/main/java/androidx/preference/PreferenceFragmentCompat.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceFragmentCompat.java b/preference/src/main/java/androidx/preference/PreferenceFragmentCompat.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceFragmentCompat.java
rename to preference/src/main/java/androidx/preference/PreferenceFragmentCompat.java

preference/src/main/java/androidx/preference/PreferenceGroup.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceGroup.java b/preference/src/main/java/androidx/preference/PreferenceGroup.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceGroup.java
rename to preference/src/main/java/androidx/preference/PreferenceGroup.java

preference/src/main/java/androidx/preference/PreferenceGroupAdapter.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceGroupAdapter.java b/preference/src/main/java/androidx/preference/PreferenceGroupAdapter.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceGroupAdapter.java
rename to preference/src/main/java/androidx/preference/PreferenceGroupAdapter.java

preference/src/main/java/androidx/preference/PreferenceInflater.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceInflater.java b/preference/src/main/java/androidx/preference/PreferenceInflater.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceInflater.java
rename to preference/src/main/java/androidx/preference/PreferenceInflater.java

preference/src/main/java/androidx/preference/PreferenceManager.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceManager.java b/preference/src/main/java/androidx/preference/PreferenceManager.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceManager.java
rename to preference/src/main/java/androidx/preference/PreferenceManager.java

preference/src/main/java/androidx/preference/PreferenceRecyclerViewAccessibilityDelegate.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceRecyclerViewAccessibilityDelegate.java b/preference/src/main/java/androidx/preference/PreferenceRecyclerViewAccessibilityDelegate.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceRecyclerViewAccessibilityDelegate.java
rename to preference/src/main/java/androidx/preference/PreferenceRecyclerViewAccessibilityDelegate.java

preference/src/main/java/androidx/preference/PreferenceScreen.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceScreen.java b/preference/src/main/java/androidx/preference/PreferenceScreen.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceScreen.java
rename to preference/src/main/java/androidx/preference/PreferenceScreen.java

preference/src/main/java/androidx/preference/PreferenceViewHolder.java

diff --git a/v7/preference/src/main/java/androidx/preference/PreferenceViewHolder.java b/preference/src/main/java/androidx/preference/PreferenceViewHolder.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/PreferenceViewHolder.java
rename to preference/src/main/java/androidx/preference/PreferenceViewHolder.java

preference/src/main/java/androidx/preference/SeekBarPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/SeekBarPreference.java b/preference/src/main/java/androidx/preference/SeekBarPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/SeekBarPreference.java
rename to preference/src/main/java/androidx/preference/SeekBarPreference.java

preference/src/main/java/androidx/preference/SwitchPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/SwitchPreference.java b/preference/src/main/java/androidx/preference/SwitchPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/SwitchPreference.java
rename to preference/src/main/java/androidx/preference/SwitchPreference.java

preference/src/main/java/androidx/preference/SwitchPreferenceCompat.java

diff --git a/v7/preference/src/main/java/androidx/preference/SwitchPreferenceCompat.java b/preference/src/main/java/androidx/preference/SwitchPreferenceCompat.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/SwitchPreferenceCompat.java
rename to preference/src/main/java/androidx/preference/SwitchPreferenceCompat.java

preference/src/main/java/androidx/preference/TwoStatePreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/TwoStatePreference.java b/preference/src/main/java/androidx/preference/TwoStatePreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/TwoStatePreference.java
rename to preference/src/main/java/androidx/preference/TwoStatePreference.java

preference/src/main/java/androidx/preference/UnPressableLinearLayout.java

diff --git a/v7/preference/src/main/java/androidx/preference/UnPressableLinearLayout.java b/preference/src/main/java/androidx/preference/UnPressableLinearLayout.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/UnPressableLinearLayout.java
rename to preference/src/main/java/androidx/preference/UnPressableLinearLayout.java

preference/src/main/java/androidx/preference/internal/AbstractMultiSelectListPreference.java

diff --git a/v7/preference/src/main/java/androidx/preference/internal/AbstractMultiSelectListPreference.java b/preference/src/main/java/androidx/preference/internal/AbstractMultiSelectListPreference.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/internal/AbstractMultiSelectListPreference.java
rename to preference/src/main/java/androidx/preference/internal/AbstractMultiSelectListPreference.java

preference/src/main/java/androidx/preference/internal/PreferenceImageView.java

diff --git a/v7/preference/src/main/java/androidx/preference/internal/PreferenceImageView.java b/preference/src/main/java/androidx/preference/internal/PreferenceImageView.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/internal/PreferenceImageView.java
rename to preference/src/main/java/androidx/preference/internal/PreferenceImageView.java

preference/src/main/java/androidx/preference/internal/package-info.java

diff --git a/v7/preference/src/main/java/androidx/preference/internal/package-info.java b/preference/src/main/java/androidx/preference/internal/package-info.java
similarity index 100%
rename from v7/preference/src/main/java/androidx/preference/internal/package-info.java
rename to preference/src/main/java/androidx/preference/internal/package-info.java

samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java

diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
index 211b65a..0901724 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
@@ -206,7 +206,8 @@
                     .addCell(cb -> cb
                         .addImage(Icon.createWithResource(getContext(), R.drawable.slices_4),
                                 LARGE_IMAGE))
-                    .addSeeMoreAction(getBroadcastIntent(ACTION_TOAST, "see your gallery")))
+                    .addSeeMoreAction(getBroadcastIntent(ACTION_TOAST, "see your gallery"))
+                    .setContentDescription("Images from your trip to Hawaii"))
                 .build();
     }
 
@@ -258,7 +259,8 @@
                 .addRow(rb
                         .setTitle("Mady Pitza")
                         .setSubtitle("Frequently contacted contact")
-                        .addEndItem(Icon.createWithResource(getContext(), R.drawable.mady)))
+                        .addEndItem(Icon.createWithResource(getContext(), R.drawable.mady),
+                                SMALL_IMAGE))
                 .addGrid(gb
                         .addCell(new GridBuilder.CellBuilder(gb)
                                 .addImage(Icon.createWithResource(getContext(), R.drawable.ic_call),
@@ -298,12 +300,14 @@
                         .setSummarySubtitle("Called " + lastCalledString)
                         .setPrimaryAction(primaryAction))
                 .addRow(b -> b
-                        .setTitleItem(Icon.createWithResource(getContext(), R.drawable.ic_call))
+                        .setTitleItem(Icon.createWithResource(getContext(), R.drawable.ic_call),
+                                ICON_IMAGE)
                         .setTitle("314-259-2653")
                         .setSubtitle("Call lasted 1 hr 17 min")
                         .addEndItem(lastCalled))
                 .addRow(b -> b
-                        .setTitleItem(Icon.createWithResource(getContext(), R.drawable.ic_text))
+                        .setTitleItem(Icon.createWithResource(getContext(), R.drawable.ic_text),
+                                ICON_IMAGE)
                         .setTitle("You: Coooooool see you then")
                         .addEndItem(System.currentTimeMillis() - 40 * DateUtils.MINUTE_IN_MILLIS))
                 .addAction(new SliceAction(getBroadcastIntent(ACTION_TOAST, "call"),
@@ -370,7 +374,8 @@
                 .addGrid(b -> b
                     .addCell(cb -> cb
                         .addImage(Icon.createWithResource(getContext(), R.drawable.reservation),
-                            LARGE_IMAGE)))
+                            LARGE_IMAGE)
+                        .setContentDescription("Image of your reservation in Seattle")))
                 .addGrid(b -> b
                     .addCell(cb -> cb
                         .addTitleText("Check In")
@@ -470,14 +475,18 @@
         boolean finalWifiEnabled = wifiEnabled;
         SliceAction primaryAction = new SliceAction(getIntent(Settings.ACTION_WIFI_SETTINGS),
                 Icon.createWithResource(getContext(), R.drawable.ic_wifi), "Wi-fi Settings");
+        String toggleCDString = wifiEnabled ? "Turn wifi off" : "Turn wifi on";
+        String sliceCDString = wifiEnabled ? "Wifi connected to " + state
+                : "Wifi disconnected, 10 networks available";
         ListBuilder lb = new ListBuilder(getContext(), sliceUri)
                 .setColor(0xff4285f4)
-                .addRow(b -> b
+                .setHeader(b -> b
                     .setTitle("Wi-fi")
                     .setSubtitle(state)
-                    .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED, null),
-                            "Toggle wifi", finalWifiEnabled))
-                    .setPrimaryAction(primaryAction));
+                    .setContentDescription(sliceCDString)
+                    .setPrimaryAction(primaryAction))
+                .addAction((new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED, null),
+                        toggleCDString, finalWifiEnabled)));
 
         // Add fake wifi networks
         int[] wifiIcons = new int[] {R.drawable.ic_wifi_full, R.drawable.ic_wifi_low,
@@ -487,10 +496,14 @@
             Icon icon = Icon.createWithResource(getContext(), iconId);
             final String networkName = "Network" + i;
             ListBuilder.RowBuilder rb = new ListBuilder.RowBuilder(lb);
-            rb.setTitleItem(icon, ICON_IMAGE).setTitle("Network" + networkName);
+            rb.setTitleItem(icon, ICON_IMAGE).setTitle(networkName);
             boolean locked = i % 3 == 0;
             if (locked) {
-                rb.addEndItem(Icon.createWithResource(getContext(), R.drawable.ic_lock));
+                rb.addEndItem(Icon.createWithResource(getContext(), R.drawable.ic_lock),
+                        ICON_IMAGE);
+                rb.setContentDescription("Connect to " + networkName + ", password needed");
+            } else {
+                rb.setContentDescription("Connect to " + networkName);
             }
             String message = locked ? "Open wifi password dialog" : "Connect to " + networkName;
             rb.setPrimaryAction(new SliceAction(getBroadcastIntent(ACTION_TOAST, message), icon,
@@ -502,7 +515,8 @@
         if (TEST_CUSTOM_SEE_MORE) {
             lb.addSeeMoreRow(rb -> rb
                     .setTitle("See all available networks")
-                    .addEndItem(Icon.createWithResource(getContext(), R.drawable.ic_right_caret))
+                    .addEndItem(Icon.createWithResource(getContext(), R.drawable.ic_right_caret),
+                            SMALL_IMAGE)
                     .setPrimaryAction(primaryAction));
         } else {
             lb.addSeeMoreAction(primaryAction.getAction());
@@ -518,7 +532,8 @@
                         .setThumb(Icon.createWithResource(getContext(), R.drawable.ic_star_on))
                         .setAction(getBroadcastIntent(ACTION_TOAST_RANGE_VALUE, null))
                         .setMax(5)
-                        .setValue(3))
+                        .setValue(3)
+                        .setContentDescription("Slider for star ratings"))
                 .build();
     }
 

samples/SupportWearDemos/src/main/AndroidManifest.xml

diff --git a/samples/SupportWearDemos/src/main/AndroidManifest.xml b/samples/SupportWearDemos/src/main/AndroidManifest.xml
index b70982b..88e7bcd 100644
--- a/samples/SupportWearDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportWearDemos/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
             android:theme="@android:style/Theme.DeviceDefault">
         <activity android:name=".app.SimpleWearableRecyclerViewDemo" />
         <activity android:name=".app.WearableSwitchDemo" />
+        <activity android:name=".app.ConfirmationOverlayDemo" />
         <activity android:name=".app.CircularProgressLayoutDemo" />
         <activity android:name=".app.RoundedDrawableDemo" />
         <activity android:name=".app.drawers.WearableDrawersDemo" android:exported="true" />

samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java

diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java
new file mode 100644
index 0000000..17d9902
--- /dev/null
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 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.
+ */
+
+package com.example.android.support.wear.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.example.android.support.wear.R;
+
+import androidx.wear.widget.ConfirmationOverlay;
+
+/** Main activity for the ConfirmationOverlay demo. */
+public class ConfirmationOverlayDemo extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.confirmation_overlay_demo);
+        final ViewGroup content = findViewById(R.id.content);
+        final ConfirmationOverlay overlay = new ConfirmationOverlay();
+
+        Button activityTrigger = findViewById(R.id.activity_overlay_button);
+        activityTrigger.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                overlay.showOn(ConfirmationOverlayDemo.this);
+            }
+        });
+
+        Button viewTrigger = findViewById(R.id.view_overlay_button);
+        viewTrigger.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                overlay.showAbove(content);
+            }
+        });
+    }
+}

samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java

diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java
index b5449f6..aef698d 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java
@@ -19,9 +19,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.wear.widget.WearableRecyclerView;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,6 +29,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.wear.widget.WearableRecyclerView;
+
 /**
  * Main activity for the wear demos.
  */
@@ -66,6 +67,8 @@
                 this, AmbientModeDemo.class));
         contentMap.put("Alert Dialog (v7)", new Intent(
                 this, AlertDialogDemo.class));
+        contentMap.put("Confirmation Overlay", new Intent(
+                this, ConfirmationOverlayDemo.class));
 
         return contentMap;
     }

samples/SupportWearDemos/src/main/res/layout/confirmation_overlay_demo.xml

diff --git a/samples/SupportWearDemos/src/main/res/layout/confirmation_overlay_demo.xml b/samples/SupportWearDemos/src/main/res/layout/confirmation_overlay_demo.xml
new file mode 100644
index 0000000..8d60781
--- /dev/null
+++ b/samples/SupportWearDemos/src/main/res/layout/confirmation_overlay_demo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/activity_overlay_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Overlay Activity"/>
+
+    <Button
+        android:id="@+id/view_overlay_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Overlay View"/>
+</LinearLayout>
+

settings.gradle

diff --git a/settings.gradle b/settings.gradle
index bb9333a..e085cb9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -37,8 +37,8 @@
 includeProject(":appcompat", "v7/appcompat")
 includeProject(":asynclayoutinflater", "asynclayoutinflater")
 includeProject(":car", "car")
-includeProject(":cardview", "v7/cardview")
-includeProject(":collection", "collections")
+includeProject(":cardview", "cardview")
+includeProject(":collection", "collection")
 includeProject(":coordinatorlayout", "coordinatorlayout")
 includeProject(":cursoradapter", "cursoradapter")
 includeProject(":browser", "customtabs")
@@ -46,7 +46,7 @@
 includeProject(":documentfile", "documentfile")
 includeProject(":drawerlayout", "drawerlayout")
 includeProject(":exifinterface", "exifinterface")
-includeProject(":gridlayout", "v7/gridlayout")
+includeProject(":gridlayout", "gridlayout")
 includeProject(":heifwriter", "heifwriter")
 includeProject(":interpolator", "interpolator")
 includeProject(":jetifier-core", "jetifier/jetifier/core")
@@ -56,11 +56,10 @@
 includeProject(":leanback", "leanback")
 includeProject(":loader", "loader")
 includeProject(":localbroadcastmanager", "localbroadcastmanager")
-includeProject(":mediarouter", "v7/mediarouter")
-includeProject(":palette", "v7/palette")
+includeProject(":mediarouter", "mediarouter")
+includeProject(":palette", "palette")
 includeProject(":percentlayout", "percent")
-includeProject(":preference", "v7/preference")
-includeProject(":legacy-preference-v14", "v14/preference")
+includeProject(":preference", "preference")
 includeProject(":leanback-preference", "preference-leanback")
 includeProject(":print", "print")
 includeProject(":recommendation", "recommendation")
@@ -73,8 +72,6 @@
 includeProject(":annotation", "annotations")
 includeProject(":core", "compat")
 includeProject(":contentpaging", "content")
-includeProject(":legacy-support-core-ui", "core-ui")
-includeProject(":legacy-support-core-utils", "core-utils")
 includeProject(":dynamicanimation", "dynamic-animation")
 includeProject(":emoji", "emoji/core")
 includeProject(":emoji-bundled", "emoji/bundled")
@@ -83,8 +80,6 @@
 includeProject(":media", "media-compat")
 includeProject(":tvprovider", "tv-provider")
 includeProject(":vectordrawable", "graphics/drawable/static")
-includeProject(":legacy-support-v4", "v4")
-includeProject(":legacy-support-v13", "v13")
 includeProject(":swiperefreshlayout", "swiperefreshlayout")
 includeProject(":textclassifier", "textclassifier")
 includeProject(":transition", "transition")
@@ -96,6 +91,18 @@
 
 /////////////////////////////
 //
+// Legacy
+//
+/////////////////////////////
+
+includeProject(":legacy-support-core-ui", "legacy/core-ui")
+includeProject(":legacy-support-core-utils", "legacy/core-utils")
+includeProject(":legacy-support-v4", "legacy/v4")
+includeProject(":legacy-support-v13", "legacy/v13")
+includeProject(":legacy-preference-v14", "legacy/preference-v14")
+
+/////////////////////////////
+//
 // Samples
 //
 /////////////////////////////

slices/builders/api/current.txt

diff --git a/slices/builders/api/current.txt b/slices/builders/api/current.txt
index 8d8a0c0..cc12c11 100644
--- a/slices/builders/api/current.txt
+++ b/slices/builders/api/current.txt
@@ -7,6 +7,7 @@
     method public androidx.slice.builders.GridBuilder addSeeMoreAction(android.app.PendingIntent);
     method public androidx.slice.builders.GridBuilder addSeeMoreCell(androidx.slice.builders.GridBuilder.CellBuilder);
     method public androidx.slice.builders.GridBuilder addSeeMoreCell(java.util.function.Consumer<androidx.slice.builders.GridBuilder.CellBuilder>);
+    method public androidx.slice.builders.GridBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.GridBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
     field public static final deprecated int ICON_IMAGE = 0; // 0x0
     field public static final deprecated int LARGE_IMAGE = 2; // 0x2
@@ -26,6 +27,7 @@
     method public androidx.slice.builders.GridBuilder.CellBuilder addText(java.lang.CharSequence, boolean);
     method public androidx.slice.builders.GridBuilder.CellBuilder addTitleText(java.lang.CharSequence);
     method public androidx.slice.builders.GridBuilder.CellBuilder addTitleText(java.lang.CharSequence, boolean);
+    method public androidx.slice.builders.GridBuilder.CellBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.GridBuilder.CellBuilder setContentIntent(android.app.PendingIntent);
   }
 
@@ -52,6 +54,7 @@
 
   public static class ListBuilder.HeaderBuilder extends androidx.slice.builders.TemplateSliceBuilder {
     ctor public ListBuilder.HeaderBuilder(androidx.slice.builders.ListBuilder);
+    method public androidx.slice.builders.ListBuilder.HeaderBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.HeaderBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
     method public androidx.slice.builders.ListBuilder.HeaderBuilder setSubtitle(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.HeaderBuilder setSubtitle(java.lang.CharSequence, boolean);
@@ -64,6 +67,7 @@
   public static class ListBuilder.InputRangeBuilder extends androidx.slice.builders.TemplateSliceBuilder {
     ctor public ListBuilder.InputRangeBuilder(androidx.slice.builders.ListBuilder);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setAction(android.app.PendingIntent);
+    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setMax(int);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setThumb(android.graphics.drawable.Icon);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setTitle(java.lang.CharSequence);
@@ -72,6 +76,7 @@
 
   public static class ListBuilder.RangeBuilder extends androidx.slice.builders.TemplateSliceBuilder {
     ctor public ListBuilder.RangeBuilder(androidx.slice.builders.ListBuilder);
+    method public androidx.slice.builders.ListBuilder.RangeBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.RangeBuilder setMax(int);
     method public androidx.slice.builders.ListBuilder.RangeBuilder setTitle(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.RangeBuilder setValue(int);
@@ -88,6 +93,7 @@
     method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(android.graphics.drawable.Icon, int, boolean);
     method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.slice.builders.SliceAction);
     method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.slice.builders.SliceAction, boolean);
+    method public androidx.slice.builders.ListBuilder.RowBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.RowBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
     method public androidx.slice.builders.ListBuilder.RowBuilder setSubtitle(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.RowBuilder setSubtitle(java.lang.CharSequence, boolean);

slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java
index 57a66b6..488d925 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java
@@ -22,13 +22,13 @@
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.Build;
+
+import java.util.function.Consumer;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
-
-import java.util.function.Consumer;
-
 import androidx.slice.builders.impl.TemplateBuilderImpl;
 
 
@@ -178,6 +178,15 @@
     }
 
     /**
+     * Sets the content description for the entire grid row.
+     */
+    @NonNull
+    public GridBuilder setContentDescription(@NonNull CharSequence description) {
+        mImpl.setContentDescription(description);
+        return this;
+    }
+
+    /**
      * @hide
      */
     @RestrictTo(LIBRARY)
@@ -381,5 +390,14 @@
             mImpl.setContentIntent(intent);
             return this;
         }
+
+        /**
+         * Sets the content description for this cell.
+         */
+        @NonNull
+        public CellBuilder setContentDescription(@NonNull CharSequence description) {
+            mImpl.setContentDescription(description);
+            return this;
+        }
     }
 }

slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
index 22645e1..4178040 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
@@ -356,6 +356,15 @@
             return this;
         }
 
+        /**
+         * Sets the content description.
+         */
+        @NonNull
+        public RangeBuilder setContentDescription(@NonNull CharSequence description) {
+            mImpl.setContentDescription(description);
+            return this;
+        }
+
         @Override
         void setImpl(TemplateBuilderImpl impl) {
             mImpl = (androidx.slice.builders.impl.ListBuilder.RangeBuilder) impl;
@@ -418,6 +427,15 @@
             return this;
         }
 
+        /**
+         * Sets the content description.
+         */
+        @NonNull
+        public InputRangeBuilder setContentDescription(@NonNull CharSequence description) {
+            mImpl.setContentDescription(description);
+            return this;
+        }
+
         @Override
         void setImpl(TemplateBuilderImpl impl) {
             mImpl = (androidx.slice.builders.impl.ListBuilder.InputRangeBuilder) impl;
@@ -774,6 +792,15 @@
             return this;
         }
 
+        /**
+         * Sets the content description for the row.
+         */
+        @NonNull
+        public RowBuilder setContentDescription(@NonNull CharSequence description) {
+            mImpl.setContentDescription(description);
+            return this;
+        }
+
         @Override
         void setImpl(TemplateBuilderImpl impl) {
             mImpl = (androidx.slice.builders.impl.ListBuilder.RowBuilder) impl;
@@ -879,6 +906,15 @@
             return this;
         }
 
+        /**
+         * Sets the content description for the header.
+         */
+        @NonNull
+        public HeaderBuilder setContentDescription(@NonNull CharSequence description) {
+            mImpl.setContentDescription(description);
+            return this;
+        }
+
         @Override
         void setImpl(TemplateBuilderImpl impl) {
             mImpl = (androidx.slice.builders.impl.ListBuilder.HeaderBuilder) impl;

slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java
index 8396f3f..99d5ce4 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java
@@ -21,10 +21,10 @@
 import android.app.PendingIntent;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-
 import androidx.slice.builders.SliceAction;
 
 /**
@@ -75,6 +75,11 @@
     void setPrimaryAction(SliceAction action);
 
     /**
+     * Sets the content description for the entire grid row.
+     */
+    void setContentDescription(CharSequence description);
+
+    /**
      */
     interface CellBuilder {
         /**
@@ -141,5 +146,10 @@
          */
         @NonNull
         void setContentIntent(@NonNull PendingIntent intent);
+
+        /**
+         * Sets the content description for this cell.
+         */
+        void setContentDescription(CharSequence description);
     }
 }

slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java
index 8f16753..96df99e 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java
@@ -21,10 +21,10 @@
 import android.app.PendingIntent;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-
 import androidx.slice.Slice;
 import androidx.slice.builders.SliceAction;
 
@@ -83,6 +83,12 @@
     /**
      */
     @Override
+    public void setContentDescription(CharSequence description) {
+    }
+
+    /**
+     */
+    @Override
     public void apply(Slice.Builder builder) {
 
     }
@@ -155,6 +161,12 @@
         /**
          */
         @Override
+        public void setContentDescription(CharSequence description) {
+        }
+
+        /**
+         */
+        @Override
         public void apply(Slice.Builder builder) {
 
         }

slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java
index 7920eb1..8dc89fe 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java
@@ -24,20 +24,21 @@
 import static android.app.slice.Slice.HINT_SEE_MORE;
 import static android.app.slice.Slice.HINT_SHORTCUT;
 import static android.app.slice.Slice.HINT_TITLE;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.app.slice.Slice.SUBTYPE_CONTENT_DESCRIPTION;
 
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
 import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
 import static androidx.slice.builders.ListBuilder.LARGE_IMAGE;
 
 import android.app.PendingIntent;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.slice.Slice;
 import androidx.slice.builders.SliceAction;
 
@@ -127,6 +128,13 @@
 
     /**
      */
+    @Override
+    public void setContentDescription(CharSequence description) {
+        getBuilder().addText(description, SUBTYPE_CONTENT_DESCRIPTION);
+    }
+
+    /**
+     */
     public static final class CellBuilder extends TemplateBuilderImpl implements
             GridBuilder.CellBuilder {
 
@@ -216,6 +224,13 @@
         }
 
         /**
+         */
+        @Override
+        public void setContentDescription(CharSequence description) {
+            getBuilder().addText(description, SUBTYPE_CONTENT_DESCRIPTION);
+        }
+
+        /**
          * @hide
          */
         @RestrictTo(LIBRARY)

slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
index 2e1128b..7f9a57e 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
@@ -139,6 +139,11 @@
          * Set the title.
          */
         void setTitle(@NonNull CharSequence title);
+
+        /**
+         * Sets the content description.
+         */
+        void setContentDescription(CharSequence description);
     }
 
     /**
@@ -280,6 +285,11 @@
          * until updated.
          */
         void addEndItem(SliceAction action, boolean isLoading);
+
+        /**
+         * Sets the content description for this row.
+         */
+        void setContentDescription(CharSequence description);
     }
 
 
@@ -310,6 +320,11 @@
          * Sets the action to invoke when the header is activated.
          */
         void setPrimaryAction(SliceAction action);
+
+        /**
+         * Sets the content description for the header.
+         */
+        void setContentDescription(CharSequence description);
     }
 }
 

slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
index d5def55..c8750bc 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
@@ -179,6 +179,13 @@
         /**
          */
         @Override
+        public void setContentDescription(CharSequence description) {
+
+        }
+
+        /**
+         */
+        @Override
         public void setTitleItem(long timeStamp) {
 
         }
@@ -323,5 +330,10 @@
         public void setPrimaryAction(SliceAction action) {
 
         }
+
+        @Override
+        public void setContentDescription(CharSequence description) {
+
+        }
     }
 }

slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java

diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
index 46128d1..778c54b 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
@@ -26,6 +26,7 @@
 import static android.app.slice.Slice.HINT_SUMMARY;
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.Slice.SUBTYPE_COLOR;
+import static android.app.slice.Slice.SUBTYPE_CONTENT_DESCRIPTION;
 import static android.app.slice.SliceItem.FORMAT_TEXT;
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
@@ -154,6 +155,7 @@
         private int mMax = 100;
         private int mValue = 0;
         private CharSequence mTitle;
+        private CharSequence mContentDescr;
 
         public RangeBuilderImpl(Slice.Builder sb) {
             super(sb, null);
@@ -175,10 +177,18 @@
         }
 
         @Override
+        public void setContentDescription(@NonNull CharSequence description) {
+            mContentDescr = description;
+        }
+
+        @Override
         public void apply(Slice.Builder builder) {
             if (mTitle != null) {
                 builder.addText(mTitle, null, HINT_TITLE);
             }
+            if (mContentDescr != null) {
+                builder.addText(mContentDescr, SUBTYPE_CONTENT_DESCRIPTION);
+            }
             builder.addHints(HINT_LIST_ITEM)
                     .addInt(mMax, SUBTYPE_MAX)
                     .addInt(mValue, SUBTYPE_VALUE);
@@ -283,6 +293,7 @@
         private SliceItem mSubtitleItem;
         private Slice mStartItem;
         private ArrayList<Slice> mEndItems = new ArrayList<>();
+        private CharSequence mContentDescr;
 
         /**
          */
@@ -464,6 +475,11 @@
             mEndItems.add(action.buildSlice(sb));
         }
 
+        @Override
+        public void setContentDescription(CharSequence description) {
+            mContentDescr = description;
+        }
+
         /**
          */
         @Override
@@ -481,6 +497,9 @@
                 Slice item = mEndItems.get(i);
                 b.addSubSlice(item);
             }
+            if (mContentDescr != null) {
+                b.addText(mContentDescr, SUBTYPE_CONTENT_DESCRIPTION);
+            }
             if (mPrimaryAction != null) {
                 Slice.Builder sb = new Slice.Builder(
                         getBuilder()).addHints(HINT_TITLE, HINT_SHORTCUT);
@@ -499,6 +518,7 @@
         private SliceItem mSubtitleItem;
         private SliceItem mSummaryItem;
         private SliceAction mPrimaryAction;
+        private CharSequence mContentDescr;
 
         /**
          */
@@ -525,6 +545,9 @@
             if (mSummaryItem != null) {
                 b.addItem(mSummaryItem);
             }
+            if (mContentDescr != null) {
+                b.addText(mContentDescr, SUBTYPE_CONTENT_DESCRIPTION);
+            }
             if (mPrimaryAction != null) {
                 Slice.Builder sb = new Slice.Builder(
                         getBuilder()).addHints(HINT_TITLE, HINT_SHORTCUT);
@@ -569,5 +592,12 @@
         public void setPrimaryAction(SliceAction action) {
             mPrimaryAction = action;
         }
+
+        /**
+         */
+        @Override
+        public void setContentDescription(CharSequence description) {
+            mContentDescr = description;
+        }
     }
 }

slices/view/src/main/java/androidx/slice/widget/ActionContent.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/ActionContent.java b/slices/view/src/main/java/androidx/slice/widget/ActionContent.java
index 2f8a068..aedd068 100644
--- a/slices/view/src/main/java/androidx/slice/widget/ActionContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/ActionContent.java
@@ -31,7 +31,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-
 import androidx.slice.SliceItem;
 import androidx.slice.core.SliceQuery;
 
@@ -115,11 +114,13 @@
     }
 
     /**
-     * @return the subtitle associated with this action.
+     * @return the content description associated with this action.
      */
     @Nullable
-    public SliceItem getContentDescriptionItem() {
-        return mContentDescItem;
+    public CharSequence getContentDescription() {
+        return mContentDescItem != null
+                ? mContentDescItem.getText()
+                : mTitleItem != null ? mTitleItem.getText() : null;
     }
 
     /**

slices/view/src/main/java/androidx/slice/widget/GridContent.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/GridContent.java b/slices/view/src/main/java/androidx/slice/widget/GridContent.java
index 3c48bad..e6c1dfe 100644
--- a/slices/view/src/main/java/androidx/slice/widget/GridContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/GridContent.java
@@ -22,6 +22,7 @@
 import static android.app.slice.Slice.HINT_SHORTCUT;
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.Slice.SUBTYPE_COLOR;
+import static android.app.slice.Slice.SUBTYPE_CONTENT_DESCRIPTION;
 import static android.app.slice.SliceItem.FORMAT_ACTION;
 import static android.app.slice.SliceItem.FORMAT_IMAGE;
 import static android.app.slice.SliceItem.FORMAT_INT;
@@ -36,13 +37,13 @@
 import android.app.slice.Slice;
 import android.content.Context;
 import android.content.res.Resources;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.slice.SliceItem;
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.core.SliceQuery;
@@ -63,6 +64,7 @@
     private int mMaxCellLineCount;
     private boolean mHasImage;
     private @ListBuilder.ImageMode int mLargestImageMode;
+    private SliceItem mContentDescr;
 
     private int mBigPicMinHeight;
     private int mBigPicMaxHeight;
@@ -83,19 +85,10 @@
         mMaxHeight = res.getDimensionPixelSize(R.dimen.abc_slice_grid_max_height);
     }
 
-    private void reset() {
-        mColorItem = null;
-        mMaxCellLineCount = 0;
-        mHasImage = false;
-        mGridContent.clear();
-        mLargestImageMode = 0;
-    }
-
     /**
      * @return whether this grid has content that is valid to display.
      */
     private boolean populate(SliceItem gridItem) {
-        reset();
         mColorItem = SliceQuery.findSubtype(gridItem, FORMAT_INT, SUBTYPE_COLOR);
         mSeeMoreItem = SliceQuery.find(gridItem, null, HINT_SEE_MORE, null);
         if (mSeeMoreItem != null && FORMAT_SLICE.equals(mSeeMoreItem.getFormat())) {
@@ -107,10 +100,11 @@
         mAllImages = true;
         if (FORMAT_SLICE.equals(gridItem.getFormat())) {
             List<SliceItem> items = gridItem.getSlice().getItems().get(0).getSlice().getItems();
-            items = filterInvalidItems(items);
+            items = filterAndProcessItems(items);
             // Check if it it's only one item that is a slice
             if (items.size() == 1 && items.get(0).getFormat().equals(FORMAT_SLICE)) {
                 items = items.get(0).getSlice().getItems();
+                items = filterAndProcessItems(items);
             }
             for (int i = 0; i < items.size(); i++) {
                 SliceItem item = items.get(i);
@@ -169,6 +163,14 @@
     }
 
     /**
+     * @return content description for this row.
+     */
+    @Nullable
+    public CharSequence getContentDescription() {
+        return mContentDescr != null ? mContentDescr.getText() : null;
+    }
+
+    /**
      * @return whether this grid has content that is valid to display.
      */
     public boolean isValid() {
@@ -182,11 +184,16 @@
         return mAllImages;
     }
 
-    private List<SliceItem> filterInvalidItems(List<SliceItem> items) {
+    /**
+     * Filters non-cell items out of the list of items and finds content description.
+     */
+    private List<SliceItem> filterAndProcessItems(List<SliceItem> items) {
         List<SliceItem> filteredItems = new ArrayList<>();
         for (int i = 0; i < items.size(); i++) {
             SliceItem item = items.get(i);
-            if (item.hasHint(HINT_LIST_ITEM) && !item.hasHint(HINT_SHORTCUT)
+            if (SUBTYPE_CONTENT_DESCRIPTION.equals(item.getSubType())) {
+                mContentDescr = item;
+            } else if (item.hasHint(HINT_LIST_ITEM) && !item.hasHint(HINT_SHORTCUT)
                     && !item.hasHint(HINT_SEE_MORE)) {
                 filteredItems.add(item);
             }
@@ -247,6 +254,7 @@
     public static class CellContent {
         private SliceItem mContentIntent;
         private ArrayList<SliceItem> mCellItems = new ArrayList<>();
+        private SliceItem mContentDescr;
         private int mTextCount;
         private boolean mHasImage;
         private int mImageMode = -1;
@@ -277,7 +285,9 @@
                 for (int i = 0; i < items.size(); i++) {
                     final SliceItem item = items.get(i);
                     final String itemFormat = item.getFormat();
-                    if (mTextCount < 2 && (FORMAT_TEXT.equals(itemFormat)
+                    if (SUBTYPE_CONTENT_DESCRIPTION.equals(item.getSubType())) {
+                        mContentDescr = item;
+                    } else if (mTextCount < 2 && (FORMAT_TEXT.equals(itemFormat)
                             || FORMAT_TIMESTAMP.equals(itemFormat))) {
                         mTextCount++;
                         mCellItems.add(item);
@@ -319,9 +329,10 @@
          */
         private boolean isValidCellContent(SliceItem cellItem) {
             final String format = cellItem.getFormat();
-            return FORMAT_TEXT.equals(format)
+            return !SUBTYPE_CONTENT_DESCRIPTION.equals(cellItem.getSubType())
+                    && (FORMAT_TEXT.equals(format)
                     || FORMAT_TIMESTAMP.equals(format)
-                    || FORMAT_IMAGE.equals(format);
+                    || FORMAT_IMAGE.equals(format));
         }
 
         /**
@@ -358,5 +369,10 @@
         public int getImageMode() {
             return mImageMode;
         }
+
+        @Nullable
+        public CharSequence getContentDescription() {
+            return mContentDescr != null ? mContentDescr.getText() : null;
+        }
     }
 }

slices/view/src/main/java/androidx/slice/widget/GridRowView.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/GridRowView.java b/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
index 2237569..a0f7898 100644
--- a/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
@@ -32,8 +32,6 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.res.Resources;
-import androidx.annotation.ColorInt;
-import androidx.annotation.RestrictTo;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Pair;
@@ -52,6 +50,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.RestrictTo;
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
 import androidx.slice.core.SliceQuery;
@@ -164,6 +164,10 @@
             mViewContainer.setTag(tagItem);
             makeClickable(mViewContainer);
         }
+        CharSequence contentDescr = gc.getContentDescription();
+        if (contentDescr != null) {
+            mViewContainer.setContentDescription(contentDescr);
+        }
         ArrayList<GridContent.CellContent> cells = gc.getGridContent();
         boolean hasSeeMore = gc.getSeeMoreItem() != null;
         for (int i = 0; i < cells.size(); i++) {
@@ -276,6 +280,10 @@
             }
         }
         if (added) {
+            CharSequence contentDescr = cell.getContentDescription();
+            if (contentDescr != null) {
+                cellContainer.setContentDescription(contentDescr);
+            }
             mViewContainer.addView(cellContainer,
                     new LinearLayout.LayoutParams(0, WRAP_CONTENT, 1));
             if (index != total - 1) {

slices/view/src/main/java/androidx/slice/widget/RowContent.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/RowContent.java b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
index 13dc8fb..d7f7ab6 100644
--- a/slices/view/src/main/java/androidx/slice/widget/RowContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
@@ -21,6 +21,7 @@
 import static android.app.slice.Slice.HINT_SHORTCUT;
 import static android.app.slice.Slice.HINT_SUMMARY;
 import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.Slice.SUBTYPE_CONTENT_DESCRIPTION;
 import static android.app.slice.SliceItem.FORMAT_ACTION;
 import static android.app.slice.SliceItem.FORMAT_IMAGE;
 import static android.app.slice.SliceItem.FORMAT_INT;
@@ -32,15 +33,15 @@
 import static androidx.slice.core.SliceHints.SUBTYPE_RANGE;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.slice.SliceItem;
 import androidx.slice.core.SliceQuery;
 import androidx.slice.view.R;
@@ -60,8 +61,9 @@
     private SliceItem mSubtitleItem;
     private SliceItem mSummaryItem;
     private ArrayList<SliceItem> mEndItems = new ArrayList<>();
-    private boolean mEndItemsContainAction;
     private SliceItem mRange;
+    private SliceItem mContentDescr;
+    private boolean mEndItemsContainAction;
     private boolean mIsHeader;
     private int mLineCount = 0;
     private int mMaxHeight;
@@ -74,24 +76,9 @@
     }
 
     /**
-     * Resets the content.
-     */
-    public void reset() {
-        mPrimaryAction = null;
-        mRowSlice = null;
-        mStartItem = null;
-        mTitleItem = null;
-        mSubtitleItem = null;
-        mEndItems.clear();
-        mIsHeader = false;
-        mLineCount = 0;
-    }
-
-    /**
      * @return whether this row has content that is valid to display.
      */
     private boolean populate(SliceItem rowSlice, boolean isHeader) {
-        reset();
         mIsHeader = isHeader;
         mRowSlice = rowSlice;
         if (!isValidRow(rowSlice)) {
@@ -103,6 +90,8 @@
         mPrimaryAction = SliceQuery.find(rowSlice, FORMAT_SLICE, hints,
                 new String[] { HINT_ACTIONS } /* nonHints */);
 
+        mContentDescr = SliceQuery.findSubtype(rowSlice, FORMAT_TEXT, SUBTYPE_CONTENT_DESCRIPTION);
+
         // Filter anything not viable for displaying in a row
         ArrayList<SliceItem> rowItems = filterInvalidItems(rowSlice);
         // If we've only got one item that's a slice / action use those items instead
@@ -238,6 +227,14 @@
     }
 
     /**
+     * @return the content description to use for this row.
+     */
+    @Nullable
+    public CharSequence getContentDescription() {
+        return mContentDescr != null ? mContentDescr.getText() : null;
+    }
+
+    /**
      * @return whether {@link #getEndItems()} contains a SliceItem with FORMAT_SLICE, HINT_SHORTCUT
      */
     public boolean endItemsContainAction() {
@@ -339,7 +336,8 @@
             item = item.getSlice().getItems().get(0);
         }
         final String itemFormat = item.getFormat();
-        return FORMAT_TEXT.equals(itemFormat)
+        return (FORMAT_TEXT.equals(itemFormat)
+                && !SUBTYPE_CONTENT_DESCRIPTION.equals(item.getSubType()))
                 || FORMAT_IMAGE.equals(itemFormat)
                 || FORMAT_TIMESTAMP.equals(itemFormat)
                 || FORMAT_REMOTE_INPUT.equals(itemFormat)

slices/view/src/main/java/androidx/slice/widget/RowView.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/RowView.java b/slices/view/src/main/java/androidx/slice/widget/RowView.java
index 9478092..13e6128 100644
--- a/slices/view/src/main/java/androidx/slice/widget/RowView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowView.java
@@ -36,8 +36,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Icon;
-import androidx.annotation.ColorInt;
-import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -56,6 +54,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.RestrictTo;
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
 import androidx.slice.core.SliceQuery;
@@ -183,7 +183,10 @@
             showSeeMore();
             return;
         }
-
+        CharSequence contentDescr = mRowContent.getContentDescription();
+        if (contentDescr != null) {
+            mContent.setContentDescription(contentDescr);
+        }
         boolean showStart = false;
         final SliceItem startItem = mRowContent.getStartItem();
         if (startItem != null) {
@@ -368,6 +371,10 @@
             toggle = new Switch(getContext());
             container.addView(toggle);
         }
+        CharSequence contentDesc = actionContent.getContentDescription();
+        if (contentDesc != null) {
+            toggle.setContentDescription(contentDesc);
+        }
         toggle.setChecked(actionContent.isChecked());
         toggle.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -434,6 +441,9 @@
                 }
                 size = mIconSize;
             }
+            if (actionContent != null && actionContent.getContentDescription() != null) {
+                iv.setContentDescription(actionContent.getContentDescription());
+            }
             container.addView(iv);
             LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) iv.getLayoutParams();
             lp.width = size;

v7/appcompat/res/layout/abc_cascading_menu_item_layout.xml

diff --git a/v7/appcompat/res/layout/abc_cascading_menu_item_layout.xml b/v7/appcompat/res/layout/abc_cascading_menu_item_layout.xml
new file mode 100644
index 0000000..f711884
--- /dev/null
+++ b/v7/appcompat/res/layout/abc_cascading_menu_item_layout.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 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.
+  -->
+
+<!-- Keep in sync with abc_popup_menu_item_layout.xml (which only differs in the title and shortcut
+    position). -->
+<androidx.appcompat.view.menu.ListMenuItemView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minWidth="196dip"
+        android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/group_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginTop="4dip"
+        android:layout_marginBottom="4dip"
+        android:background="@drawable/abc_list_divider_material" />
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/dropdownListPreferredItemHeight"
+        android:duplicateParentState="true"
+        style="@style/RtlOverlay.Widget.AppCompat.PopupMenuItem">
+
+        <!-- Icon will be inserted here. -->
+
+        <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textAppearance="?attr/textAppearanceLargePopupMenu"
+                android:singleLine="true"
+                android:duplicateParentState="true"
+                style="@style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Title" />
+
+        <Space
+                android:layout_width="0dip"
+                android:layout_height="1dip"
+                android:layout_weight="1"/>
+
+        <TextView
+                android:id="@+id/shortcut"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textAppearance="?attr/textAppearanceSmallPopupMenu"
+                android:singleLine="true"
+                android:duplicateParentState="true"
+                style="@style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut" />
+
+        <ImageView
+                android:id="@+id/submenuarrow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:scaleType="center"
+                android:visibility="gone"
+                style="@style/RtlOverlay.Widget.AppCompat.PopupMenuItem.SubmenuArrow" />
+
+        <!-- Checkbox, and/or radio button will be inserted here. -->
+
+    </LinearLayout>
+
+</androidx.appcompat.view.menu.ListMenuItemView>

v7/appcompat/res/values-v17/styles_rtl.xml

diff --git a/v7/appcompat/res/values-v17/styles_rtl.xml b/v7/appcompat/res/values-v17/styles_rtl.xml
index 68fd88f..9c1e032 100644
--- a/v7/appcompat/res/values-v17/styles_rtl.xml
+++ b/v7/appcompat/res/values-v17/styles_rtl.xml
@@ -70,6 +70,16 @@
         <item name="android:textAlignment">viewStart</item>
     </style>
 
+    <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Title" parent="android:Widget">
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
+    <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut" parent="android:Widget">
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:textAlignment">viewEnd</item>
+    </style>
+
     <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.SubmenuArrow" parent="android:Widget">
         <item name="android:layout_marginStart">8dp</item>
     </style>

v7/appcompat/res/values/styles_rtl.xml

diff --git a/v7/appcompat/res/values/styles_rtl.xml b/v7/appcompat/res/values/styles_rtl.xml
index fda8f09..6abc26a 100644
--- a/v7/appcompat/res/values/styles_rtl.xml
+++ b/v7/appcompat/res/values/styles_rtl.xml
@@ -69,6 +69,14 @@
         <item name="android:layout_alignParentLeft">true</item>
     </style>
 
+    <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Title" parent="android:Widget">
+        <item name="android:layout_marginLeft">16dp</item>
+    </style>
+
+    <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut" parent="android:Widget">
+        <item name="android:layout_marginLeft">16dp</item>
+    </style>
+
     <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.SubmenuArrow" parent="android:Widget">
         <item name="android:layout_marginLeft">8dp</item>
     </style>

v7/appcompat/src/main/java/androidx/appcompat/view/menu/CascadingMenuPopup.java

diff --git a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/CascadingMenuPopup.java b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/CascadingMenuPopup.java
index 10237af..3fd147a 100644
--- a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/CascadingMenuPopup.java
+++ b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/CascadingMenuPopup.java
@@ -23,17 +23,6 @@
 import android.os.Handler;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import androidx.annotation.AttrRes;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
-import androidx.core.internal.view.SupportMenu;
-import androidx.core.view.GravityCompat;
-import androidx.core.view.ViewCompat;
-import androidx.appcompat.R;
-import androidx.appcompat.widget.MenuItemHoverListener;
-import androidx.appcompat.widget.MenuPopupWindow;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -56,12 +45,25 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.R;
+import androidx.appcompat.widget.MenuItemHoverListener;
+import androidx.appcompat.widget.MenuPopupWindow;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+
 /**
  * A popup for a menu which will allow multiple submenus to appear in a cascading fashion, side by
  * side.
  */
 final class CascadingMenuPopup extends MenuPopup implements MenuPresenter, OnKeyListener,
         PopupWindow.OnDismissListener {
+    private static final int ITEM_LAYOUT = R.layout.abc_cascading_menu_item_layout;
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({HORIZ_POSITION_LEFT, HORIZ_POSITION_RIGHT})
@@ -363,7 +365,7 @@
      */
     private void showMenu(@NonNull MenuBuilder menu) {
         final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final MenuAdapter adapter = new MenuAdapter(menu, inflater, mOverflowOnly);
+        final MenuAdapter adapter = new MenuAdapter(menu, inflater, mOverflowOnly, ITEM_LAYOUT);
 
         // Apply "force show icon" setting. There are 3 cases:
         // (1) This is the top level menu and icon spacing is forced. Add spacing.

v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuAdapter.java

diff --git a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuAdapter.java b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuAdapter.java
index 54cb54a..b3a1ebb 100644
--- a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuAdapter.java
+++ b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuAdapter.java
@@ -17,8 +17,6 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
-import androidx.annotation.RestrictTo;
-import androidx.appcompat.R;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,13 +24,13 @@
 
 import java.util.ArrayList;
 
+import androidx.annotation.RestrictTo;
+
 /**
  * @hide
  */
 @RestrictTo(LIBRARY_GROUP)
 public class MenuAdapter extends BaseAdapter {
-    static final int ITEM_LAYOUT = R.layout.abc_popup_menu_item_layout;
-
     MenuBuilder mAdapterMenu;
 
     private int mExpandedIndex = -1;
@@ -40,11 +38,14 @@
     private boolean mForceShowIcon;
     private final boolean mOverflowOnly;
     private final LayoutInflater mInflater;
+    private final int mItemLayoutRes;
 
-    public MenuAdapter(MenuBuilder menu, LayoutInflater inflater, boolean overflowOnly) {
+    public MenuAdapter(MenuBuilder menu, LayoutInflater inflater, boolean overflowOnly,
+            int itemLayoutRes) {
         mOverflowOnly = overflowOnly;
         mInflater = inflater;
         mAdapterMenu = menu;
+        mItemLayoutRes = itemLayoutRes;
         findExpandedIndex();
     }
 
@@ -90,7 +91,7 @@
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         if (convertView == null) {
-            convertView = mInflater.inflate(ITEM_LAYOUT, parent, false);
+            convertView = mInflater.inflate(mItemLayoutRes, parent, false);
         }
 
         final int currGroupId = getItem(position).getGroupId();

v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java

diff --git a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
index f1d5f45..04d4330 100644
--- a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
+++ b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
@@ -28,13 +28,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import androidx.annotation.RestrictTo;
-import androidx.core.content.ContextCompat;
-import androidx.core.internal.view.SupportMenu;
-import androidx.core.internal.view.SupportMenuItem;
-import androidx.core.view.ActionProvider;
-import androidx.appcompat.R;
 import android.util.SparseArray;
 import android.view.ContextMenu;
 import android.view.KeyCharacterMap;
@@ -48,6 +41,14 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.appcompat.R;
+import androidx.core.content.ContextCompat;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.internal.view.SupportMenuItem;
+import androidx.core.view.ActionProvider;
+
 /**
  * Implementation of the {@link androidx.core.internal.view.SupportMenu} interface for creating a
  * standard menu UI.
@@ -596,6 +597,7 @@
         mPreventDispatchingItemsChanged = true;
         clear();
         clearHeader();
+        mPresenters.clear();
         mPreventDispatchingItemsChanged = false;
         mItemsChangedWhileDispatchPrevented = false;
         mStructureChangedWhileDispatchPrevented = false;

v7/appcompat/src/main/java/androidx/appcompat/view/menu/StandardMenuPopup.java

diff --git a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/StandardMenuPopup.java b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/StandardMenuPopup.java
index 0f9631f..c13e8f7 100644
--- a/v7/appcompat/src/main/java/androidx/appcompat/view/menu/StandardMenuPopup.java
+++ b/v7/appcompat/src/main/java/androidx/appcompat/view/menu/StandardMenuPopup.java
@@ -19,9 +19,6 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Parcelable;
-import androidx.core.view.ViewCompat;
-import androidx.appcompat.R;
-import androidx.appcompat.widget.MenuPopupWindow;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -36,12 +33,17 @@
 import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
 
+import androidx.appcompat.R;
+import androidx.appcompat.widget.MenuPopupWindow;
+import androidx.core.view.ViewCompat;
+
 /**
  * A standard menu popup in which when a submenu is opened, it replaces its parent menu in the
  * viewport.
  */
 final class StandardMenuPopup extends MenuPopup implements OnDismissListener, OnItemClickListener,
         MenuPresenter, OnKeyListener {
+    private static final int ITEM_LAYOUT = R.layout.abc_popup_menu_item_layout;
 
     private final Context mContext;
 
@@ -115,7 +117,7 @@
         mMenu = menu;
         mOverflowOnly = overflowOnly;
         final LayoutInflater inflater = LayoutInflater.from(context);
-        mAdapter = new MenuAdapter(menu, inflater, mOverflowOnly);
+        mAdapter = new MenuAdapter(menu, inflater, mOverflowOnly, ITEM_LAYOUT);
         mPopupStyleAttr = popupStyleAttr;
         mPopupStyleRes = popupStyleRes;
 

wear/api/current.txt

diff --git a/wear/api/current.txt b/wear/api/current.txt
index 35e1042..e866b53 100644
--- a/wear/api/current.txt
+++ b/wear/api/current.txt
@@ -1,3 +1,18 @@
+package androidx.wear.activity {
+
+  public class ConfirmationActivity extends android.app.Activity {
+    ctor public ConfirmationActivity();
+    method protected void onAnimationFinished();
+    method public void onCreate(android.os.Bundle);
+    field public static final java.lang.String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
+    field public static final java.lang.String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
+    field public static final int FAILURE_ANIMATION = 3; // 0x3
+    field public static final int OPEN_ON_PHONE_ANIMATION = 2; // 0x2
+    field public static final int SUCCESS_ANIMATION = 1; // 0x1
+  }
+
+}
+
 package androidx.wear.ambient {
 
   public final deprecated class AmbientMode extends android.app.Fragment {
@@ -119,6 +134,27 @@
     method public abstract void onTimerFinished(androidx.wear.widget.CircularProgressLayout);
   }
 
+  public class ConfirmationOverlay {
+    ctor public ConfirmationOverlay();
+    method public androidx.wear.widget.ConfirmationOverlay setDuration(int);
+    method public androidx.wear.widget.ConfirmationOverlay setFinishedAnimationListener(androidx.wear.widget.ConfirmationOverlay.OnAnimationFinishedListener);
+    method public androidx.wear.widget.ConfirmationOverlay setMessage(java.lang.String);
+    method public androidx.wear.widget.ConfirmationOverlay setType(int);
+    method public void showAbove(android.view.View);
+    method public void showOn(android.app.Activity);
+    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
+    field public static final int FAILURE_ANIMATION = 1; // 0x1
+    field public static final int OPEN_ON_PHONE_ANIMATION = 2; // 0x2
+    field public static final int SUCCESS_ANIMATION = 0; // 0x0
+  }
+
+  public static abstract interface ConfirmationOverlay.OnAnimationFinishedListener {
+    method public abstract void onAnimationFinished();
+  }
+
+  public static abstract class ConfirmationOverlay.OverlayType implements java.lang.annotation.Annotation {
+  }
+
   public class CurvingLayoutCallback extends androidx.wear.widget.WearableLinearLayoutManager.LayoutCallback {
     ctor public CurvingLayoutCallback(android.content.Context);
     method public void adjustAnchorOffsetXY(android.view.View, float[]);

wear/res/anim/generic_confirmation_animation.xml

diff --git a/wear/res/anim/generic_confirmation_animation.xml b/wear/res/anim/generic_confirmation_animation.xml
new file mode 100644
index 0000000..61372fc
--- /dev/null
+++ b/wear/res/anim/generic_confirmation_animation.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <set
+        android:ordering="sequentially" >
+        <objectAnimator
+            android:duration="133"
+            android:propertyName="alpha"
+            android:valueFrom="0.0"
+            android:valueTo="1.0"
+            android:valueType="floatType"
+            android:interpolator="@android:interpolator/fast_out_slow_in" />
+        <objectAnimator
+            android:duration="500"
+            android:propertyName="alpha"
+            android:valueFrom="1.0"
+            android:valueTo="1.0"
+            android:valueType="floatType"
+            android:interpolator="@anim/generic_confirmation_animation_interpolator_1" />
+        <objectAnimator
+            android:duration="266"
+            android:propertyName="alpha"
+            android:valueFrom="1.0"
+            android:valueTo="0.0"
+            android:valueType="floatType"
+            android:interpolator="@anim/generic_confirmation_animation_interpolator_0" />
+    </set>
+</set>

wear/res/anim/generic_confirmation_animation_interpolator_0.xml

diff --git a/wear/res/anim/generic_confirmation_animation_interpolator_0.xml b/wear/res/anim/generic_confirmation_animation_interpolator_0.xml
new file mode 100644
index 0000000..e436c80
--- /dev/null
+++ b/wear/res/anim/generic_confirmation_animation_interpolator_0.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<pathInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0.0,0.0 c 0.4,0.0 0.6,1.0 1.0,1.0" />
\ No newline at end of file

wear/res/anim/generic_confirmation_animation_interpolator_1.xml

diff --git a/wear/res/anim/generic_confirmation_animation_interpolator_1.xml b/wear/res/anim/generic_confirmation_animation_interpolator_1.xml
new file mode 100644
index 0000000..92eedf0
--- /dev/null
+++ b/wear/res/anim/generic_confirmation_animation_interpolator_1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<pathInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0.0,0.0 c 0.0001,0.0 0.9999,1.0 1.0,1.0" />
\ No newline at end of file

wear/res/anim/generic_confirmation_animation_interpolator_2.xml

diff --git a/wear/res/anim/generic_confirmation_animation_interpolator_2.xml b/wear/res/anim/generic_confirmation_animation_interpolator_2.xml
new file mode 100644
index 0000000..cbcdcb5
--- /dev/null
+++ b/wear/res/anim/generic_confirmation_animation_interpolator_2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<pathInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0.0,0.0 c 0.230242651469,0.0 0.415094339623,0.655389695336 0.415094339623,0.655389695336 c 0.0,0.0 0.297922257913,0.344610304664 0.584905660377,0.344610304664 L 1.0,1.0" />

wear/res/anim/generic_confirmation_animation_interpolator_3.xml

diff --git a/wear/res/anim/generic_confirmation_animation_interpolator_3.xml b/wear/res/anim/generic_confirmation_animation_interpolator_3.xml
new file mode 100644
index 0000000..da77bd7
--- /dev/null
+++ b/wear/res/anim/generic_confirmation_animation_interpolator_3.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<pathInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0.0,0.0 c 0.00010,0.0 0.83333333333,1.0 1.0,1.0" />
\ No newline at end of file

wear/res/anim/generic_confirmation_icon_animation.xml

diff --git a/wear/res/anim/generic_confirmation_icon_animation.xml b/wear/res/anim/generic_confirmation_icon_animation.xml
new file mode 100644
index 0000000..1231b30
--- /dev/null
+++ b/wear/res/anim/generic_confirmation_icon_animation.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <objectAnimator
+        android:duration="400"
+        android:propertyXName="translateX"
+        android:propertyYName="translateY"
+        android:pathData="M 40,33.5 c 0.0,0.18153 0.0,11.31822 0.0,13.09601 c 0.0,0.75592 0.0,-6.96322 0.0,-6.88601"
+        android:interpolator="@anim/generic_confirmation_animation_interpolator_2" />
+    <set
+        android:ordering="sequentially" >
+        <objectAnimator
+            android:duration="400"
+            android:propertyName="scaleX"
+            android:valueFrom="0.3"
+            android:valueTo="1"
+            android:valueType="floatType"
+            android:interpolator="@android:interpolator/fast_out_slow_in" />
+        <objectAnimator
+            android:duration="233"
+            android:propertyName="scaleX"
+            android:valueFrom="1"
+            android:valueTo="1"
+            android:valueType="floatType"
+            android:interpolator="@anim/generic_confirmation_animation_interpolator_3" />
+        <objectAnimator
+            android:duration="266"
+            android:propertyName="scaleX"
+            android:valueFrom="1"
+            android:valueTo="0.92"
+            android:valueType="floatType"
+            android:interpolator="@android:interpolator/fast_out_slow_in" />
+    </set>
+    <set
+        android:ordering="sequentially" >
+        <objectAnimator
+            android:duration="400"
+            android:propertyName="scaleY"
+            android:valueFrom="0.3"
+            android:valueTo="1"
+            android:valueType="floatType"
+            android:interpolator="@android:interpolator/fast_out_slow_in" />
+        <objectAnimator
+            android:duration="233"
+            android:propertyName="scaleY"
+            android:valueFrom="1"
+            android:valueTo="1"
+            android:valueType="floatType"
+            android:interpolator="@anim/generic_confirmation_animation_interpolator_3" />
+        <objectAnimator
+            android:duration="266"
+            android:propertyName="scaleY"
+            android:valueFrom="1"
+            android:valueTo="0.92"
+            android:valueType="floatType"
+            android:interpolator="@android:interpolator/fast_out_slow_in" />
+    </set>
+    <objectAnimator
+        android:duration="400"
+        android:propertyName="rotation"
+        android:valueFrom="65.0"
+        android:valueTo="0.0"
+        android:valueType="floatType"
+        android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>

wear/res/anim/open_on_phone_animation_interpolator_0.xml

diff --git a/wear/res/anim/open_on_phone_animation_interpolator_0.xml b/wear/res/anim/open_on_phone_animation_interpolator_0.xml
new file mode 100644
index 0000000..e767187
--- /dev/null
+++ b/wear/res/anim/open_on_phone_animation_interpolator_0.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<pathInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0.0,0.0 c 0.4,0.0 0.4,1.0 1.0,1.0" />
\ No newline at end of file

wear/res/anim/open_on_phone_animation_interpolator_1.xml

diff --git a/wear/res/anim/open_on_phone_animation_interpolator_1.xml b/wear/res/anim/open_on_phone_animation_interpolator_1.xml
new file mode 100644
index 0000000..deaa68a
--- /dev/null
+++ b/wear/res/anim/open_on_phone_animation_interpolator_1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 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.
+  -->
+
+<pathInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0.0,0.0 c 0.16666666667,0.244949494954 0.6,1.0 1.0,1.0" />
\ No newline at end of file

wear/res/anim/open_on_phone_arrow_animation.xml

diff --git a/wear/res/anim/open_on_phone_arrow_animation.xml b/wear/res/anim/open_on_phone_arrow_animation.xml
new file mode 100644
index 0000000..d00f365
--- /dev/null
+++ b/wear/res/anim/open_on_phone_arrow_animation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <objectAnimator
+        android:duration="433"
+        android:propertyName="translateX"
+        android:valueFrom="20.86372"
+        android:valueTo="31.75"
+        android:valueType="floatType"
+        android:interpolator="@anim/open_on_phone_animation_interpolator_0" />
+</set>

wear/res/anim/open_on_phone_path_1_animation.xml

diff --git a/wear/res/anim/open_on_phone_path_1_animation.xml b/wear/res/anim/open_on_phone_path_1_animation.xml
new file mode 100644
index 0000000..4b08b2a
--- /dev/null
+++ b/wear/res/anim/open_on_phone_path_1_animation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <objectAnimator
+        android:duration="430"
+        android:propertyName="pathData"
+        android:valueFrom="M 99.625,-194.5 c 0.0,0.0 -182.125,0.0 -194.25,0.0 c -12.125,0.0 -11.875,11.0 -11.875,11.0 c 0.0,0.0 0.00002,151.259307861 0.00002,151.259307861 c 0.0,0.0 17.625,-0.207061767578 17.625,-0.207061767578 c 0.0,0.0 -0.00002,-108.614746094 -0.00002,-111.239746094 c 0.0,-2.625 1.9375,-2.375 1.9375,-2.375 c 0.0,0.0 175.4375,0.0 177.8125,0.0 c 2.375,0.0 2.125,2.9375 2.125,2.9375 c 0.0,0.0 0.0,285.8125 0.0,288.125 c 0.0,2.3125 -2.0,2.0 -2.0,2.0 c 0.0,0.0 -174.875,0.0 -177.6875,0.0 c -2.8125,0.0 -2.3125,-1.875 -2.3125,-1.875 c 0.0,0.0 0.00005,-86.4319152832 0.00005,-86.4319152832 c 0.0,0.0 -17.25,0.0 -17.25,0.0 c 0.0,0.0 -0.00005,121.306915283 -0.00005,132.306915283 c 0.0,11.0 9.25,10.75 9.25,10.75 c 0.0,0.0 184.25,0.0 195.5,0.0 c 11.25,0.0 10.5,-12.25 10.5,-12.25 c 0.0,0.0 0.125,-364.75 0.125,-374.5 c 0.0,-9.75 -9.5,-9.5 -9.5,-9.5 Z"
+        android:valueTo="M 99.625,-194.5 c 0.0,0.0 -182.125,0.0 -194.25,0.0 c -12.125,0.0 -11.875,11.0 -11.875,11.0 c 0.0,0.0 0.0,194.812515259 0.0,194.812515259 c 0.0,0.0 17.625,-0.207046508789 17.625,-0.207046508789 c 0.0,0.0 0.0,-152.16796875 0.0,-154.79296875 c 0.0,-2.625 1.9375,-2.375 1.9375,-2.375 c 0.0,0.0 175.4375,0.0 177.8125,0.0 c 2.375,0.0 2.125,2.9375 2.125,2.9375 c 0.0,0.0 0.0,285.8125 0.0,288.125 c 0.0,2.3125 -2.0,2.0 -2.0,2.0 c 0.0,0.0 -174.875,0.0 -177.6875,0.0 c -2.8125,0.0 -2.3125,-1.875 -2.3125,-1.875 c 0.0,0.0 0.0,-134.0625 0.0,-134.0625 c 0.0,0.0 -17.25,0.0 -17.25,0.0 c 0.0,0.0 0.0,168.9375 0.0,179.9375 c 0.0,11.0 9.25,10.75 9.25,10.75 c 0.0,0.0 184.25,0.0 195.5,0.0 c 11.25,0.0 10.5,-12.25 10.5,-12.25 c 0.0,0.0 0.125,-364.75 0.125,-374.5 c 0.0,-9.75 -9.5,-9.5 -9.5,-9.5 Z"
+        android:valueType="pathType"
+        android:interpolator="@anim/open_on_phone_animation_interpolator_1" />
+</set>

wear/res/anim/open_on_phone_path_2_animation.xml

diff --git a/wear/res/anim/open_on_phone_path_2_animation.xml b/wear/res/anim/open_on_phone_path_2_animation.xml
new file mode 100644
index 0000000..b7cca26
--- /dev/null
+++ b/wear/res/anim/open_on_phone_path_2_animation.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <set
+        android:ordering="sequentially" >
+        <objectAnimator
+            android:duration="22"
+            android:propertyName="pathData"
+            android:valueFrom="M -32.2857208252,-52.9642944336 c 0.0,0.0 -15.75,16.25 -15.75,16.25 c 0.0,0.0 30.3749847412,29.0 30.3749847412,29.0 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,23.0000152588 0.0,23.0000152588 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 -30.1249542236,29.25 -30.1249542236,29.25 c 0.0,0.0 16.0,16.0 16.0,16.0 c 0.0,0.0 56.7500152588,-57.25 56.7500152588,-57.25 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -56.742477417,-55.9958648682 -56.742477417,-55.9958648682 Z"
+            android:valueTo="M -32.2857208252,-52.9642944336 c 0.0,0.0 -15.75,16.25 -15.75,16.25 c 0.0,0.0 30.3749847412,29.0 30.3749847412,29.0 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,23.0000152588 0.0,23.0000152588 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 -30.1249542236,29.25 -30.1249542236,29.25 c 0.0,0.0 16.0,16.0 16.0,16.0 c 0.0,0.0 56.7500152588,-57.25 56.7500152588,-57.25 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -56.742477417,-55.9958648682 -56.742477417,-55.9958648682 Z"
+            android:valueType="pathType"
+            android:interpolator="@android:interpolator/linear" />
+        <objectAnimator
+            android:duration="210"
+            android:propertyName="pathData"
+            android:valueFrom="M -32.2857208252,-52.9642944336 c 0.0,0.0 -15.75,16.25 -15.75,16.25 c 0.0,0.0 30.3749847412,29.0 30.3749847412,29.0 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,23.0000152588 0.0,23.0000152588 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 -30.1249542236,29.25 -30.1249542236,29.25 c 0.0,0.0 16.0,16.0 16.0,16.0 c 0.0,0.0 56.7500152588,-57.25 56.7500152588,-57.25 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -56.742477417,-55.9958648682 -56.742477417,-55.9958648682 Z"
+            android:valueTo="M -5.46754455566,-21.2824707031 c 0.0,0.0 -24.0227661133,0.522735595703 -24.0227661133,0.522735595703 c 0.0,0.0 11.829574585,13.0454559326 11.829574585,13.0454559326 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,22.9999847412 0.0,22.9999847412 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 -11.7158508301,13.2954559326 -11.7158508301,13.2954559326 c 0.0,0.0 21.909072876,1.13636779785 21.909072876,1.13636779785 c 0.0,0.0 32.4318389893,-26.4318084717 32.4318389893,-26.4318084717 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -29.9243011475,-24.3140411377 -29.9243011475,-24.3140411377 Z"
+            android:valueType="pathType"
+            android:interpolator="@android:interpolator/linear" />
+        <objectAnimator
+            android:duration="103"
+            android:propertyName="pathData"
+            android:valueFrom="M -5.46754455566,-21.2824707031 c 0.0,0.0 -24.0227661133,0.522735595703 -24.0227661133,0.522735595703 c 0.0,0.0 11.829574585,13.0454559326 11.829574585,13.0454559326 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,22.9999847412 0.0,22.9999847412 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 -11.7158508301,13.2954559326 -11.7158508301,13.2954559326 c 0.0,0.0 21.909072876,1.13636779785 21.909072876,1.13636779785 c 0.0,0.0 32.4318389893,-26.4318084717 32.4318389893,-26.4318084717 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -29.9243011475,-24.3140411377 -29.9243011475,-24.3140411377 Z"
+            android:valueTo="M 4.96426391602,-7.7142791748 c 0.0,0.0 -19.0000610352,0.249984741211 -19.0000610352,0.249984741211 c 0.0,0.0 -3.62493896484,-0.249984741211 -3.62493896484,-0.249984741211 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,22.9999847412 0.0,22.9999847412 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 3.62506103516,0.00002 3.62506103516,0.00002 c 0.0,0.0 19.4999694824,-0.250015258789 19.4999694824,-0.250015258789 c 0.0,0.0 19.5000305176,-11.7499847412 19.5000305176,-11.7499847412 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -19.4924926758,-10.7458496094 -19.4924926758,-10.7458496094 Z"
+            android:valueType="pathType"
+            android:interpolator="@android:interpolator/linear" />
+        <objectAnimator
+            android:duration="129"
+            android:propertyName="pathData"
+            android:valueFrom="M 4.96426391602,-7.7142791748 c 0.0,0.0 -19.0000610352,0.249984741211 -19.0000610352,0.249984741211 c 0.0,0.0 -3.62493896484,-0.249984741211 -3.62493896484,-0.249984741211 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,22.9999847412 0.0,22.9999847412 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 3.62506103516,0.00002 3.62506103516,0.00002 c 0.0,0.0 19.4999694824,-0.250015258789 19.4999694824,-0.250015258789 c 0.0,0.0 19.5000305176,-11.7499847412 19.5000305176,-11.7499847412 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -19.4924926758,-10.7458496094 -19.4924926758,-10.7458496094 Z"
+            android:valueTo="M 24.433013916,-7.70265197754 c 0.0,0.0 -38.4687957764,0.0117950439453 -38.4687957764,0.0117950439453 c 0.0,0.0 -3.62495422363,-0.0234222412109 -3.62495422363,-0.0234222412109 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,22.9999847412 0.0,22.9999847412 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 3.62506103516,0.00002 3.62506103516,0.00002 c 0.0,0.0 38.7499694824,-0.0040283203125 38.7499694824,-0.0040283203125 c 0.0,0.0 -0.0234069824219,-11.9959716797 -0.0234069824218,-11.9959716797 c 0.0,0.0 0.0158996582031,-0.254150390625 0.0158996582031,-0.254150390625 c 0.0,0.0 -0.0237426757812,-10.7342224121 -0.0237426757813,-10.7342224121 Z"
+            android:valueType="pathType"
+            android:interpolator="@android:interpolator/linear" />
+        <objectAnimator
+            android:duration="466"
+            android:propertyName="pathData"
+            android:valueFrom="M 24.433013916,-7.70265197754 c 0.0,0.0 -38.4687957764,0.0117950439453 -38.4687957764,0.0117950439453 c 0.0,0.0 -3.62495422363,-0.0234222412109 -3.62495422363,-0.0234222412109 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,22.9999847412 0.0,22.9999847412 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 3.62506103516,0.00002 3.62506103516,0.00002 c 0.0,0.0 38.7499694824,-0.0040283203125 38.7499694824,-0.0040283203125 c 0.0,0.0 -0.0234069824219,-11.9959716797 -0.0234069824218,-11.9959716797 c 0.0,0.0 0.0158996582031,-0.254150390625 0.0158996582031,-0.254150390625 c 0.0,0.0 -0.0237426757812,-10.7342224121 -0.0237426757813,-10.7342224121 Z"
+            android:valueTo="M 24.2923278809,-135.439804077 c 0.0,0.0 -38.4687957764,0.0118103027344 -38.4687957764,0.011810302734 c 0.0,0.0 -3.62496948242,-0.0234375 -3.62496948242,-0.0234375 c 0.0,0.0 -111.124954224,0.0 -111.124954224,0.0 c 0.0,0.0 0.545150756836,260.951965332 0.545150756835,260.951965332 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 3.62506103516,0.0 3.62506103516,0.0 c 0.0,0.0 38.7499694824,-0.00396728515625 38.7499694824,-0.00396728515601 c 0.0,0.0 -0.427871704102,-122.210830688 -0.427871704101,-122.210830688 c 0.0,0.0 0.0158996582031,-0.254180908203 0.0158996582031,-0.254180908203 c 0.0,0.0 -0.164428710938,-138.471359253 -0.164428710938,-138.471359253 Z"
+            android:valueType="pathType"
+            android:interpolator="@android:interpolator/linear_out_slow_in" />
+    </set>
+</set>

wear/res/drawable-hdpi/ws_full_sad.png

diff --git a/wear/res/drawable-hdpi/ws_full_sad.png b/wear/res/drawable-hdpi/ws_full_sad.png
new file mode 100644
index 0000000..541df38
--- /dev/null
+++ b/wear/res/drawable-hdpi/ws_full_sad.png
Binary files differ

wear/res/drawable-xhdpi/ws_full_sad.png

diff --git a/wear/res/drawable-xhdpi/ws_full_sad.png b/wear/res/drawable-xhdpi/ws_full_sad.png
new file mode 100644
index 0000000..d625290
--- /dev/null
+++ b/wear/res/drawable-xhdpi/ws_full_sad.png
Binary files differ

wear/res/drawable/generic_confirmation.xml

diff --git a/wear/res/drawable/generic_confirmation.xml b/wear/res/drawable/generic_confirmation.xml
new file mode 100644
index 0000000..28e80d5
--- /dev/null
+++ b/wear/res/drawable/generic_confirmation.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="generic_confirmation"
+    android:width="80dp"
+    android:height="80dp"
+    android:alpha="0"
+    android:viewportHeight="80"
+    android:viewportWidth="80">
+    <group
+        android:name="icon"
+        android:translateX="40"
+        android:translateY="33.5"
+        android:scaleX="1"
+        android:scaleY="1"
+        android:rotation="65">
+        <group android:name="check">
+            <path
+                android:name="check_path"
+                android:fillColor="#FFFFFFFF"
+                android:pathData="m14.68171,-20c0,0 -21.14918,23.66343 -21.14918,23.66343c0,0 -13.53253,-8.72588 -13.53253,-8.72588c0,0 0,4.73268 0,4.73268c0,0 13.60647,14.12411 13.60647,14.12411c0,0 1.55292,0 1.55292,0c0,0 22.92395,-30.91035 22.92395,-30.91035c0,0 -3.40163,-2.88399 -3.40163,-2.88399l-0.00002,0l0.00001,0z" />
+        </group>
+    </group>
+</vector>

wear/res/drawable/generic_confirmation_animation.xml

diff --git a/wear/res/drawable/generic_confirmation_animation.xml b/wear/res/drawable/generic_confirmation_animation.xml
new file mode 100644
index 0000000..6582e53
--- /dev/null
+++ b/wear/res/drawable/generic_confirmation_animation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/generic_confirmation" >
+    <target
+        android:name="icon"
+        android:animation="@anim/generic_confirmation_icon_animation" />
+    <target
+        android:name="generic_confirmation"
+        android:animation="@anim/generic_confirmation_animation" />
+</animated-vector>

wear/res/drawable/open_on_phone.xml

diff --git a/wear/res/drawable/open_on_phone.xml b/wear/res/drawable/open_on_phone.xml
new file mode 100644
index 0000000..da1f768
--- /dev/null
+++ b/wear/res/drawable/open_on_phone.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="open_on_phone"
+    android:width="64dp"
+    android:viewportWidth="64"
+    android:height="64dp"
+    android:viewportHeight="64" >
+    <group
+        android:name="phone"
+        android:translateX="32"
+        android:translateY="32"
+        android:scaleX="0.1507"
+        android:scaleY="0.1507" >
+        <group
+            android:name="shape_1" >
+            <path
+                android:name="path_1"
+                android:pathData="M 99.625,-194.5 c 0.0,0.0 -182.125,0.0 -194.25,0.0 c -12.125,0.0 -11.875,11.0 -11.875,11.0 c 0.0,0.0 0.00002,151.259307861 0.00002,151.259307861 c 0.0,0.0 17.625,-0.207061767578 17.625,-0.207061767578 c 0.0,0.0 -0.00002,-108.614746094 -0.00002,-111.239746094 c 0.0,-2.625 1.9375,-2.375 1.9375,-2.375 c 0.0,0.0 175.4375,0.0 177.8125,0.0 c 2.375,0.0 2.125,2.9375 2.125,2.9375 c 0.0,0.0 0.0,285.8125 0.0,288.125 c 0.0,2.3125 -2.0,2.0 -2.0,2.0 c 0.0,0.0 -174.875,0.0 -177.6875,0.0 c -2.8125,0.0 -2.3125,-1.875 -2.3125,-1.875 c 0.0,0.0 0.00005,-86.4319152832 0.00005,-86.4319152832 c 0.0,0.0 -17.25,0.0 -17.25,0.0 c 0.0,0.0 -0.00005,121.306915283 -0.00005,132.306915283 c 0.0,11.0 9.25,10.75 9.25,10.75 c 0.0,0.0 184.25,0.0 195.5,0.0 c 11.25,0.0 10.5,-12.25 10.5,-12.25 c 0.0,0.0 0.125,-364.75 0.125,-374.5 c 0.0,-9.75 -9.5,-9.5 -9.5,-9.5 Z"
+                android:fillColor="#FFFFFFFF" />
+        </group>
+    </group>
+    <group
+        android:name="arrow"
+        android:translateX="20.86372"
+        android:translateY="33.39034"
+        android:scaleX="0.1507"
+        android:scaleY="0.1507" >
+        <group
+            android:name="arrow_pivot"
+            android:translateX="56"
+            android:translateY="-2" >
+            <group
+                android:name="shape_2" >
+                <path
+                    android:name="path_2"
+                    android:pathData="M -32.2857208252,-52.9642944336 c 0.0,0.0 -15.75,16.25 -15.75,16.25 c 0.0,0.0 30.3749847412,29.0 30.3749847412,29.0 c 0.0,0.0 -111.124969482,0.0 -111.124969482,0.0 c 0.0,0.0 0.0,23.0000152588 0.0,23.0000152588 c 0.0,0.0 110.874938965,0.0 110.874938965,0.0 c 0.0,0.0 -30.1249542236,29.25 -30.1249542236,29.25 c 0.0,0.0 16.0,16.0 16.0,16.0 c 0.0,0.0 56.7500152588,-57.25 56.7500152588,-57.25 c 0.0,0.0 -0.257537841797,-0.254150390625 -0.257537841797,-0.254150390625 c 0.0,0.0 -56.742477417,-55.9958648682 -56.742477417,-55.9958648682 Z"
+                    android:fillColor="#FFFFFFFF" />
+            </group>
+        </group>
+    </group>
+</vector>

wear/res/drawable/ws_open_on_phone_animation.xml

diff --git a/wear/res/drawable/ws_open_on_phone_animation.xml b/wear/res/drawable/ws_open_on_phone_animation.xml
new file mode 100644
index 0000000..b9e3dc4
--- /dev/null
+++ b/wear/res/drawable/ws_open_on_phone_animation.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/open_on_phone" >
+    <target
+        android:name="path_1"
+        android:animation="@anim/open_on_phone_path_1_animation" />
+    <target
+        android:name="arrow"
+        android:animation="@anim/open_on_phone_arrow_animation" />
+    <target
+        android:name="path_2"
+        android:animation="@anim/open_on_phone_path_2_animation" />
+</animated-vector>

wear/res/layout/ws_overlay_confirmation.xml

diff --git a/wear/res/layout/ws_overlay_confirmation.xml b/wear/res/layout/ws_overlay_confirmation.xml
new file mode 100644
index 0000000..1237442
--- /dev/null
+++ b/wear/res/layout/ws_overlay_confirmation.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/wearable_support_overlay_confirmation"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#cc000000">
+    <ImageView
+        android:id="@+id/wearable_support_confirmation_overlay_image"
+        android:layout_width="@dimen/confirmation_overlay_image_size"
+        android:layout_height="@dimen/confirmation_overlay_image_size"
+        android:layout_centerInParent="true"
+        android:background="@android:color/transparent"
+        tools:ignore="ContentDescription" />
+    <TextView
+        android:id="@+id/wearable_support_confirmation_overlay_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/wearable_support_confirmation_overlay_image"
+        android:fontFamily="sans-serif-condensed-light"
+        android:gravity="center_horizontal"
+        android:background="@android:color/transparent"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/confirmation_overlay_text_size" />
+</RelativeLayout>

wear/res/values-round/dimens.xml

diff --git a/wear/res/values-round/dimens.xml b/wear/res/values-round/dimens.xml
new file mode 100644
index 0000000..10119ca
--- /dev/null
+++ b/wear/res/values-round/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- ConfirmationOverlay sizes which have corresponding entries in:
+        values, values-sw180dp-notround, values-sw210dp-round. -->
+    <dimen name="confirmation_overlay_image_size">72dp</dimen>
+    <item name="confirmation_overlay_margin_side" type="fraction">18.75%</item>
+    <item name="confirmation_overlay_margin_above_text" type="fraction">4.167%</item>
+</resources>

wear/res/values-sw180dp-notround/dimens.xml

diff --git a/wear/res/values-sw180dp-notround/dimens.xml b/wear/res/values-sw180dp-notround/dimens.xml
index f6395d3..f1dfdc5 100644
--- a/wear/res/values-sw180dp-notround/dimens.xml
+++ b/wear/res/values-sw180dp-notround/dimens.xml
@@ -22,4 +22,10 @@
     <dimen name="ws_action_drawer_item_icon_padding">8dp</dimen>
     <dimen name="ws_action_drawer_item_text_size">16sp</dimen>
 
+    <!-- ConfirmationOverlay sizes which have corresponding entries in:
+        values, values-round, values-sw210dp-round. -->
+    <dimen name="confirmation_overlay_image_size">80dp</dimen>
+    <item name="confirmation_overlay_margin_side" type="fraction">4.167%</item>
+    <item name="confirmation_overlay_margin_above_text" type="fraction">4.396%</item>
+
 </resources>

wear/res/values-sw210dp-round/dimens.xml

diff --git a/wear/res/values-sw210dp-round/dimens.xml b/wear/res/values-sw210dp-round/dimens.xml
index 1a2581e..e4eed86 100644
--- a/wear/res/values-sw210dp-round/dimens.xml
+++ b/wear/res/values-sw210dp-round/dimens.xml
@@ -20,4 +20,10 @@
     <dimen name="ws_action_drawer_item_icon_size">40dp</dimen>
     <dimen name="ws_action_drawer_item_icon_padding">8dp</dimen>
     <dimen name="ws_action_drawer_item_text_size">16sp</dimen>
+
+    <!-- Most dimens which have corresponding entries in:
+        values, values-round, values-sw180dp-notround. -->
+    <dimen name="confirmation_overlay_image_size">80dp</dimen>
+    <item name="confirmation_overlay_margin_side" type="fraction">16.901%</item>
+    <item name="confirmation_overlay_margin_above_text" type="fraction">3.756%</item>
 </resources>

wear/res/values/dimens.xml

diff --git a/wear/res/values/dimens.xml b/wear/res/values/dimens.xml
index 7cd5d20..c272161 100644
--- a/wear/res/values/dimens.xml
+++ b/wear/res/values/dimens.xml
@@ -79,4 +79,11 @@
 
     <!-- Default stroke width for CircularProgressLayout -->
     <dimen name="circular_progress_layout_stroke_width">4dp</dimen>
-</resources>
+
+    <!-- ConfirmationOverlay sizes which have corresponding entries in:
+        values-round, values-sw180dp-notround, values-sw210dp-round. -->
+    <dimen name="confirmation_overlay_image_size">64dp</dimen>
+    <item name="confirmation_overlay_margin_side" type="fraction">4.167%</item>
+    <item name="confirmation_overlay_margin_above_text" type="fraction">5%</item>
+    <dimen name="confirmation_overlay_text_size">14sp</dimen>
+  </resources>

wear/res/values/styles.xml

diff --git a/wear/res/values/styles.xml b/wear/res/values/styles.xml
index 0a5127d..e5174fe 100644
--- a/wear/res/values/styles.xml
+++ b/wear/res/values/styles.xml
@@ -14,6 +14,11 @@
      limitations under the License.
 -->
 <resources>
+    <style name="ConfirmationActivity" parent="android:Theme.Translucent.NoTitleBar.Fullscreen">
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:activityOpenEnterAnimation">@null</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
     <style name="WsSinglePageNavDrawerIconStyle">
         <item name="android:layout_height">@dimen/ws_nav_drawer_single_page_icon_size</item>
         <item name="android:layout_width">@dimen/ws_nav_drawer_single_page_icon_size</item>

wear/src/androidTest/AndroidManifest.xml

diff --git a/wear/src/androidTest/AndroidManifest.xml b/wear/src/androidTest/AndroidManifest.xml
index b2392bb..7e79803 100644
--- a/wear/src/androidTest/AndroidManifest.xml
+++ b/wear/src/androidTest/AndroidManifest.xml
@@ -75,7 +75,15 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+          </activity>
+
+        <activity android:name="androidx.wear.widget.ConfirmationOverlayTestActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
         </activity>
+
         <!-- Test app is iOS compatible. -->
         <meta-data
             android:name="com.google.android.wearable.standalone"

wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java

diff --git a/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java b/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java
new file mode 100644
index 0000000..49bb05f
--- /dev/null
+++ b/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2018 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.
+ */
+
+package androidx.wear.widget;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import android.app.Activity;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import androidx.wear.R;
+import androidx.wear.widget.util.WakeLockRule;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ConfirmationOverlayTest {
+
+    @Rule
+    public final WakeLockRule wakeLock = new WakeLockRule();
+
+    @Rule
+    public final ActivityTestRule<ConfirmationOverlayTestActivity> mActivityRule =
+            new ActivityTestRule<>(ConfirmationOverlayTestActivity.class, true, true);
+
+    @Mock
+    private ConfirmationOverlay.OnAnimationFinishedListener mOnAnimationFinishedListener;
+
+    private LinearLayout mLinearLayout;
+    private TextView mActualTextView;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    private Activity setupActivity() {
+        Activity activity = mActivityRule.getActivity();
+        mLinearLayout = new LinearLayout(activity);
+        activity.setContentView(mLinearLayout);
+        return activity;
+    }
+
+    @Test
+    public void testDefaults_onActivity() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ConfirmationOverlay overlay = new ConfirmationOverlay();
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Activity activity = setupActivity();
+                overlay.showOn(activity);
+                getOverlayViews(getContentView(activity));
+                assertEquals(View.GONE, mActualTextView.getVisibility());
+                ConfirmationOverlay.OnAnimationFinishedListener onAnimationFinishedListener =
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                latch.countDown();
+                            }
+                        };
+                overlay.setFinishedAnimationListener(onAnimationFinishedListener);
+                overlay.hide();
+            }
+        });
+        latch.await(5000, TimeUnit.MILLISECONDS);
+        assertEquals(0, latch.getCount());
+        assertNull(getContentView(mActivityRule.getActivity()));
+    }
+
+    @Test
+    @UiThreadTest
+    public void testDefaults_onView() {
+        setupActivity();
+        ConfirmationOverlay overlay = new ConfirmationOverlay();
+
+        overlay.showAbove(mLinearLayout);
+        getOverlayViews(mLinearLayout.getRootView());
+        assertEquals(View.GONE, mActualTextView.getVisibility());
+
+        overlay.hide();
+        assertEquals(0, mLinearLayout.getChildCount());
+    }
+
+    @Test
+    public void testSuccess_onActivity() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ConfirmationOverlay overlay = new ConfirmationOverlay()
+                .setType(ConfirmationOverlay.SUCCESS_ANIMATION)
+                .setFinishedAnimationListener(mOnAnimationFinishedListener)
+                .setMessage("Sent");
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Activity activity = setupActivity();
+                overlay.showOn(activity);
+                getOverlayViews(getContentView(activity));
+                assertEquals("Sent", mActualTextView.getText());
+                ConfirmationOverlay.OnAnimationFinishedListener onAnimationFinishedListener =
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                latch.countDown();
+                            }
+                        };
+                overlay.setFinishedAnimationListener(onAnimationFinishedListener);
+                overlay.hide();
+            }
+        });
+        latch.await(5000, TimeUnit.MILLISECONDS);
+        assertEquals(0, latch.getCount());
+        assertNull(getContentView(mActivityRule.getActivity()));
+    }
+
+    @Test
+    public void testFailure_onActivity() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ConfirmationOverlay overlay = new ConfirmationOverlay()
+                .setType(ConfirmationOverlay.FAILURE_ANIMATION)
+                .setFinishedAnimationListener(mOnAnimationFinishedListener)
+                .setMessage("Failed");
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Activity activity = setupActivity();
+                overlay.showOn(activity);
+                getOverlayViews(getContentView(activity));
+                assertEquals("Failed", mActualTextView.getText());
+                ConfirmationOverlay.OnAnimationFinishedListener onAnimationFinishedListener =
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                latch.countDown();
+                            }
+                        };
+                overlay.setFinishedAnimationListener(onAnimationFinishedListener);
+                overlay.hide();
+            }
+        });
+        latch.await(5000, TimeUnit.MILLISECONDS);
+        assertEquals(0, latch.getCount());
+        assertNull(getContentView(mActivityRule.getActivity()));
+    }
+
+    @Test
+    public void testOpenOnPhone_onActivity() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ConfirmationOverlay overlay = new ConfirmationOverlay()
+                .setType(ConfirmationOverlay.OPEN_ON_PHONE_ANIMATION)
+                .setFinishedAnimationListener(mOnAnimationFinishedListener)
+                .setMessage("Opening...");
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Activity activity = setupActivity();
+                overlay.showOn(activity);
+                getOverlayViews(getContentView(activity));
+                assertEquals("Opening...", mActualTextView.getText());
+                ConfirmationOverlay.OnAnimationFinishedListener onAnimationFinishedListener =
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                latch.countDown();
+                            }
+                        };
+                overlay.setFinishedAnimationListener(onAnimationFinishedListener);
+                overlay.hide();
+            }
+        });
+        latch.await(5000, TimeUnit.MILLISECONDS);
+        assertEquals(0, latch.getCount());
+        assertNull(getContentView(mActivityRule.getActivity()));
+    }
+
+    @Test
+    @UiThreadTest
+    public void testThrowsExceptionOnInvalidType() {
+        Activity activity = setupActivity();
+        try {
+            new ConfirmationOverlay().setType(-1).showOn(activity);
+            fail("Expected ConfirmationOverlay to throw an exception when given an invalid type.");
+        } catch (IllegalStateException e) {
+            // Success.
+        }
+    }
+
+    @Test
+    public void testOverlayVisibleDuringSpecifiedDuration() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final int overlayDurationMillis = 2000;
+        final ConfirmationOverlay overlay =
+                new ConfirmationOverlay()
+                        .setType(ConfirmationOverlay.SUCCESS_ANIMATION)
+                        .setDuration(overlayDurationMillis);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Activity activity = setupActivity();
+                overlay.showOn(activity);
+                ConfirmationOverlay.OnAnimationFinishedListener onAnimationFinishedListener =
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                latch.countDown();
+                            }
+                        };
+                overlay.setFinishedAnimationListener(onAnimationFinishedListener);
+            }
+        });
+        latch.await(overlayDurationMillis - 1000, TimeUnit.MILLISECONDS);
+        assertEquals(1, latch.getCount());
+        assertNotNull(getContentView(mActivityRule.getActivity()));
+    }
+
+    @Test
+    public void testOverlayHiddenAfterSpecifiedDuration() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final int overlayDurationMillis = 2000;
+        final ConfirmationOverlay overlay =
+                new ConfirmationOverlay()
+                        .setType(ConfirmationOverlay.SUCCESS_ANIMATION)
+                        .setDuration(overlayDurationMillis);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Activity activity = setupActivity();
+                overlay.showOn(activity);
+                ConfirmationOverlay.OnAnimationFinishedListener onAnimationFinishedListener =
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                latch.countDown();
+                            }
+                        };
+                overlay.setFinishedAnimationListener(onAnimationFinishedListener);
+            }
+        });
+        latch.await(overlayDurationMillis + 100, TimeUnit.MILLISECONDS);
+        assertEquals(0, latch.getCount());
+        assertNull(getContentView(mActivityRule.getActivity()));
+    }
+
+    private static View getContentView(Activity activity) {
+        ViewGroup viewGroup = activity.getWindow().findViewById(android.R.id.content);
+
+        // Return the second child, since the first is the LinearLayout added in setup().
+        return viewGroup.getChildAt(1);
+    }
+
+    private void getOverlayViews(View parent) {
+        mActualTextView = parent.findViewById(R.id.wearable_support_confirmation_overlay_message);
+    }
+}

wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTestActivity.java

diff --git a/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTestActivity.java b/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTestActivity.java
new file mode 100644
index 0000000..e6b21c9
--- /dev/null
+++ b/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTestActivity.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2018 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.
+ */
+
+package androidx.wear.widget;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ConfirmationOverlayTestActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+}

wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java

diff --git a/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java b/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java
new file mode 100644
index 0000000..6032706
--- /dev/null
+++ b/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2018 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.
+ */
+
+package androidx.wear.activity;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.SparseIntArray;
+
+import androidx.wear.R;
+import androidx.wear.widget.ConfirmationOverlay;
+
+/**
+ * This Activity is used to display confirmation animations after the user completes an action on
+ * the wearable. There are three types of confirmations: Success: the action was completed
+ * successfully on the wearable. Failure: the action failed to complete. Open on Phone: the action
+ * has caused something to display on the phone, or in order to complete the action, the user will
+ * need to go to their phone to continue.
+ *
+ * <p>It is the responsibility of the wearable application developer to determine whether the action
+ * has succeeded, failed, or requires the user to go to their phone, and trigger the appropriate
+ * confirmation.
+ *
+ * <p>To configure the confirmation according to the result of the action, set the extra {@link
+ * #EXTRA_ANIMATION_TYPE} to one of the following values:
+ *
+ * <dl>
+ * <dt>{@link #SUCCESS_ANIMATION}
+ * <dd>Displays a positive confirmation animation with an optional message.
+ * <dt>{@link #OPEN_ON_PHONE_ANIMATION}
+ * <dd>Displays an animation indicating an action has been sent to a paired device.
+ * <dt>{@link #FAILURE_ANIMATION}
+ * <dd>Displays a generic failure page with an optional message.
+ * </dl>
+ *
+ * An optional message, included in the extra {@link #EXTRA_MESSAGE} will be displayed horizontally
+ * centered below the animation.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public class ConfirmationActivity extends Activity {
+
+    public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
+    public static final String EXTRA_ANIMATION_TYPE =
+            "androidx.wear.activity.extra.ANIMATION_TYPE";
+
+    public static final int SUCCESS_ANIMATION = 1;
+    public static final int OPEN_ON_PHONE_ANIMATION = 2;
+    public static final int FAILURE_ANIMATION = 3;
+
+    private static final SparseIntArray CONFIRMATION_OVERLAY_TYPES = new SparseIntArray();
+
+    static {
+        CONFIRMATION_OVERLAY_TYPES.append(SUCCESS_ANIMATION, ConfirmationOverlay.SUCCESS_ANIMATION);
+        CONFIRMATION_OVERLAY_TYPES.append(
+                OPEN_ON_PHONE_ANIMATION, ConfirmationOverlay.OPEN_ON_PHONE_ANIMATION);
+        CONFIRMATION_OVERLAY_TYPES.append(FAILURE_ANIMATION, ConfirmationOverlay.FAILURE_ANIMATION);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTheme(R.style.ConfirmationActivity);
+
+        Intent intent = getIntent();
+
+        int requestedType = intent.getIntExtra(EXTRA_ANIMATION_TYPE, SUCCESS_ANIMATION);
+        if (CONFIRMATION_OVERLAY_TYPES.indexOfKey(requestedType) < 0) {
+            throw new IllegalArgumentException("Unknown type of animation: " + requestedType);
+        }
+
+        @ConfirmationOverlay.OverlayType int type = CONFIRMATION_OVERLAY_TYPES.get(requestedType);
+        String message = intent.getStringExtra(EXTRA_MESSAGE);
+
+        new ConfirmationOverlay()
+                .setType(type)
+                .setMessage(message)
+                .setFinishedAnimationListener(
+                        new ConfirmationOverlay.OnAnimationFinishedListener() {
+                            @Override
+                            public void onAnimationFinished() {
+                                ConfirmationActivity.this.onAnimationFinished();
+                            }
+                        })
+                .showOn(this);
+    }
+
+    /**
+     * Override this method if you wish to provide different than out-of-the-box behavior when the
+     * confirmation animation finishes. By default this method will finish the ConfirmationActivity.
+     */
+    protected void onAnimationFinished() {
+        finish();
+    }
+}

wear/src/main/java/androidx/wear/widget/ConfirmationOverlay.java

diff --git a/wear/src/main/java/androidx/wear/widget/ConfirmationOverlay.java b/wear/src/main/java/androidx/wear/widget/ConfirmationOverlay.java
new file mode 100644
index 0000000..9748fbd
--- /dev/null
+++ b/wear/src/main/java/androidx/wear/widget/ConfirmationOverlay.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2018 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.
+ */
+
+package androidx.wear.widget;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.view.ViewGroup.MarginLayoutParams;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Locale;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.ContextCompat;
+import androidx.wear.R;
+
+/**
+ * Displays a full-screen confirmation animation with optional text and then hides it.
+ *
+ * <p>This is a lighter-weight version of {@link androidx.wear.activity.ConfirmationActivity}
+ * and should be preferred when constructed from an {@link Activity}.
+ *
+ * <p>Sample usage:
+ *
+ * <pre>
+ *   // Defaults to SUCCESS_ANIMATION
+ *   new ConfirmationOverlay().showOn(myActivity);
+ *
+ *   new ConfirmationOverlay()
+ *      .setType(ConfirmationOverlay.OPEN_ON_PHONE_ANIMATION)
+ *      .setDuration(3000)
+ *      .setMessage("Opening...")
+ *      .setFinishedAnimationListener(new ConfirmationOverlay.OnAnimationFinishedListener() {
+ *          {@literal @}Override
+ *          public void onAnimationFinished() {
+ *              // Finished animating and the content view has been removed from myActivity.
+ *          }
+ *      }).showOn(myActivity);
+ *
+ *   // Default duration is {@link #DEFAULT_ANIMATION_DURATION_MS}
+ *   new ConfirmationOverlay()
+ *      .setType(ConfirmationOverlay.FAILURE_ANIMATION)
+ *      .setMessage("Failed")
+ *      .setFinishedAnimationListener(new ConfirmationOverlay.OnAnimationFinishedListener() {
+ *          {@literal @}Override
+ *          public void onAnimationFinished() {
+ *              // Finished animating and the view has been removed from myView.getRootView().
+ *          }
+ *      }).showAbove(myView);
+ * </pre>
+ */
+public class ConfirmationOverlay {
+
+    /**
+     * Interface for listeners to be notified when the {@link ConfirmationOverlay} animation has
+     * finished and its {@link View} has been removed.
+     */
+    public interface OnAnimationFinishedListener {
+        /**
+         * Called when the confirmation animation is finished.
+         */
+        void onAnimationFinished();
+    }
+
+    /** Default animation duration in ms. **/
+    public static final int DEFAULT_ANIMATION_DURATION_MS = 1000;
+
+    /** Types of animations to display in the overlay. */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({SUCCESS_ANIMATION, FAILURE_ANIMATION, OPEN_ON_PHONE_ANIMATION})
+    public @interface OverlayType {
+    }
+
+    /** {@link OverlayType} indicating the success animation overlay should be displayed. */
+    public static final int SUCCESS_ANIMATION = 0;
+
+    /**
+     * {@link OverlayType} indicating the failure overlay should be shown. The icon associated with
+     * this type, unlike the others, does not animate.
+     */
+    public static final int FAILURE_ANIMATION = 1;
+
+    /** {@link OverlayType} indicating the "Open on Phone" animation overlay should be displayed. */
+    public static final int OPEN_ON_PHONE_ANIMATION = 2;
+
+    @OverlayType
+    private int mType = SUCCESS_ANIMATION;
+    private int mDurationMillis = DEFAULT_ANIMATION_DURATION_MS;
+    private OnAnimationFinishedListener mListener;
+    private String mMessage;
+    private View mOverlayView;
+    private Drawable mOverlayDrawable;
+    private boolean mIsShowing = false;
+
+    private final Handler mMainThreadHandler = new Handler(Looper.getMainLooper());
+    private final Runnable mHideRunnable =
+            new Runnable() {
+                @Override
+                public void run() {
+                    hide();
+                }
+            };
+
+    /**
+     * Sets a message which will be displayed at the same time as the animation.
+     *
+     * @return {@code this} object for method chaining.
+     */
+    public ConfirmationOverlay setMessage(String message) {
+        mMessage = message;
+        return this;
+    }
+
+    /**
+     * Sets the {@link OverlayType} which controls which animation is displayed.
+     *
+     * @return {@code this} object for method chaining.
+     */
+    public ConfirmationOverlay setType(@OverlayType int type) {
+        mType = type;
+        return this;
+    }
+
+    /**
+     * Sets the duration in milliseconds which controls how long the animation will be displayed.
+     * Default duration is {@link #DEFAULT_ANIMATION_DURATION_MS}.
+     *
+     * @return {@code this} object for method chaining.
+     */
+    public ConfirmationOverlay setDuration(int millis) {
+        mDurationMillis = millis;
+        return this;
+    }
+
+    /**
+     * Sets the {@link OnAnimationFinishedListener} which will be invoked once the overlay is no
+     * longer visible.
+     *
+     * @return {@code this} object for method chaining.
+     */
+    public ConfirmationOverlay setFinishedAnimationListener(
+            @Nullable OnAnimationFinishedListener listener) {
+        mListener = listener;
+        return this;
+    }
+
+    /**
+     * Adds the overlay as a child of {@code view.getRootView()}, removing it when complete. While
+     * it is shown, all touches will be intercepted to prevent accidental taps on obscured views.
+     */
+    @MainThread
+    public void showAbove(View view) {
+        if (mIsShowing) {
+            return;
+        }
+        mIsShowing = true;
+
+        updateOverlayView(view.getContext());
+        ((ViewGroup) view.getRootView()).addView(mOverlayView);
+        animateAndHideAfterDelay();
+    }
+
+    /**
+     * Adds the overlay as a content view to the {@code activity}, removing it when complete. While
+     * it is shown, all touches will be intercepted to prevent accidental taps on obscured views.
+     */
+    @MainThread
+    public void showOn(Activity activity) {
+        if (mIsShowing) {
+            return;
+        }
+        mIsShowing = true;
+
+        updateOverlayView(activity);
+        activity.getWindow().addContentView(mOverlayView, mOverlayView.getLayoutParams());
+        animateAndHideAfterDelay();
+    }
+
+    @MainThread
+    private void animateAndHideAfterDelay() {
+        if (mOverlayDrawable instanceof Animatable) {
+            Animatable animatable = (Animatable) mOverlayDrawable;
+            animatable.start();
+        }
+        mMainThreadHandler.postDelayed(mHideRunnable, mDurationMillis);
+    }
+
+    /**
+     * Starts a fadeout animation and removes the view once finished. This is invoked by {@link
+     * #mHideRunnable} after {@link #mDurationMillis} milliseconds.
+     *
+     * @hide
+     */
+    @MainThread
+    @VisibleForTesting
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public void hide() {
+        Animation fadeOut =
+                AnimationUtils.loadAnimation(mOverlayView.getContext(), android.R.anim.fade_out);
+        fadeOut.setAnimationListener(
+                new AnimationListener() {
+                    @Override
+                    public void onAnimationStart(Animation animation) {
+                        mOverlayView.clearAnimation();
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animation animation) {
+                        ((ViewGroup) mOverlayView.getParent()).removeView(mOverlayView);
+                        mIsShowing = false;
+                        if (mListener != null) {
+                            mListener.onAnimationFinished();
+                        }
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animation animation) {
+                    }
+                });
+        mOverlayView.startAnimation(fadeOut);
+    }
+
+    @MainThread
+    private void updateOverlayView(Context context) {
+        if (mOverlayView == null) {
+            //noinspection InflateParams
+            mOverlayView =
+                    LayoutInflater.from(context).inflate(R.layout.ws_overlay_confirmation, null);
+        }
+        mOverlayView.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return true;
+            }
+        });
+        mOverlayView.setLayoutParams(
+                new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+        updateImageView(context, mOverlayView);
+        updateMessageView(context, mOverlayView);
+    }
+
+    @MainThread
+    private void updateMessageView(Context context, View overlayView) {
+        TextView messageView =
+                overlayView.findViewById(R.id.wearable_support_confirmation_overlay_message);
+
+        if (mMessage != null) {
+            int screenWidthPx = ResourcesUtil.getScreenWidthPx(context);
+            int topMarginPx = ResourcesUtil.getFractionOfScreenPx(
+                    context, screenWidthPx, R.fraction.confirmation_overlay_margin_above_text);
+            int sideMarginPx =
+                    ResourcesUtil.getFractionOfScreenPx(
+                            context, screenWidthPx, R.fraction.confirmation_overlay_margin_side);
+
+            MarginLayoutParams layoutParams = (MarginLayoutParams) messageView.getLayoutParams();
+            layoutParams.topMargin = topMarginPx;
+            layoutParams.leftMargin = sideMarginPx;
+            layoutParams.rightMargin = sideMarginPx;
+
+            messageView.setLayoutParams(layoutParams);
+            messageView.setText(mMessage);
+            messageView.setVisibility(View.VISIBLE);
+
+        } else {
+            messageView.setVisibility(View.GONE);
+        }
+    }
+
+    @MainThread
+    private void updateImageView(Context context, View overlayView) {
+        switch (mType) {
+            case SUCCESS_ANIMATION:
+                mOverlayDrawable = ContextCompat.getDrawable(context,
+                        R.drawable.generic_confirmation_animation);
+                break;
+            case FAILURE_ANIMATION:
+                mOverlayDrawable = ContextCompat.getDrawable(context, R.drawable.ws_full_sad);
+                break;
+            case OPEN_ON_PHONE_ANIMATION:
+                mOverlayDrawable =
+                        ContextCompat.getDrawable(context, R.drawable.ws_open_on_phone_animation);
+                break;
+            default:
+                String errorMessage =
+                        String.format(Locale.US, "Invalid ConfirmationOverlay type [%d]", mType);
+                throw new IllegalStateException(errorMessage);
+        }
+
+        ImageView imageView =
+                overlayView.findViewById(R.id.wearable_support_confirmation_overlay_image);
+        imageView.setImageDrawable(mOverlayDrawable);
+    }
+}

wear/src/main/java/androidx/wear/widget/ResourcesUtil.java

diff --git a/wear/src/main/java/androidx/wear/widget/ResourcesUtil.java b/wear/src/main/java/androidx/wear/widget/ResourcesUtil.java
new file mode 100644
index 0000000..d9f02a6
--- /dev/null
+++ b/wear/src/main/java/androidx/wear/widget/ResourcesUtil.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018 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.
+ */
+
+package androidx.wear.widget;
+
+import android.content.Context;
+
+import androidx.annotation.FractionRes;
+
+/**
+ * Utility methods to help with resource calculations.
+ */
+final class ResourcesUtil {
+
+    /**
+     * Returns the screen width in pixels.
+      */
+    static int getScreenWidthPx(Context context) {
+        return context.getResources().getDisplayMetrics().widthPixels;
+    }
+
+    /**
+     * Returns the screen height in pixels.
+     */
+    static int getScreenHeightPx(Context context) {
+        return context.getResources().getDisplayMetrics().heightPixels;
+    }
+
+    /**
+     * Returns the number of pixels equivalent to the percentage of {@code resId} to the current
+     * screen.
+     */
+    static int getFractionOfScreenPx(Context context, int screenPx, @FractionRes int resId) {
+        float marginPercent = context.getResources().getFraction(resId, 1, 1);
+        return (int) (marginPercent * screenPx);
+    }
+
+    private ResourcesUtil() {}
+}