Move smaller projects out of v7 folder.

Bug: 74390715
Test: none
Change-Id: I48a3efcbb9eeb705cad589f4d65ed0b7ee3a4f50

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/settings.gradle b/settings.gradle
index 3019f74..e085cb9 100644
--- a/settings.gradle
+++ b/settings.gradle

@@ -37,7 +37,7 @@
 includeProject(":appcompat", "v7/appcompat")
 includeProject(":asynclayoutinflater", "asynclayoutinflater")
 includeProject(":car", "car")
-includeProject(":cardview", "v7/cardview")
+includeProject(":cardview", "cardview")
 includeProject(":collection", "collection")
 includeProject(":coordinatorlayout", "coordinatorlayout")
 includeProject(":cursoradapter", "cursoradapter")
@@ -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,10 +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(":preference", "preference")
 includeProject(":leanback-preference", "preference-leanback")
 includeProject(":print", "print")
 includeProject(":recommendation", "recommendation")