Merge "Snap for 4455664 from 97b4cb95e04a1691ace7dce93d6a66c48041ca9a to oreo-vts-release" into oreo-vts-release
diff --git a/current/Android.mk b/current/Android.mk
index a1e1f10..d176031 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -32,11 +32,6 @@
# Set up prebuilts for additional non-core library artifacts.
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += \
$(patsubst $(LOCAL_PATH)/%,%,\
- $(shell find $(LOCAL_PATH)/extras -name "*.jar"))
-
-# Set up prebuilts for Multidex library artifacts.
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += \
- $(patsubst $(LOCAL_PATH)/%,%,\
$(shell find $(LOCAL_PATH)/multidex -name "*.jar"))
include $(BUILD_MULTI_PREBUILT)
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 12d306b..bf08d75 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/compat/libs/android-support-compat.jar b/current/support/compat/libs/android-support-compat.jar
index d4151ca..d570a44 100644
--- a/current/support/compat/libs/android-support-compat.jar
+++ b/current/support/compat/libs/android-support-compat.jar
Binary files differ
diff --git a/current/support/compat/res/drawable-v21/notification_action_background.xml b/current/support/compat/res/drawable-v21/notification_action_background.xml
deleted file mode 100644
index f3b47cb..0000000
--- a/current/support/compat/res/drawable-v21/notification_action_background.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/ripple_material_light">
- <item android:id="@android:id/mask">
- <inset xmlns:android="http://schemas.android.com/apk/res/android"
- android:insetLeft="@dimen/compat_button_inset_horizontal_material"
- android:insetTop="@dimen/compat_button_inset_vertical_material"
- android:insetRight="@dimen/compat_button_inset_horizontal_material"
- android:insetBottom="@dimen/compat_button_inset_vertical_material">
- <shape android:shape="rectangle">
- <corners android:radius="@dimen/compat_control_corner_material" />
- <solid android:color="@android:color/white" />
- <padding android:left="@dimen/compat_button_padding_horizontal_material"
- android:top="@dimen/compat_button_padding_vertical_material"
- android:right="@dimen/compat_button_padding_horizontal_material"
- android:bottom="@dimen/compat_button_padding_vertical_material" />
- </shape>
- </inset>
- </item>
-</ripple>
\ No newline at end of file
diff --git a/current/support/compat/res/values-af/values-af.xml b/current/support/compat/res/values-af/values-af.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-af/values-af.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-am/values-am.xml b/current/support/compat/res/values-am/values-am.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-am/values-am.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ar/values-ar.xml b/current/support/compat/res/values-ar/values-ar.xml
deleted file mode 100644
index c26a310..0000000
--- a/current/support/compat/res/values-ar/values-ar.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"+999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-az/values-az.xml b/current/support/compat/res/values-az/values-az.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-az/values-az.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-b+sr+Latn/values-b+sr+Latn.xml b/current/support/compat/res/values-b+sr+Latn/values-b+sr+Latn.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-b+sr+Latn/values-b+sr+Latn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-be/values-be.xml b/current/support/compat/res/values-be/values-be.xml
deleted file mode 100644
index c0898d5..0000000
--- a/current/support/compat/res/values-be/values-be.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"больш за 999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-bg/values-bg.xml b/current/support/compat/res/values-bg/values-bg.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-bg/values-bg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-bn/values-bn.xml b/current/support/compat/res/values-bn/values-bn.xml
deleted file mode 100644
index d3f449a..0000000
--- a/current/support/compat/res/values-bn/values-bn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"৯৯৯+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-bs/values-bs.xml b/current/support/compat/res/values-bs/values-bs.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-bs/values-bs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ca/values-ca.xml b/current/support/compat/res/values-ca/values-ca.xml
deleted file mode 100644
index c26a310..0000000
--- a/current/support/compat/res/values-ca/values-ca.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"+999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-cs/values-cs.xml b/current/support/compat/res/values-cs/values-cs.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-cs/values-cs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-da/values-da.xml b/current/support/compat/res/values-da/values-da.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-da/values-da.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-de/values-de.xml b/current/support/compat/res/values-de/values-de.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-de/values-de.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-el/values-el.xml b/current/support/compat/res/values-el/values-el.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-el/values-el.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-en-rAU/values-en-rAU.xml b/current/support/compat/res/values-en-rAU/values-en-rAU.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-en-rAU/values-en-rAU.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-en-rGB/values-en-rGB.xml b/current/support/compat/res/values-en-rGB/values-en-rGB.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-en-rGB/values-en-rGB.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-en-rIN/values-en-rIN.xml b/current/support/compat/res/values-en-rIN/values-en-rIN.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-en-rIN/values-en-rIN.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-es-rUS/values-es-rUS.xml b/current/support/compat/res/values-es-rUS/values-es-rUS.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-es-rUS/values-es-rUS.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-es/values-es.xml b/current/support/compat/res/values-es/values-es.xml
deleted file mode 100644
index c26a310..0000000
--- a/current/support/compat/res/values-es/values-es.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"+999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-et/values-et.xml b/current/support/compat/res/values-et/values-et.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-et/values-et.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-eu/values-eu.xml b/current/support/compat/res/values-eu/values-eu.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-eu/values-eu.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-fa/values-fa.xml b/current/support/compat/res/values-fa/values-fa.xml
deleted file mode 100644
index 72d8054..0000000
--- a/current/support/compat/res/values-fa/values-fa.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"۹۹۹+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-fi/values-fi.xml b/current/support/compat/res/values-fi/values-fi.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-fi/values-fi.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-fr-rCA/values-fr-rCA.xml b/current/support/compat/res/values-fr-rCA/values-fr-rCA.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-fr-rCA/values-fr-rCA.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-fr/values-fr.xml b/current/support/compat/res/values-fr/values-fr.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-fr/values-fr.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-gl/values-gl.xml b/current/support/compat/res/values-gl/values-gl.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-gl/values-gl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-gu/values-gu.xml b/current/support/compat/res/values-gu/values-gu.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-gu/values-gu.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-hi/values-hi.xml b/current/support/compat/res/values-hi/values-hi.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-hi/values-hi.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-hr/values-hr.xml b/current/support/compat/res/values-hr/values-hr.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-hr/values-hr.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-hu/values-hu.xml b/current/support/compat/res/values-hu/values-hu.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-hu/values-hu.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-hy/values-hy.xml b/current/support/compat/res/values-hy/values-hy.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-hy/values-hy.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-in/values-in.xml b/current/support/compat/res/values-in/values-in.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-in/values-in.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-is/values-is.xml b/current/support/compat/res/values-is/values-is.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-is/values-is.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-it/values-it.xml b/current/support/compat/res/values-it/values-it.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-it/values-it.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-iw/values-iw.xml b/current/support/compat/res/values-iw/values-iw.xml
deleted file mode 100644
index a6b4e96..0000000
--- a/current/support/compat/res/values-iw/values-iw.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ja/values-ja.xml b/current/support/compat/res/values-ja/values-ja.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ja/values-ja.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ka/values-ka.xml b/current/support/compat/res/values-ka/values-ka.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ka/values-ka.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-kk/values-kk.xml b/current/support/compat/res/values-kk/values-kk.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-kk/values-kk.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-km/values-km.xml b/current/support/compat/res/values-km/values-km.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-km/values-km.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-kn/values-kn.xml b/current/support/compat/res/values-kn/values-kn.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-kn/values-kn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ko/values-ko.xml b/current/support/compat/res/values-ko/values-ko.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ko/values-ko.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ky/values-ky.xml b/current/support/compat/res/values-ky/values-ky.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ky/values-ky.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-lo/values-lo.xml b/current/support/compat/res/values-lo/values-lo.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-lo/values-lo.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-lt/values-lt.xml b/current/support/compat/res/values-lt/values-lt.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-lt/values-lt.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-lv/values-lv.xml b/current/support/compat/res/values-lv/values-lv.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-lv/values-lv.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-mk/values-mk.xml b/current/support/compat/res/values-mk/values-mk.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-mk/values-mk.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ml/values-ml.xml b/current/support/compat/res/values-ml/values-ml.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ml/values-ml.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-mn/values-mn.xml b/current/support/compat/res/values-mn/values-mn.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-mn/values-mn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-mr/values-mr.xml b/current/support/compat/res/values-mr/values-mr.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-mr/values-mr.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ms/values-ms.xml b/current/support/compat/res/values-ms/values-ms.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ms/values-ms.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-my/values-my.xml b/current/support/compat/res/values-my/values-my.xml
deleted file mode 100644
index 2ca0156..0000000
--- a/current/support/compat/res/values-my/values-my.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"၉၉၉+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-nb/values-nb.xml b/current/support/compat/res/values-nb/values-nb.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-nb/values-nb.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ne/values-ne.xml b/current/support/compat/res/values-ne/values-ne.xml
deleted file mode 100644
index 03ab3e4..0000000
--- a/current/support/compat/res/values-ne/values-ne.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"९९९+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-nl/values-nl.xml b/current/support/compat/res/values-nl/values-nl.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-nl/values-nl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-pa/values-pa.xml b/current/support/compat/res/values-pa/values-pa.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-pa/values-pa.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-pl/values-pl.xml b/current/support/compat/res/values-pl/values-pl.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-pl/values-pl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-port/values-port.xml b/current/support/compat/res/values-port/values-port.xml
deleted file mode 100644
index 7a925dc..0000000
--- a/current/support/compat/res/values-port/values-port.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <bool name="abc_action_bar_embed_tabs">false</bool>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-pt-rBR/values-pt-rBR.xml b/current/support/compat/res/values-pt-rBR/values-pt-rBR.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-pt-rBR/values-pt-rBR.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-pt-rPT/values-pt-rPT.xml b/current/support/compat/res/values-pt-rPT/values-pt-rPT.xml
deleted file mode 100644
index c26a310..0000000
--- a/current/support/compat/res/values-pt-rPT/values-pt-rPT.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"+999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-pt/values-pt.xml b/current/support/compat/res/values-pt/values-pt.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-pt/values-pt.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ro/values-ro.xml b/current/support/compat/res/values-ro/values-ro.xml
deleted file mode 100644
index 1ccf61b..0000000
--- a/current/support/compat/res/values-ro/values-ro.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"˃999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ru/values-ru.xml b/current/support/compat/res/values-ru/values-ru.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-ru/values-ru.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-si/values-si.xml b/current/support/compat/res/values-si/values-si.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-si/values-si.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-sk/values-sk.xml b/current/support/compat/res/values-sk/values-sk.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-sk/values-sk.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-sl/values-sl.xml b/current/support/compat/res/values-sl/values-sl.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-sl/values-sl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-sq/values-sq.xml b/current/support/compat/res/values-sq/values-sq.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-sq/values-sq.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-sr/values-sr.xml b/current/support/compat/res/values-sr/values-sr.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-sr/values-sr.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-sv/values-sv.xml b/current/support/compat/res/values-sv/values-sv.xml
deleted file mode 100644
index 6ded302..0000000
--- a/current/support/compat/res/values-sv/values-sv.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">">999"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-sw/values-sw.xml b/current/support/compat/res/values-sw/values-sw.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-sw/values-sw.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ta/values-ta.xml b/current/support/compat/res/values-ta/values-ta.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-ta/values-ta.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-te/values-te.xml b/current/support/compat/res/values-te/values-te.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-te/values-te.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-th/values-th.xml b/current/support/compat/res/values-th/values-th.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-th/values-th.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-tl/values-tl.xml b/current/support/compat/res/values-tl/values-tl.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-tl/values-tl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-tr/values-tr.xml b/current/support/compat/res/values-tr/values-tr.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-tr/values-tr.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-uk/values-uk.xml b/current/support/compat/res/values-uk/values-uk.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-uk/values-uk.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-ur/values-ur.xml b/current/support/compat/res/values-ur/values-ur.xml
deleted file mode 100644
index a6b4e96..0000000
--- a/current/support/compat/res/values-ur/values-ur.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-uz/values-uz.xml b/current/support/compat/res/values-uz/values-uz.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-uz/values-uz.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-v16/values-v16.xml b/current/support/compat/res/values-v16/values-v16.xml
deleted file mode 100644
index 2e02d69..0000000
--- a/current/support/compat/res/values-v16/values-v16.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <dimen name="notification_right_side_padding_top">4dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-v21/values-v21.xml b/current/support/compat/res/values-v21/values-v21.xml
deleted file mode 100644
index faf606e..0000000
--- a/current/support/compat/res/values-v21/values-v21.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="notification_action_color_filter">@color/secondary_text_default_material_light</color>
- <dimen name="notification_content_margin_start">0dp</dimen>
- <dimen name="notification_main_column_padding_top">0dp</dimen>
- <dimen name="notification_media_narrow_margin">12dp</dimen>
- <style name="TextAppearance.Compat.Notification" parent="@android:style/TextAppearance.Material.Notification"/>
- <style name="TextAppearance.Compat.Notification.Info" parent="@android:style/TextAppearance.Material.Notification.Info"/>
- <style name="TextAppearance.Compat.Notification.Time" parent="@android:style/TextAppearance.Material.Notification.Time"/>
- <style name="TextAppearance.Compat.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title"/>
- <style name="Widget.Compat.NotificationActionContainer" parent="">
- <item name="android:background">@drawable/notification_action_background</item>
- </style>
- <style name="Widget.Compat.NotificationActionText" parent="">
- <item name="android:textAppearance">?android:attr/textAppearanceButton</item>
- <item name="android:textColor">@color/secondary_text_default_material_light</item>
- <item name="android:textSize">@dimen/notification_action_text_size</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-vi/values-vi.xml b/current/support/compat/res/values-vi/values-vi.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-vi/values-vi.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-zh-rCN/values-zh-rCN.xml b/current/support/compat/res/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-zh-rHK/values-zh-rHK.xml b/current/support/compat/res/values-zh-rHK/values-zh-rHK.xml
deleted file mode 100644
index 3b20c07..0000000
--- a/current/support/compat/res/values-zh-rHK/values-zh-rHK.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999 +"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-zh-rTW/values-zh-rTW.xml b/current/support/compat/res/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values-zu/values-zu.xml b/current/support/compat/res/values-zu/values-zu.xml
deleted file mode 100644
index 553bf48..0000000
--- a/current/support/compat/res/values-zu/values-zu.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
-</resources>
\ No newline at end of file
diff --git a/current/support/compat/res/values/values.xml b/current/support/compat/res/values/values.xml
index 02fddcf..5dd119a 100644
--- a/current/support/compat/res/values/values.xml
+++ b/current/support/compat/res/values/values.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="notification_action_color_filter">#ffffffff</color>
- <color name="notification_icon_bg_color">#ff9e9e9e</color>
- <color name="ripple_material_light">#1f000000</color>
- <color name="secondary_text_default_material_light">#8a000000</color>
<declare-styleable name="FontFamily"><attr format="string" name="fontProviderAuthority"/><attr format="string" name="fontProviderPackage"/><attr format="string" name="fontProviderQuery"/><attr format="reference" name="fontProviderCerts"/><attr name="fontProviderFetchStrategy">
<enum name="blocking" value="0"/>
@@ -17,46 +13,4 @@
<enum name="normal" value="0"/>
<enum name="italic" value="1"/>
</attr><attr format="reference" name="font"/><attr format="integer" name="fontWeight"/></declare-styleable>
- <dimen name="compat_button_inset_horizontal_material">4dp</dimen>
- <dimen name="compat_button_inset_vertical_material">6dp</dimen>
- <dimen name="compat_button_padding_horizontal_material">8dp</dimen>
- <dimen name="compat_button_padding_vertical_material">4dp</dimen>
- <dimen name="compat_control_corner_material">2dp</dimen>
- <dimen name="notification_action_icon_size">32dp</dimen>
- <dimen name="notification_action_text_size">13sp</dimen>
- <dimen name="notification_big_circle_margin">12dp</dimen>
- <dimen name="notification_content_margin_start">8dp</dimen>
- <dimen name="notification_large_icon_height">64dp</dimen>
- <dimen name="notification_large_icon_width">64dp</dimen>
- <dimen name="notification_main_column_padding_top">10dp</dimen>
- <dimen name="notification_media_narrow_margin">@dimen/notification_content_margin_start</dimen>
- <dimen name="notification_right_icon_size">16dp</dimen>
- <dimen name="notification_right_side_padding_top">2dp</dimen>
- <dimen name="notification_small_icon_background_padding">3dp</dimen>
- <dimen name="notification_small_icon_size_as_large">24dp</dimen>
- <dimen name="notification_subtext_size">13sp</dimen>
- <dimen name="notification_top_pad">10dp</dimen>
- <dimen name="notification_top_pad_large_text">5dp</dimen>
- <drawable name="notification_template_icon_bg">#3333B5E5</drawable>
- <drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
- <item name="line1" type="id"/>
- <item name="line3" type="id"/>
- <item name="text" type="id"/>
- <item name="text2" type="id"/>
- <item name="title" type="id"/>
- <integer name="status_bar_notification_info_maxnum">999</integer>
- <string name="status_bar_notification_info_overflow">999+</string>
- <style name="TextAppearance.Compat.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
- <style name="TextAppearance.Compat.Notification.Info">
- <item name="android:textSize">12sp</item>
- <item name="android:textColor">?android:attr/textColorSecondary</item>
- </style>
- <style name="TextAppearance.Compat.Notification.Line2" parent="TextAppearance.Compat.Notification.Info"/>
- <style name="TextAppearance.Compat.Notification.Time">
- <item name="android:textSize">12sp</item>
- <item name="android:textColor">?android:attr/textColorSecondary</item>
- </style>
- <style name="TextAppearance.Compat.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"/>
- <style name="Widget.Compat.NotificationActionContainer" parent=""/>
- <style name="Widget.Compat.NotificationActionText" parent=""/>
</resources>
\ No newline at end of file
diff --git a/current/support/core-ui/android-support-core-ui.jar b/current/support/core-ui/android-support-core-ui.jar
index 533c979..1097023 100644
--- a/current/support/core-ui/android-support-core-ui.jar
+++ b/current/support/core-ui/android-support-core-ui.jar
Binary files differ
diff --git a/current/support/core-utils/android-support-core-utils.jar b/current/support/core-utils/android-support-core-utils.jar
index 8c84f84..742a5a6 100644
--- a/current/support/core-utils/android-support-core-utils.jar
+++ b/current/support/core-utils/android-support-core-utils.jar
Binary files differ
diff --git a/current/support/customtabs/android-support-customtabs.jar b/current/support/customtabs/android-support-customtabs.jar
index 181f728..8a7590a 100644
--- a/current/support/customtabs/android-support-customtabs.jar
+++ b/current/support/customtabs/android-support-customtabs.jar
Binary files differ
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index 6eb84ec..139c4ac 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
Binary files differ
diff --git a/current/support/design/res/values/values.xml b/current/support/design/res/values/values.xml
index 121f64a..ab1e38b 100644
--- a/current/support/design/res/values/values.xml
+++ b/current/support/design/res/values/values.xml
@@ -300,6 +300,7 @@
<item name="windowNoTitle">true</item>
</style>
<style name="Widget.Design.AppBarLayout" parent="Base.Widget.Design.AppBarLayout">
+ <item name="android:paddingLeft">300px</item>
</style>
<style name="Widget.Design.BottomNavigationView" parent="">
<item name="itemBackground">?attr/selectableItemBackgroundBorderless</item>
diff --git a/current/support/dynamic-animation/android-support-dynamic-animation.jar b/current/support/dynamic-animation/android-support-dynamic-animation.jar
index b45909b..9c14db5 100644
--- a/current/support/dynamic-animation/android-support-dynamic-animation.jar
+++ b/current/support/dynamic-animation/android-support-dynamic-animation.jar
Binary files differ
diff --git a/current/support/emoji-appcompat/android-support-emoji-appcompat.jar b/current/support/emoji-appcompat/android-support-emoji-appcompat.jar
index f8e9021..1c1fb96 100644
--- a/current/support/emoji-appcompat/android-support-emoji-appcompat.jar
+++ b/current/support/emoji-appcompat/android-support-emoji-appcompat.jar
Binary files differ
diff --git a/current/support/emoji-bundled/android-support-emoji-bundled.jar b/current/support/emoji-bundled/android-support-emoji-bundled.jar
index 795b302..54b4c27 100644
--- a/current/support/emoji-bundled/android-support-emoji-bundled.jar
+++ b/current/support/emoji-bundled/android-support-emoji-bundled.jar
Binary files differ
diff --git a/current/support/emoji-bundled/assets/NotoColorEmojiCompat.ttf b/current/support/emoji-bundled/assets/NotoColorEmojiCompat.ttf
index ac40624..428f082 100644
--- a/current/support/emoji-bundled/assets/NotoColorEmojiCompat.ttf
+++ b/current/support/emoji-bundled/assets/NotoColorEmojiCompat.ttf
Binary files differ
diff --git a/current/support/emoji/libs/android-support-emoji.jar b/current/support/emoji/libs/android-support-emoji.jar
index cba20b8..fc443d5 100644
--- a/current/support/emoji/libs/android-support-emoji.jar
+++ b/current/support/emoji/libs/android-support-emoji.jar
Binary files differ
diff --git a/current/support/emoji/res/layout/input_method_extract_view.xml b/current/support/emoji/res/layout/input_method_extract_view.xml
deleted file mode 100644
index 7eb3d1c..0000000
--- a/current/support/emoji/res/layout/input_method_extract_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<merge
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <android.support.text.emoji.widget.EmojiExtractEditText
- android:id="@+id/android:inputExtractEditText"
- android:layout_width="0px"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="top"
- android:inputType="text"
- android:minLines="1"
- android:scrollbars="vertical"/>
-
- <FrameLayout
- android:id="@+id/inputExtractAccessories"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingEnd="8dip"
- android:paddingStart="8dip">
-
- <android.support.text.emoji.widget.ExtractButtonCompat
- android:id="@+id/inputExtractAction"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"/>
-
- </FrameLayout>
-
-</merge>
\ No newline at end of file
diff --git a/current/support/emoji/res/values/values.xml b/current/support/emoji/res/values/values.xml
index c5a7ce9..cba3027 100644
--- a/current/support/emoji/res/values/values.xml
+++ b/current/support/emoji/res/values/values.xml
@@ -1,12 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="EmojiEditText"><attr format="integer" name="maxEmojiCount"/></declare-styleable>
- <declare-styleable name="EmojiExtractTextLayout"><attr format="enum" name="emojiReplaceStrategy">
-
- <enum name="defaultStrategy" value="0"/>
-
- <enum name="all" value="1"/>
-
- <enum name="nonExistent" value="2"/>
- </attr></declare-styleable>
</resources>
\ No newline at end of file
diff --git a/current/support/exifinterface/android-support-exifinterface.jar b/current/support/exifinterface/android-support-exifinterface.jar
index de57644..3a60ced 100644
--- a/current/support/exifinterface/android-support-exifinterface.jar
+++ b/current/support/exifinterface/android-support-exifinterface.jar
Binary files differ
diff --git a/current/support/fragment/android-support-fragment.jar b/current/support/fragment/android-support-fragment.jar
index 951271f..294f053 100644
--- a/current/support/fragment/android-support-fragment.jar
+++ b/current/support/fragment/android-support-fragment.jar
Binary files differ
diff --git a/current/support/graphics/drawable/android-support-animatedvectordrawable.jar b/current/support/graphics/drawable/android-support-animatedvectordrawable.jar
index 83b6440..63dbd83 100644
--- a/current/support/graphics/drawable/android-support-animatedvectordrawable.jar
+++ b/current/support/graphics/drawable/android-support-animatedvectordrawable.jar
Binary files differ
diff --git a/current/support/graphics/drawable/android-support-vectordrawable.jar b/current/support/graphics/drawable/android-support-vectordrawable.jar
index ddb425c..6345727 100644
--- a/current/support/graphics/drawable/android-support-vectordrawable.jar
+++ b/current/support/graphics/drawable/android-support-vectordrawable.jar
Binary files differ
diff --git a/current/support/media-compat/android-support-media-compat.jar b/current/support/media-compat/android-support-media-compat.jar
new file mode 100644
index 0000000..d1d602c
--- /dev/null
+++ b/current/support/media-compat/android-support-media-compat.jar
Binary files differ
diff --git a/current/support/media-compat/libs/android-support-media-compat.jar b/current/support/media-compat/libs/android-support-media-compat.jar
deleted file mode 100644
index ba40cca..0000000
--- a/current/support/media-compat/libs/android-support-media-compat.jar
+++ /dev/null
Binary files differ
diff --git a/current/support/media-compat/res/values-v21/values-v21.xml b/current/support/media-compat/res/values-v21/values-v21.xml
deleted file mode 100644
index f1bea92..0000000
--- a/current/support/media-compat/res/values-v21/values-v21.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="TextAppearance.Compat.Notification.Info.Media">
- <item name="android:textColor">@color/secondary_text_default_material_dark</item>
- </style>
- <style name="TextAppearance.Compat.Notification.Media">
- <item name="android:textColor">@color/secondary_text_default_material_dark</item>
- </style>
- <style name="TextAppearance.Compat.Notification.Time.Media">
- <item name="android:textColor">@color/secondary_text_default_material_dark</item>
- </style>
- <style name="TextAppearance.Compat.Notification.Title.Media">
- <item name="android:textColor">@color/primary_text_default_material_dark</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/current/support/media-compat/res/values-v24/values-v24.xml b/current/support/media-compat/res/values-v24/values-v24.xml
deleted file mode 100644
index 5a38dd7..0000000
--- a/current/support/media-compat/res/values-v24/values-v24.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="TextAppearance.Compat.Notification.Info.Media"/>
- <style name="TextAppearance.Compat.Notification.Media"/>
- <style name="TextAppearance.Compat.Notification.Time.Media"/>
- <style name="TextAppearance.Compat.Notification.Title.Media"/>
-</resources>
\ No newline at end of file
diff --git a/current/support/media-compat/res/values/values.xml b/current/support/media-compat/res/values/values.xml
deleted file mode 100644
index d306bfd..0000000
--- a/current/support/media-compat/res/values/values.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="notification_material_background_media_default_color">#ff424242</color>
- <color name="primary_text_default_material_dark">#ffffffff</color>
- <color name="secondary_text_default_material_dark">#b3ffffff</color>
- <integer name="cancel_button_image_alpha">127</integer>
- <style name="TextAppearance.Compat.Notification.Info.Media"/>
- <style name="TextAppearance.Compat.Notification.Line2.Media" parent="TextAppearance.Compat.Notification.Info.Media"/>
- <style name="TextAppearance.Compat.Notification.Media"/>
- <style name="TextAppearance.Compat.Notification.Time.Media"/>
- <style name="TextAppearance.Compat.Notification.Title.Media"/>
-</resources>
\ No newline at end of file
diff --git a/current/support/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar
index 3536c3f..6be752f 100644
--- a/current/support/percent/libs/android-support-percent.jar
+++ b/current/support/percent/libs/android-support-percent.jar
Binary files differ
diff --git a/current/support/recommendation/android-support-recommendation.jar b/current/support/recommendation/android-support-recommendation.jar
index 21ef089..2464135 100644
--- a/current/support/recommendation/android-support-recommendation.jar
+++ b/current/support/recommendation/android-support-recommendation.jar
Binary files differ
diff --git a/current/support/transition/libs/android-support-transition.jar b/current/support/transition/libs/android-support-transition.jar
index df98bd9..7097025 100644
--- a/current/support/transition/libs/android-support-transition.jar
+++ b/current/support/transition/libs/android-support-transition.jar
Binary files differ
diff --git a/current/support/tv-provider/android-support-tv-provider.jar b/current/support/tv-provider/android-support-tv-provider.jar
index 933726e..80ace51 100644
--- a/current/support/tv-provider/android-support-tv-provider.jar
+++ b/current/support/tv-provider/android-support-tv-provider.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13-nodeps.jar b/current/support/v13/android-support-v13-nodeps.jar
index e109148..b556fb4 100644
--- a/current/support/v13/android-support-v13-nodeps.jar
+++ b/current/support/v13/android-support-v13-nodeps.jar
Binary files differ
diff --git a/current/support/v14/preference/libs/android-support-v14-preference.jar b/current/support/v14/preference/libs/android-support-v14-preference.jar
index c2c77f1..1ea7d39 100644
--- a/current/support/v14/preference/libs/android-support-v14-preference.jar
+++ b/current/support/v14/preference/libs/android-support-v14-preference.jar
Binary files differ
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 9d513d3..1e221ea 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/leanback/res/animator-v21/lb_onboarding_description_enter.xml b/current/support/v17/leanback/res/animator-v21/lb_onboarding_description_enter.xml
deleted file mode 100644
index 3cb5843..0000000
--- a/current/support/v17/leanback/res/animator-v21/lb_onboarding_description_enter.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <objectAnimator
- android:propertyName="alpha"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_description_delay"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- <objectAnimator
- android:propertyName="translationY"
- android:valueFrom="60dp"
- android:valueTo="0dp"
- android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_description_delay"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/current/support/v17/leanback/res/animator-v21/lb_onboarding_logo_enter.xml b/current/support/v17/leanback/res/animator-v21/lb_onboarding_logo_enter.xml
deleted file mode 100644
index 76a4609..0000000
--- a/current/support/v17/leanback/res/animator-v21/lb_onboarding_logo_enter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <objectAnimator
- android:propertyName="alpha"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:duration="333"
- android:interpolator="@android:interpolator/linear_out_slow_in" />
-</set>
diff --git a/current/support/v17/leanback/res/animator-v21/lb_onboarding_logo_exit.xml b/current/support/v17/leanback/res/animator-v21/lb_onboarding_logo_exit.xml
deleted file mode 100644
index 40b618e..0000000
--- a/current/support/v17/leanback/res/animator-v21/lb_onboarding_logo_exit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <objectAnimator
- android:propertyName="alpha"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:duration="666"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/current/support/v17/leanback/res/animator-v21/lb_onboarding_page_indicator_enter.xml b/current/support/v17/leanback/res/animator-v21/lb_onboarding_page_indicator_enter.xml
deleted file mode 100644
index e9fc46e..0000000
--- a/current/support/v17/leanback/res/animator-v21/lb_onboarding_page_indicator_enter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <objectAnimator
- android:propertyName="alpha"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:duration="500"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/current/support/v17/leanback/res/animator-v21/lb_onboarding_title_enter.xml b/current/support/v17/leanback/res/animator-v21/lb_onboarding_title_enter.xml
deleted file mode 100644
index 9b65b48..0000000
--- a/current/support/v17/leanback/res/animator-v21/lb_onboarding_title_enter.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <objectAnimator
- android:propertyName="alpha"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_title_delay"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- <objectAnimator
- android:propertyName="translationY"
- android:valueFrom="60dp"
- android:valueTo="0dp"
- android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_title_delay"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/current/support/v17/leanback/res/anim/lb_decelerator_2.xml b/current/support/v17/leanback/res/animator/lb_decelerator_2.xml
similarity index 100%
rename from current/support/v17/leanback/res/anim/lb_decelerator_2.xml
rename to current/support/v17/leanback/res/animator/lb_decelerator_2.xml
diff --git a/current/support/v17/leanback/res/anim/lb_decelerator_4.xml b/current/support/v17/leanback/res/animator/lb_decelerator_4.xml
similarity index 100%
rename from current/support/v17/leanback/res/anim/lb_decelerator_4.xml
rename to current/support/v17/leanback/res/animator/lb_decelerator_4.xml
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml b/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml
index d8393bd..3cb5843 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml
@@ -21,11 +21,13 @@
android:valueFrom="0.0"
android:valueTo="1.0"
android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_description_delay" />
+ android:startOffset="@integer/lb_onboarding_header_description_delay"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:propertyName="translationY"
android:valueFrom="60dp"
android:valueTo="0dp"
android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_description_delay" />
+ android:startOffset="@integer/lb_onboarding_header_description_delay"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
</set>
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_logo_enter.xml b/current/support/v17/leanback/res/animator/lb_onboarding_logo_enter.xml
index 5d8d762..76a4609 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_logo_enter.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_logo_enter.xml
@@ -20,5 +20,6 @@
android:propertyName="alpha"
android:valueFrom="0.0"
android:valueTo="1.0"
- android:duration="333" />
+ android:duration="333"
+ android:interpolator="@android:interpolator/linear_out_slow_in" />
</set>
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_logo_exit.xml b/current/support/v17/leanback/res/animator/lb_onboarding_logo_exit.xml
index 820ba8e..40b618e 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_logo_exit.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_logo_exit.xml
@@ -20,5 +20,6 @@
android:propertyName="alpha"
android:valueFrom="1.0"
android:valueTo="0.0"
- android:duration="666" />
+ android:duration="666"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
</set>
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_page_indicator_enter.xml b/current/support/v17/leanback/res/animator/lb_onboarding_page_indicator_enter.xml
index b8bd083..e9fc46e 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_page_indicator_enter.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_page_indicator_enter.xml
@@ -20,5 +20,6 @@
android:propertyName="alpha"
android:valueFrom="0.0"
android:valueTo="1.0"
- android:duration="500" />
+ android:duration="500"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
</set>
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml b/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml
index 011f51c..9b65b48 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml
@@ -21,11 +21,13 @@
android:valueFrom="0.0"
android:valueTo="1.0"
android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_title_delay" />
+ android:startOffset="@integer/lb_onboarding_header_title_delay"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:propertyName="translationY"
android:valueFrom="60dp"
android:valueTo="0dp"
android:duration="533"
- android:startOffset="@integer/lb_onboarding_header_title_delay" />
+ android:startOffset="@integer/lb_onboarding_header_title_delay"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
</set>
diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
index 30d06bd..b449fa9 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
@@ -67,7 +67,7 @@
<Space
android:id="@+id/spacer"
android:layout_width="match_parent"
- android:layout_height="16dp" />
+ android:layout_height="24dp" />
<FrameLayout
android:id="@+id/controls_dock"
diff --git a/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml
index 8b692f3..1b32be6 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml
@@ -18,14 +18,16 @@
<!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child
views with no padding of their own. Also to allow for negative margin on description. -->
-<LinearLayout
+<android.support.v17.leanback.widget.PlaybackTransportRowView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:clipChildren="false"
android:clipToPadding="false"
- android:paddingBottom="@dimen/lb_playback_transport_control_row_padding_bottom" >
+ android:paddingBottom="@dimen/lb_playback_transport_control_row_padding_bottom"
+ android:paddingStart="?attr/browsePaddingStart"
+ android:paddingEnd="?attr/browsePaddingEnd" >
<FrameLayout
android:layout_width="match_parent"
@@ -34,10 +36,8 @@
android:id="@+id/controls_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
+ android:clipChildren="false"
android:clipToPadding="false"
- android:paddingStart="?attr/browsePaddingStart"
- android:paddingEnd="?attr/browsePaddingEnd"
android:layout_marginBottom="@dimen/lb_playback_transport_control_info_margin_bottom"
android:orientation="horizontal" >
@@ -64,76 +64,64 @@
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:layout_marginBottom="@dimen/lb_playback_transport_thumbs_bottom_margin" />
+ android:layout_gravity="bottom" />
</FrameLayout>
- <android.support.v17.leanback.widget.PlaybackTransportRowView
+ <FrameLayout
+ android:id="@+id/controls_dock"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/transport_row"
- android:orientation="vertical"
- android:paddingStart="?attr/browsePaddingStart"
- android:paddingEnd="?attr/browsePaddingEnd"
- android:clipChildren="false"
- android:clipToPadding="false">
+ android:layout_height="wrap_content"
+ android:layoutDirection="ltr"
+ android:layout_marginLeft="@dimen/lb_playback_transport_controlbar_margin_start"
+ />
+
+ <android.support.v17.leanback.widget.SeekBar
+ android:id="@+id/playback_progress"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/lb_playback_transport_progressbar_height"
+ android:focusable="true" />
+
+ <RelativeLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layoutDirection="ltr"
+ android:layout_marginLeft="@dimen/lb_playback_transport_controlbar_margin_start">
<FrameLayout
- android:id="@+id/controls_dock"
- android:layout_width="match_parent"
+ android:id="@+id/secondary_controls_dock"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layoutDirection="ltr"
- android:layout_marginLeft="@dimen/lb_playback_transport_controlbar_margin_start"
- />
+ android:layout_alignParentStart="true" >
+ </FrameLayout>
- <android.support.v17.leanback.widget.SeekBar
- android:id="@+id/playback_progress"
- android:layout_width="match_parent"
- android:layout_height="@dimen/lb_playback_transport_progressbar_height"
- android:focusable="true" />
+ <TextView
+ android:id="@+id/current_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:layout_toStartOf="@+id/separate_time"
+ android:layout_marginStart="@dimen/lb_playback_transport_time_margin"
+ android:layout_marginTop="@dimen/lb_playback_transport_time_margin_top"
+ style="?attr/playbackControlsTimeStyle" />
- <RelativeLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layoutDirection="ltr"
- android:layout_marginLeft="@dimen/lb_playback_transport_controlbar_margin_start">
- <FrameLayout
- android:id="@+id/secondary_controls_dock"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true" >
- </FrameLayout>
+ <TextView
+ android:id="@+id/separate_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/lb_playback_time_separator"
+ android:layout_gravity="top"
+ android:layout_toStartOf="@+id/total_time"
+ android:layout_marginStart="@dimen/lb_playback_transport_time_margin"
+ android:layout_marginTop="@dimen/lb_playback_transport_time_margin_top"
+ style="?attr/playbackControlsTimeStyle" />
- <TextView
- android:id="@+id/current_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_toStartOf="@+id/separate_time"
- android:layout_marginStart="@dimen/lb_playback_transport_time_margin"
- android:layout_marginTop="@dimen/lb_playback_transport_time_margin_top"
- style="?attr/playbackControlsTimeStyle" />
+ <TextView
+ android:id="@+id/total_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:layout_alignParentEnd="true"
+ android:layout_marginStart="@dimen/lb_playback_transport_time_margin"
+ android:layout_marginTop="@dimen/lb_playback_transport_time_margin_top"
+ style="?attr/playbackControlsTimeStyle" />
+ </RelativeLayout>
- <TextView
- android:id="@+id/separate_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/lb_playback_time_separator"
- android:layout_gravity="top"
- android:layout_toStartOf="@+id/total_time"
- android:layout_marginStart="@dimen/lb_playback_transport_time_margin"
- android:layout_marginTop="@dimen/lb_playback_transport_time_margin_top"
- style="?attr/playbackControlsTimeStyle" />
-
- <TextView
- android:id="@+id/total_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_alignParentEnd="true"
- android:layout_marginStart="@dimen/lb_playback_transport_time_margin"
- android:layout_marginTop="@dimen/lb_playback_transport_time_margin_top"
- style="?attr/playbackControlsTimeStyle" />
- </RelativeLayout>
-
-
- </android.support.v17.leanback.widget.PlaybackTransportRowView>
-</LinearLayout>
+</android.support.v17.leanback.widget.PlaybackTransportRowView>
diff --git a/current/support/v17/leanback/res/layout/lb_row_media_item.xml b/current/support/v17/leanback/res/layout/lb_row_media_item.xml
index e76e281..b25e922 100644
--- a/current/support/v17/leanback/res/layout/lb_row_media_item.xml
+++ b/current/support/v17/leanback/res/layout/lb_row_media_item.xml
@@ -62,7 +62,6 @@
<LinearLayout
android:id="@+id/mediaItemActionsContainer"
- android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="16dip" />
diff --git a/current/support/v17/leanback/res/layout/lb_search_bar.xml b/current/support/v17/leanback/res/layout/lb_search_bar.xml
index 73a5985..37cdfb3 100644
--- a/current/support/v17/leanback/res/layout/lb_search_bar.xml
+++ b/current/support/v17/leanback/res/layout/lb_search_bar.xml
@@ -54,7 +54,7 @@
android:id="@+id/lb_search_text_editor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|start"
+ android:layout_gravity="center_vertical|end"
android:layout_marginStart="@dimen/lb_search_bar_edit_text_margin_start"
android:layout_centerVertical="true"
android:cursorVisible="true"
diff --git a/current/support/v17/leanback/res/transition-v21/lb_title_out.xml b/current/support/v17/leanback/res/transition-v21/lb_title_out.xml
index 2402857..69735ab 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_title_out.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_title_out.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:lb="http://schemas.android.com/apk/res-auto"
class="android.support.v17.leanback.transition.SlideKitkat"
- android:interpolator="@anim/lb_decelerator_2"
+ android:interpolator="@animator/lb_decelerator_2"
lb:lb_slideEdge="top" >
<targets>
<target android:targetId="@id/browse_title_group" />
diff --git a/current/support/v17/leanback/res/values-v18/values-v18.xml b/current/support/v17/leanback/res/values-v18/values-v18.xml
deleted file mode 100644
index 0ef69cb..0000000
--- a/current/support/v17/leanback/res/values-v18/values-v18.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="Theme.LeanbackBase" parent="android:Theme.Holo.NoActionBar">
- <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item>
- <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item>
- <item name="defaultBrandColor">@color/lb_default_brand_color</item>
- <item name="defaultBrandColorDark">@color/lb_default_brand_color_dark</item>
-
- <item name="android:windowOverscan">true</item>
- <item name="guidedStepTheme">@style/Theme.Leanback.GuidedStep</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/values-v21/values-v21.xml b/current/support/v17/leanback/res/values-v21/values-v21.xml
index dcecc50..b5dd168 100644
--- a/current/support/v17/leanback/res/values-v21/values-v21.xml
+++ b/current/support/v17/leanback/res/values-v21/values-v21.xml
@@ -1,31 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TextAppearance.LeanbackBase" parent="android:TextAppearance.Material"/>
- <style name="Theme.Leanback.Browse" parent="Theme.Leanback">
- <item name="android:windowEnterTransition">@transition/lb_browse_enter_transition</item>
- <item name="android:windowReturnTransition">@transition/lb_browse_return_transition</item>
- </style>
- <style name="Theme.Leanback.Details" parent="Theme.Leanback">
- <item name="android:windowEnterTransition">@transition/lb_details_enter_transition</item>
- <item name="android:windowReturnTransition">@transition/lb_details_return_transition</item>
- <item name="android:windowSharedElementEnterTransition">@transition/lb_shared_element_enter_transition</item>
- <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item>
- </style>
- <style name="Theme.Leanback.Details.NoSharedElementTransition">
- <item name="android:windowSharedElementEnterTransition">@null</item>
- <item name="android:windowSharedElementReturnTransition">@null</item>
- </style>
- <style name="Theme.Leanback.GuidedStep.HalfBase" parent="Theme.Leanback.GuidedStep">
- <item name="android:windowEnterTransition">@transition/lb_guidedstep_activity_enter_bottom</item>
- </style>
<style name="Theme.Leanback.GuidedStepBase" parent="Theme.LeanbackBase">
<item name="guidedActionsSelectorDrawable">@drawable/lb_selectable_item_rounded_rect</item>
- <item name="android:windowEnterTransition">@transition/lb_guidedstep_activity_enter</item>
- <item name="android:windowTransitionBackgroundFadeDuration">@integer/lb_guidedstep_activity_background_fade_duration_ms</item>
- </style>
- <style name="Theme.Leanback.VerticalGrid" parent="Theme.Leanback">
- <item name="android:windowEnterTransition">@transition/lb_vertical_grid_enter_transition</item>
- <item name="android:windowReturnTransition">@transition/lb_vertical_grid_return_transition</item>
</style>
<style name="Theme.LeanbackBase" parent="android:Theme.Material.NoActionBar">
<item name="playbackProgressPrimaryColor">?android:attr/colorAccent</item>
@@ -37,24 +14,9 @@
<item name="android:windowOverscan">true</item>
<item name="guidedStepTheme">@style/Theme.Leanback.GuidedStep</item>
-
- <!-- android:windowSharedElementEnterTransition is kept for backward compatibility for apps still refer
- to Theme.Leanback, app should use Theme.Leanback.Details instead -->
- <item name="android:windowSharedElementEnterTransition">@transition/lb_shared_element_enter_transition</item>
- <!-- android:windowSharedElementReturnTransition is kept for backward compatibility for apps still refer
- to Theme.Leanback, app should use Theme.Leanback.Details instead -->
- <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item>
- <item name="android:windowEnterTransition">@transition/lb_enter_transition</item>
- <item name="android:windowReturnTransition">@transition/lb_return_transition</item>
- <item name="android:windowTransitionBackgroundFadeDuration">350</item>
-
</style>
<style name="Widget.Leanback.DetailsActionButtonStyleBase" parent="android:Widget.Material.Button.Borderless">
<item name="android:background">@drawable/lb_action_bg</item>
</style>
- <style name="Widget.Leanback.OnboardingStartButtonStyleBase">
- <item name="android:elevation">1.5dp</item>
- <item name="android:stateListAnimator">@null</item>
- </style>
<style name="Widget.LeanbackBase" parent="android:Widget.Material"/>
</resources>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/values/values.xml b/current/support/v17/leanback/res/values/values.xml
index ab2485e..05fec5b 100644
--- a/current/support/v17/leanback/res/values/values.xml
+++ b/current/support/v17/leanback/res/values/values.xml
@@ -307,18 +307,12 @@
<dimen name="lb_playback_transport_control_info_margin_bottom">20dp</dimen>
<dimen name="lb_playback_transport_control_row_padding_bottom">20dp</dimen>
<dimen name="lb_playback_transport_controlbar_margin_start">-12dp</dimen>
- <dimen name="lb_playback_transport_hero_thumbs_height">192dp</dimen>
- <dimen name="lb_playback_transport_hero_thumbs_width">192dp</dimen>
<dimen name="lb_playback_transport_image_height">176dp</dimen>
<dimen name="lb_playback_transport_image_margin_end">24dp</dimen>
<dimen name="lb_playback_transport_progressbar_active_bar_height">6dp</dimen>
<dimen name="lb_playback_transport_progressbar_active_radius">6dp</dimen>
<dimen name="lb_playback_transport_progressbar_bar_height">4dp</dimen>
<dimen name="lb_playback_transport_progressbar_height">28dp</dimen>
- <dimen name="lb_playback_transport_thumbs_bottom_margin">18dp</dimen>
- <dimen name="lb_playback_transport_thumbs_height">154dp</dimen>
- <dimen name="lb_playback_transport_thumbs_margin">4dp</dimen>
- <dimen name="lb_playback_transport_thumbs_width">154dp</dimen>
<dimen name="lb_playback_transport_time_margin">8dp</dimen>
<dimen name="lb_playback_transport_time_margin_top">8dp</dimen>
<dimen name="lb_rounded_rect_corner_radius">2dp</dimen>
@@ -644,21 +638,40 @@
<item name="defaultSectionHeaderColor">?attr/defaultSearchColor</item>
+ <!-- android:windowSharedElementEnterTransition is kept for backward compatibility for apps still refer
+ to Theme.Leanback, app should use Theme.Leanback.Details instead -->
+ <item name="android:windowSharedElementEnterTransition">@transition/lb_shared_element_enter_transition</item>
+ <!-- android:windowSharedElementReturnTransition is kept for backward compatibility for apps still refer
+ to Theme.Leanback, app should use Theme.Leanback.Details instead -->
+ <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item>
+ <item name="android:windowEnterTransition">@transition/lb_enter_transition</item>
+ <item name="android:windowReturnTransition">@transition/lb_return_transition</item>
+ <item name="android:windowTransitionBackgroundFadeDuration">350</item>
+
<item name="overlayDimMaskColor">@color/lb_view_dim_mask_color</item>
<item name="overlayDimActiveLevel">@fraction/lb_view_active_level</item>
<item name="overlayDimDimmedLevel">@fraction/lb_view_dimmed_level</item>
</style>
<style name="Theme.Leanback.Browse" parent="Theme.Leanback">
+ <item name="android:windowEnterTransition">@transition/lb_browse_enter_transition</item>
+ <item name="android:windowReturnTransition">@transition/lb_browse_return_transition</item>
</style>
<style name="Theme.Leanback.Details" parent="Theme.Leanback">
+ <item name="android:windowEnterTransition">@transition/lb_details_enter_transition</item>
+ <item name="android:windowReturnTransition">@transition/lb_details_return_transition</item>
+ <item name="android:windowSharedElementEnterTransition">@transition/lb_shared_element_enter_transition</item>
+ <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item>
</style>
<style name="Theme.Leanback.Details.NoSharedElementTransition">
+ <item name="android:windowSharedElementEnterTransition">@null</item>
+ <item name="android:windowSharedElementReturnTransition">@null</item>
</style>
<style name="Theme.Leanback.GuidedStep" parent="Theme.Leanback.GuidedStepBase">
<item name="guidedStepThemeFlag">true</item>
<item name="guidedStepHeightWeight">@string/lb_guidedstep_height_weight</item>
+ <item name="android:windowEnterTransition">@transition/lb_guidedstep_activity_enter</item>
<!-- background applied to each GuidedStepFragment by default-->
<item name="guidedStepBackground">?android:attr/colorBackground</item>
@@ -666,6 +679,7 @@
But We still need a dumb background to keep the temporary translucent state last
as long as the background view fade-in transition -->
<item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowTransitionBackgroundFadeDuration">@integer/lb_guidedstep_activity_background_fade_duration_ms</item>
<item name="guidedStepImeAppearingAnimation">@animator/lb_guidedstep_slide_up</item>
<item name="guidedStepImeDisappearingAnimation">@animator/lb_guidedstep_slide_down</item>
@@ -704,13 +718,12 @@
<item name="guidedActionVerticalPadding">@dimen/lb_guidedactions_vertical_padding</item>
<item name="guidedStepKeyline">@string/lb_guidedstep_keyline</item>
</style>
- <style name="Theme.Leanback.GuidedStep.Half" parent="Theme.Leanback.GuidedStep.HalfBase">
+ <style name="Theme.Leanback.GuidedStep.Half" parent="Theme.Leanback.GuidedStep">
+ <item name="android:windowEnterTransition">@transition/lb_guidedstep_activity_enter_bottom</item>
<item name="guidedStepHeightWeight">@string/lb_guidedstep_height_weight_translucent</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
</style>
- <style name="Theme.Leanback.GuidedStep.HalfBase" parent="Theme.Leanback.GuidedStep">
- </style>
<style name="Theme.Leanback.GuidedStepBase" parent="Theme.LeanbackBase">
<item name="guidedActionsSelectorDrawable">?android:attr/selectableItemBackground</item>
</style>
@@ -725,6 +738,8 @@
<item name="onboardingMainIconStyle">@style/Widget.Leanback.OnboardingMainIconStyle</item>
</style>
<style name="Theme.Leanback.VerticalGrid" parent="Theme.Leanback">
+ <item name="android:windowEnterTransition">@transition/lb_vertical_grid_enter_transition</item>
+ <item name="android:windowReturnTransition">@transition/lb_vertical_grid_return_transition</item>
</style>
<style name="Theme.LeanbackBase" parent="android:Theme.Holo.NoActionBar">
<item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item>
@@ -732,6 +747,7 @@
<item name="defaultBrandColor">@color/lb_default_brand_color</item>
<item name="defaultBrandColorDark">@color/lb_default_brand_color_dark</item>
+ <item name="android:windowOverscan">true</item>
<item name="guidedStepTheme">@style/Theme.Leanback.GuidedStep</item>
</style>
<style name="Widget.Leanback" parent="Widget.LeanbackBase"/>
@@ -1085,23 +1101,23 @@
<item name="dotBgColor">@color/lb_page_indicator_dot</item>
<item name="arrowBgColor">@color/lb_page_indicator_arrow_background</item>
</style>
- <style name="Widget.Leanback.OnboardingStartButtonStyle" parent="Widget.Leanback.OnboardingStartButtonStyleBase">
+ <style name="Widget.Leanback.OnboardingStartButtonStyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">36dp</item>
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:layout_marginBottom">4dp</item>
<item name="android:background">@drawable/lb_onboarding_start_button_background</item>
+ <item name="android:elevation">1.5dp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingEnd">24dp</item>
<item name="android:paddingStart">24dp</item>
+ <item name="android:stateListAnimator">@null</item>
<item name="android:text">@string/lb_onboarding_get_started</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">#014269</item>
<item name="android:textSize">16sp</item>
</style>
- <style name="Widget.Leanback.OnboardingStartButtonStyleBase">
- </style>
<style name="Widget.Leanback.OnboardingTitleStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0dp</item>
diff --git a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
index 74a4925..1901699 100644
--- a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
+++ b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar
index 410c9e1..076d88e 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar
Binary files differ
diff --git a/current/support/compat/res/drawable-hdpi-v4/notification_bg_low_normal.9.png b/current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_low_normal.9.png
similarity index 100%
rename from current/support/compat/res/drawable-hdpi-v4/notification_bg_low_normal.9.png
rename to current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_low_normal.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png b/current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png
similarity index 100%
rename from current/support/compat/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png
rename to current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-hdpi-v4/notification_bg_normal.9.png b/current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_normal.9.png
similarity index 100%
rename from current/support/compat/res/drawable-hdpi-v4/notification_bg_normal.9.png
rename to current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_normal.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png b/current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
similarity index 100%
rename from current/support/compat/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
rename to current/support/v7/appcompat/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png b/current/support/v7/appcompat/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
similarity index 100%
rename from current/support/compat/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
rename to current/support/v7/appcompat/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
Binary files differ
diff --git a/current/support/compat/res/drawable-mdpi-v4/notification_bg_low_normal.9.png b/current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_low_normal.9.png
similarity index 100%
rename from current/support/compat/res/drawable-mdpi-v4/notification_bg_low_normal.9.png
rename to current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_low_normal.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-mdpi-v4/notification_bg_low_pressed.9.png b/current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_low_pressed.9.png
similarity index 100%
rename from current/support/compat/res/drawable-mdpi-v4/notification_bg_low_pressed.9.png
rename to current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_low_pressed.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-mdpi-v4/notification_bg_normal.9.png b/current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_normal.9.png
similarity index 100%
rename from current/support/compat/res/drawable-mdpi-v4/notification_bg_normal.9.png
rename to current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_normal.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png b/current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png
similarity index 100%
rename from current/support/compat/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png
rename to current/support/v7/appcompat/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png b/current/support/v7/appcompat/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png
similarity index 100%
rename from current/support/compat/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png
rename to current/support/v7/appcompat/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png
Binary files differ
diff --git a/current/support/compat/res/layout/notification_template_icon_group.xml b/current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml
similarity index 71%
copy from current/support/compat/res/layout/notification_template_icon_group.xml
copy to current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml
index f225737..852c3f0 100644
--- a/current/support/compat/res/layout/notification_template_icon_group.xml
+++ b/current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml
@@ -15,10 +15,8 @@
~ limitations under the License
-->
-<ImageView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/icon"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- android:scaleType="centerCrop"
-/>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/ripple_material_light">
+ <item android:id="@android:id/mask"
+ android:drawable="@drawable/abc_btn_default_mtrl_shape" />
+</ripple>
\ No newline at end of file
diff --git a/current/support/compat/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png b/current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png
similarity index 100%
rename from current/support/compat/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png
rename to current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png b/current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png
similarity index 100%
rename from current/support/compat/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png
rename to current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-xhdpi-v4/notification_bg_normal.9.png b/current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_normal.9.png
similarity index 100%
rename from current/support/compat/res/drawable-xhdpi-v4/notification_bg_normal.9.png
rename to current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_normal.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png b/current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png
similarity index 100%
rename from current/support/compat/res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png
rename to current/support/v7/appcompat/res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png
Binary files differ
diff --git a/current/support/compat/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png b/current/support/v7/appcompat/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
similarity index 100%
rename from current/support/compat/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
rename to current/support/v7/appcompat/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
Binary files differ
diff --git a/current/support/compat/res/drawable/notification_bg.xml b/current/support/v7/appcompat/res/drawable/notification_bg.xml
similarity index 100%
rename from current/support/compat/res/drawable/notification_bg.xml
rename to current/support/v7/appcompat/res/drawable/notification_bg.xml
diff --git a/current/support/compat/res/drawable/notification_bg_low.xml b/current/support/v7/appcompat/res/drawable/notification_bg_low.xml
similarity index 100%
rename from current/support/compat/res/drawable/notification_bg_low.xml
rename to current/support/v7/appcompat/res/drawable/notification_bg_low.xml
diff --git a/current/support/compat/res/drawable/notification_icon_background.xml b/current/support/v7/appcompat/res/drawable/notification_icon_background.xml
similarity index 100%
rename from current/support/compat/res/drawable/notification_icon_background.xml
rename to current/support/v7/appcompat/res/drawable/notification_icon_background.xml
diff --git a/current/support/compat/res/drawable/notification_tile_bg.xml b/current/support/v7/appcompat/res/drawable/notification_tile_bg.xml
similarity index 100%
rename from current/support/compat/res/drawable/notification_tile_bg.xml
rename to current/support/v7/appcompat/res/drawable/notification_tile_bg.xml
diff --git a/current/support/media-compat/res/layout/notification_media_action.xml b/current/support/v7/appcompat/res/layout-v11/notification_media_action.xml
similarity index 94%
rename from current/support/media-compat/res/layout/notification_media_action.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_media_action.xml
index f71acdd..d546792 100644
--- a/current/support/media-compat/res/layout/notification_media_action.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_media_action.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
+<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/current/support/media-compat/res/layout/notification_media_cancel_action.xml b/current/support/v7/appcompat/res/layout-v11/notification_media_cancel_action.xml
similarity index 92%
rename from current/support/media-compat/res/layout/notification_media_cancel_action.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_media_cancel_action.xml
index b0b50b4..c2bd8c2 100644
--- a/current/support/media-compat/res/layout/notification_media_cancel_action.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_media_cancel_action.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/current/support/media-compat/res/layout/notification_template_big_media.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media.xml
similarity index 96%
rename from current/support/media-compat/res/layout/notification_template_big_media.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media.xml
index 8dd93dc..b72fd97 100644
--- a/current/support/media-compat/res/layout/notification_template_big_media.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/current/support/media-compat/res/layout/notification_template_big_media_custom.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_custom.xml
similarity index 91%
rename from current/support/media-compat/res/layout/notification_template_big_media_custom.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media_custom.xml
index cccda1d..c88d799 100644
--- a/current/support/media-compat/res/layout/notification_template_big_media_custom.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_custom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2016 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -61,7 +61,7 @@
android:layout_marginEnd="8dp"
android:paddingTop="@dimen/notification_right_side_padding_top">
<DateTimeView android:id="@+id/time"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -69,7 +69,7 @@
android:visibility="gone"
/>
<Chronometer android:id="@+id/chronometer"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -77,7 +77,7 @@
android:visibility="gone"
/>
<TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
diff --git a/current/support/media-compat/res/layout/notification_template_big_media_narrow.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow.xml
similarity index 96%
rename from current/support/media-compat/res/layout/notification_template_big_media_narrow.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow.xml
index ca8e289..979c8f4 100644
--- a/current/support/media-compat/res/layout/notification_template_big_media_narrow.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
diff --git a/current/support/media-compat/res/layout/notification_template_big_media_narrow_custom.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow_custom.xml
similarity index 91%
rename from current/support/media-compat/res/layout/notification_template_big_media_narrow_custom.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow_custom.xml
index db78467..b7fbff7 100644
--- a/current/support/media-compat/res/layout/notification_template_big_media_narrow_custom.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow_custom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2016 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
@@ -64,7 +64,7 @@
android:layout_marginEnd="8dp"
android:paddingTop="@dimen/notification_right_side_padding_top">
<DateTimeView android:id="@+id/time"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -72,7 +72,7 @@
android:visibility="gone"
/>
<Chronometer android:id="@+id/chronometer"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -80,7 +80,7 @@
android:visibility="gone"
/>
<TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
diff --git a/current/support/compat/res/layout-v16/notification_template_custom_big.xml b/current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml
similarity index 99%
rename from current/support/compat/res/layout-v16/notification_template_custom_big.xml
rename to current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml
index d0519dc..24c3323 100644
--- a/current/support/compat/res/layout-v16/notification_template_custom_big.xml
+++ b/current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml
@@ -74,7 +74,7 @@
android:layout_gravity="end|bottom"
android:layout_marginTop="20dp">
<TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
diff --git a/current/support/compat/res/layout-v21/notification_action.xml b/current/support/v7/appcompat/res/layout-v21/notification_action.xml
similarity index 92%
rename from current/support/compat/res/layout-v21/notification_action.xml
rename to current/support/v7/appcompat/res/layout-v21/notification_action.xml
index 7199c25..c60bf7d 100644
--- a/current/support/compat/res/layout-v21/notification_action.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_action.xml
@@ -15,7 +15,7 @@
~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/Widget.Compat.NotificationActionContainer"
+ style="@style/Widget.AppCompat.NotificationActionContainer"
android:id="@+id/action_container"
android:layout_width="0dp"
android:layout_weight="1"
@@ -29,7 +29,7 @@
android:layout_gravity="center|start"
android:scaleType="centerInside"/>
<TextView
- style="@style/Widget.Compat.NotificationActionText"
+ style="@style/Widget.AppCompat.NotificationActionText"
android:id="@+id/action_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/current/support/compat/res/layout-v21/notification_action_tombstone.xml b/current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml
similarity index 93%
rename from current/support/compat/res/layout-v21/notification_action_tombstone.xml
rename to current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml
index 7ef38fa..1637c6f 100644
--- a/current/support/compat/res/layout-v21/notification_action_tombstone.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml
@@ -16,7 +16,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/Widget.Compat.NotificationActionContainer"
+ style="@style/Widget.AppCompat.NotificationActionContainer"
android:id="@+id/action_container"
android:layout_width="0dp"
android:layout_weight="1"
@@ -34,7 +34,7 @@
android:enabled="false"
android:alpha="0.5"/>
<TextView
- style="@style/Widget.Compat.NotificationActionText"
+ style="@style/Widget.AppCompat.NotificationActionText"
android:id="@+id/action_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/current/support/compat/res/layout-v21/notification_template_custom_big.xml b/current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml
similarity index 98%
rename from current/support/compat/res/layout-v21/notification_template_custom_big.xml
rename to current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml
index 9e3666e..38332bd 100644
--- a/current/support/compat/res/layout-v21/notification_template_custom_big.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml
@@ -61,7 +61,7 @@
android:visibility="gone"
android:layout="@layout/notification_template_part_chronometer" />
<TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
diff --git a/current/support/compat/res/layout-v21/notification_template_icon_group.xml b/current/support/v7/appcompat/res/layout-v21/notification_template_icon_group.xml
similarity index 94%
rename from current/support/compat/res/layout-v21/notification_template_icon_group.xml
rename to current/support/v7/appcompat/res/layout-v21/notification_template_icon_group.xml
index 8fadd67..6c19022 100644
--- a/current/support/compat/res/layout-v21/notification_template_icon_group.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_template_icon_group.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2016 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<FrameLayout
@@ -40,3 +40,4 @@
android:layout_marginBottom="8dp"
/>
</FrameLayout>
+
diff --git a/current/support/compat/res/layout/notification_action.xml b/current/support/v7/appcompat/res/layout/notification_action.xml
similarity index 92%
rename from current/support/compat/res/layout/notification_action.xml
rename to current/support/v7/appcompat/res/layout/notification_action.xml
index 3ffd9a1..82e95a5 100644
--- a/current/support/compat/res/layout/notification_action.xml
+++ b/current/support/v7/appcompat/res/layout/notification_action.xml
@@ -15,7 +15,7 @@
~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/Widget.Compat.NotificationActionContainer"
+ style="@style/Widget.AppCompat.NotificationActionContainer"
android:id="@+id/action_container"
android:layout_width="0dp"
android:layout_weight="1"
@@ -30,7 +30,7 @@
android:layout_gravity="center|start"
android:scaleType="centerInside"/>
<TextView
- style="@style/Widget.Compat.NotificationActionText"
+ style="@style/Widget.AppCompat.NotificationActionText"
android:id="@+id/action_text"
android:textColor="#ccc"
android:layout_width="wrap_content"
diff --git a/current/support/compat/res/layout/notification_action_tombstone.xml b/current/support/v7/appcompat/res/layout/notification_action_tombstone.xml
similarity index 93%
rename from current/support/compat/res/layout/notification_action_tombstone.xml
rename to current/support/v7/appcompat/res/layout/notification_action_tombstone.xml
index e9d4e37..d491c78 100644
--- a/current/support/compat/res/layout/notification_action_tombstone.xml
+++ b/current/support/v7/appcompat/res/layout/notification_action_tombstone.xml
@@ -16,7 +16,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/Widget.Compat.NotificationActionContainer"
+ style="@style/Widget.AppCompat.NotificationActionContainer"
android:id="@+id/action_container"
android:layout_width="0dp"
android:layout_weight="1"
@@ -35,7 +35,7 @@
android:enabled="false"
android:alpha="0.5"/>
<TextView
- style="@style/Widget.Compat.NotificationActionText"
+ style="@style/Widget.AppCompat.NotificationActionText"
android:id="@+id/action_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/current/support/compat/res/layout/notification_template_custom_big.xml b/current/support/v7/appcompat/res/layout/notification_template_custom_big.xml
similarity index 96%
rename from current/support/compat/res/layout/notification_template_custom_big.xml
rename to current/support/v7/appcompat/res/layout/notification_template_custom_big.xml
index 8aaf9d5..c922629 100644
--- a/current/support/compat/res/layout/notification_template_custom_big.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_custom_big.xml
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
/>
<ImageView android:id="@+id/right_icon"
android:layout_width="24dp"
diff --git a/current/support/compat/res/layout/notification_template_icon_group.xml b/current/support/v7/appcompat/res/layout/notification_template_icon_group.xml
similarity index 99%
rename from current/support/compat/res/layout/notification_template_icon_group.xml
rename to current/support/v7/appcompat/res/layout/notification_template_icon_group.xml
index f225737..dd564f8 100644
--- a/current/support/compat/res/layout/notification_template_icon_group.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_icon_group.xml
@@ -22,3 +22,4 @@
android:layout_height="@dimen/notification_large_icon_height"
android:scaleType="centerCrop"
/>
+
diff --git a/current/support/media-compat/res/layout/notification_template_lines_media.xml b/current/support/v7/appcompat/res/layout/notification_template_lines_media.xml
similarity index 86%
rename from current/support/media-compat/res/layout/notification_template_lines_media.xml
rename to current/support/v7/appcompat/res/layout/notification_template_lines_media.xml
index 385a01b..9a7b788 100644
--- a/current/support/media-compat/res/layout/notification_template_lines_media.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_lines_media.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -34,7 +34,7 @@
android:orientation="horizontal"
>
<TextView android:id="@+id/title"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Title.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Title.Media"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -43,7 +43,7 @@
android:layout_weight="1"
/>
<DateTimeView android:id="@+id/time"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -54,7 +54,7 @@
android:paddingStart="8dp"
/>
<Chronometer android:id="@+id/chronometer"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -66,7 +66,7 @@
/>
</LinearLayout>
<TextView android:id="@+id/text2"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Line2.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Line2.Media"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-2dp"
@@ -88,7 +88,7 @@
android:layout_marginStart="@dimen/notification_content_margin_start"
>
<TextView android:id="@+id/text"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Media"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -98,7 +98,7 @@
android:fadingEdge="horizontal"
/>
<TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
diff --git a/current/support/media-compat/res/layout/notification_template_media.xml b/current/support/v7/appcompat/res/layout/notification_template_media.xml
similarity index 95%
rename from current/support/media-compat/res/layout/notification_template_media.xml
rename to current/support/v7/appcompat/res/layout/notification_template_media.xml
index f57070a..6eac23b 100644
--- a/current/support/media-compat/res/layout/notification_template_media.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_media.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/current/support/media-compat/res/layout/notification_template_media_custom.xml b/current/support/v7/appcompat/res/layout/notification_template_media_custom.xml
similarity index 91%
rename from current/support/media-compat/res/layout/notification_template_media_custom.xml
rename to current/support/v7/appcompat/res/layout/notification_template_media_custom.xml
index 36a479c..62e07d4 100644
--- a/current/support/media-compat/res/layout/notification_template_media_custom.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_media_custom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ Copyright (C) 2015 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -53,7 +53,7 @@
android:layout_marginEnd="8dp"
android:paddingTop="@dimen/notification_right_side_padding_top">
<DateTimeView android:id="@+id/time"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -61,7 +61,7 @@
android:visibility="gone"
/>
<Chronometer android:id="@+id/chronometer"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -69,7 +69,7 @@
android:visibility="gone"
/>
<TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info.Media"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
diff --git a/current/support/compat/res/layout/notification_template_part_chronometer.xml b/current/support/v7/appcompat/res/layout/notification_template_part_chronometer.xml
similarity index 91%
rename from current/support/compat/res/layout/notification_template_part_chronometer.xml
rename to current/support/v7/appcompat/res/layout/notification_template_part_chronometer.xml
index 245353b..9e58a38 100644
--- a/current/support/compat/res/layout/notification_template_part_chronometer.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_part_chronometer.xml
@@ -16,7 +16,7 @@
-->
<Chronometer android:id="@+id/chronometer" xmlns:android="http://schemas.android.com/apk/res/android"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
diff --git a/current/support/compat/res/layout/notification_template_part_time.xml b/current/support/v7/appcompat/res/layout/notification_template_part_time.xml
similarity index 91%
rename from current/support/compat/res/layout/notification_template_part_time.xml
rename to current/support/v7/appcompat/res/layout/notification_template_part_time.xml
index 9a78a93..810d1e3 100644
--- a/current/support/compat/res/layout/notification_template_part_time.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_part_time.xml
@@ -16,7 +16,7 @@
-->
<DateTimeView android:id="@+id/time" xmlns:android="http://schemas.android.com/apk/res/android"
- android:textAppearance="@style/TextAppearance.Compat.Notification.Time"
+ android:textAppearance="@style/TextAppearance.AppCompat.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
diff --git a/current/support/v7/appcompat/res/values-v14/values-v14.xml b/current/support/v7/appcompat/res/values-v14/values-v14.xml
index ea24d53..b1633f0 100644
--- a/current/support/v7/appcompat/res/values-v14/values-v14.xml
+++ b/current/support/v7/appcompat/res/values-v14/values-v14.xml
@@ -19,4 +19,13 @@
<item name="android:listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
<item name="android:listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item>
</style>
+ <style name="TextAppearance.AppCompat.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
+ <style name="TextAppearance.AppCompat.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"/>
+ <style name="TextAppearance.StatusBar.EventContent" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
+ <style name="TextAppearance.StatusBar.EventContent.Info"/>
+ <style name="TextAppearance.StatusBar.EventContent.Line2">
+ <item name="android:textSize">@dimen/notification_subtext_size</item>
+ </style>
+ <style name="TextAppearance.StatusBar.EventContent.Time"/>
+ <style name="TextAppearance.StatusBar.EventContent.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"/>
</resources>
\ No newline at end of file
diff --git a/current/support/v7/appcompat/res/values-v16/values-v16.xml b/current/support/v7/appcompat/res/values-v16/values-v16.xml
index 3ba0ed0..5ee2feb 100644
--- a/current/support/v7/appcompat/res/values-v16/values-v16.xml
+++ b/current/support/v7/appcompat/res/values-v16/values-v16.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <dimen name="notification_right_side_padding_top">4dp</dimen>
<style name="TextAppearance.AppCompat.Tooltip">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">14sp</item>
diff --git a/current/support/v7/appcompat/res/values-v21/values-v21.xml b/current/support/v7/appcompat/res/values-v21/values-v21.xml
index 9780791..20d0552 100644
--- a/current/support/v7/appcompat/res/values-v21/values-v21.xml
+++ b/current/support/v7/appcompat/res/values-v21/values-v21.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <color name="notification_action_color_filter">@color/secondary_text_default_material_light</color>
+ <dimen name="notification_content_margin_start">0dp</dimen>
+ <dimen name="notification_main_column_padding_top">0dp</dimen>
+ <dimen name="notification_media_narrow_margin">12dp</dimen>
<style name="Base.TextAppearance.AppCompat" parent="android:TextAppearance.Material"/>
<style name="Base.TextAppearance.AppCompat.Body1" parent="android:TextAppearance.Material.Body1"/>
<style name="Base.TextAppearance.AppCompat.Body2" parent="android:TextAppearance.Material.Body2"/>
@@ -273,4 +277,12 @@
<style name="TextAppearance.AppCompat.Notification.Title.Media">
<item name="android:textColor">@color/primary_text_default_material_dark</item>
</style>
+ <style name="Widget.AppCompat.NotificationActionContainer" parent="">
+ <item name="android:background">@drawable/notification_action_background</item>
+ </style>
+ <style name="Widget.AppCompat.NotificationActionText" parent="">
+ <item name="android:textAppearance">?android:attr/textAppearanceButton</item>
+ <item name="android:textColor">@color/secondary_text_default_material_light</item>
+ <item name="android:textSize">@dimen/notification_action_text_size</item>
+ </style>
</resources>
\ No newline at end of file
diff --git a/current/support/v7/appcompat/res/values/values.xml b/current/support/v7/appcompat/res/values/values.xml
index 381c9b7..061c314 100644
--- a/current/support/v7/appcompat/res/values/values.xml
+++ b/current/support/v7/appcompat/res/values/values.xml
@@ -48,6 +48,9 @@
<color name="material_grey_800">#ff424242</color>
<color name="material_grey_850">#ff303030</color>
<color name="material_grey_900">#ff212121</color>
+ <color name="notification_action_color_filter">#ffffffff</color>
+ <color name="notification_icon_bg_color">#ff9e9e9e</color>
+ <color name="notification_material_background_media_default_color">#ff424242</color>
<color name="primary_dark_material_dark">@android:color/black</color>
<color name="primary_dark_material_light">@color/material_grey_600</color>
<color name="primary_material_dark">@color/material_grey_900</color>
@@ -326,6 +329,21 @@
<item format="float" name="hint_alpha_material_light" type="dimen">0.38</item>
<item format="float" name="hint_pressed_alpha_material_dark" type="dimen">0.70</item>
<item format="float" name="hint_pressed_alpha_material_light" type="dimen">0.54</item>
+ <dimen name="notification_action_icon_size">32dp</dimen>
+ <dimen name="notification_action_text_size">13sp</dimen>
+ <dimen name="notification_big_circle_margin">12dp</dimen>
+ <dimen name="notification_content_margin_start">8dp</dimen>
+ <dimen name="notification_large_icon_height">64dp</dimen>
+ <dimen name="notification_large_icon_width">64dp</dimen>
+ <dimen name="notification_main_column_padding_top">10dp</dimen>
+ <dimen name="notification_media_narrow_margin">@dimen/notification_content_margin_start</dimen>
+ <dimen name="notification_right_icon_size">16dp</dimen>
+ <dimen name="notification_right_side_padding_top">2dp</dimen>
+ <dimen name="notification_small_icon_background_padding">3dp</dimen>
+ <dimen name="notification_small_icon_size_as_large">24dp</dimen>
+ <dimen name="notification_subtext_size">13sp</dimen>
+ <dimen name="notification_top_pad">10dp</dimen>
+ <dimen name="notification_top_pad_large_text">5dp</dimen>
<dimen name="tooltip_corner_radius">2dp</dimen>
<dimen name="tooltip_horizontal_padding">16dp</dimen>
<dimen name="tooltip_margin">8dp</dimen>
@@ -334,6 +352,8 @@
<dimen name="tooltip_vertical_padding">6.5dp</dimen>
<dimen name="tooltip_y_offset_non_touch">0dp</dimen>
<dimen name="tooltip_y_offset_touch">16dp</dimen>
+ <drawable name="notification_template_icon_bg">#3333B5E5</drawable>
+ <drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
<item name="action_bar_activity_content" type="id"/>
<item name="action_bar_spinner" type="id"/>
<item name="action_menu_divider" type="id"/>
@@ -347,6 +367,7 @@
<integer name="abc_config_activityShortDur">150</integer>
<integer name="cancel_button_image_alpha">127</integer>
<integer name="config_tooltipAnimTime">150</integer>
+ <integer name="status_bar_notification_info_maxnum">999</integer>
<string name="abc_action_bar_home_description">Navigate home</string>
<string name="abc_action_bar_home_description_format">%1$s, %2$s</string>
<string name="abc_action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string>
@@ -379,6 +400,7 @@
<string name="abc_shareactionprovider_share_with_application">Share with %s</string>
<string name="abc_toolbar_collapse_description">Collapse</string>
<string name="search_menu_title">Search</string>
+ <string name="status_bar_notification_info_overflow">999+</string>
<style name="AlertDialog.AppCompat" parent="Base.AlertDialog.AppCompat"/>
<style name="AlertDialog.AppCompat.Light" parent="Base.AlertDialog.AppCompat.Light"/>
<style name="Animation.AppCompat.Dialog" parent="Base.Animation.AppCompat.Dialog"/>
@@ -1588,7 +1610,10 @@
<style name="TextAppearance.AppCompat.Medium" parent="Base.TextAppearance.AppCompat.Medium"/>
<style name="TextAppearance.AppCompat.Medium.Inverse" parent="Base.TextAppearance.AppCompat.Medium.Inverse"/>
<style name="TextAppearance.AppCompat.Menu" parent="Base.TextAppearance.AppCompat.Menu"/>
- <style name="TextAppearance.AppCompat.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
+ <style name="TextAppearance.AppCompat.Notification">
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
+ </style>
<style name="TextAppearance.AppCompat.Notification.Info">
<item name="android:textSize">12sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
@@ -1602,7 +1627,10 @@
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.AppCompat.Notification.Time.Media"/>
- <style name="TextAppearance.AppCompat.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"/>
+ <style name="TextAppearance.AppCompat.Notification.Title">
+ <item name="android:textSize">16sp</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ </style>
<style name="TextAppearance.AppCompat.Notification.Title.Media"/>
<style name="TextAppearance.AppCompat.SearchResult.Subtitle" parent="Base.TextAppearance.AppCompat.SearchResult.Subtitle">
</style>
@@ -1640,6 +1668,11 @@
<style name="TextAppearance.AppCompat.Widget.PopupMenu.Small" parent="Base.TextAppearance.AppCompat.Widget.PopupMenu.Small"/>
<style name="TextAppearance.AppCompat.Widget.Switch" parent="Base.TextAppearance.AppCompat.Widget.Switch"/>
<style name="TextAppearance.AppCompat.Widget.TextView.SpinnerItem" parent="Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem"/>
+ <style name="TextAppearance.StatusBar.EventContent" parent=""/>
+ <style name="TextAppearance.StatusBar.EventContent.Info" parent=""/>
+ <style name="TextAppearance.StatusBar.EventContent.Line2" parent=""/>
+ <style name="TextAppearance.StatusBar.EventContent.Time" parent=""/>
+ <style name="TextAppearance.StatusBar.EventContent.Title" parent=""/>
<style name="TextAppearance.Widget.AppCompat.ExpandedMenu.Item" parent="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item">
</style>
<style name="TextAppearance.Widget.AppCompat.Toolbar.Subtitle" parent="Base.TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
@@ -1753,6 +1786,8 @@
<style name="Widget.AppCompat.ListView" parent="Base.Widget.AppCompat.ListView"/>
<style name="Widget.AppCompat.ListView.DropDown" parent="Base.Widget.AppCompat.ListView.DropDown"/>
<style name="Widget.AppCompat.ListView.Menu" parent="Base.Widget.AppCompat.ListView.Menu"/>
+ <style name="Widget.AppCompat.NotificationActionContainer" parent=""/>
+ <style name="Widget.AppCompat.NotificationActionText" parent=""/>
<style name="Widget.AppCompat.PopupMenu" parent="Base.Widget.AppCompat.PopupMenu"/>
<style name="Widget.AppCompat.PopupMenu.Overflow" parent="Base.Widget.AppCompat.PopupMenu.Overflow">
</style>
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index 1b28b66..c1258f8 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index 8f3e56c..84dd8ab 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index eec351d..c45e53b 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_dark.png
index f6dd214..c04e284 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_light.png
index 6b7bdcd..da4c296 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_00_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_dark.png
index c7fe576..9fd99dc 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_light.png
index 0a5d6aa..6be3008 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_01_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_dark.png
index 0aadfa3..a5946ab 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_light.png
index 125fe0b..1c8a4e1 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_02_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_dark.png
index 05c48a7..1ea1f71 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_light.png
index 741e911..3397f14 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_03_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_dark.png
index ae4218a..0c211e5 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_light.png
index 8b30fab..620ec69 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_04_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_dark.png
index d7aa903..4ac4f94 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_light.png
index f7e2f29..aee1a31 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_05_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_dark.png
index e7871e2..5e99a48 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_light.png
index 8c57f63..d357a9f 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_06_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_dark.png
index 0041b01..7e23799 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_light.png
index 6dbb694..df0247d 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_07_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_dark.png
index 08e1013..d49c09b 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_light.png
index 5c352c3..924212a 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_08_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_dark.png
index 70532e9..4df5079 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_light.png
index 9c6ba30..dfaaef4 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_09_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_dark.png
index 9ba3b5f..8b2499e 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_light.png
index bd4bb22..47482ab 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_10_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_dark.png
index 2156127..373aad0 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_light.png
index b417a9f..b8d035e 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_11_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_dark.png
index 9bf633e..f813902 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_light.png
index ba51811..0952676 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_12_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_dark.png
index 756a53c..3825e0a 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_light.png
index 4705dca..c493860 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_13_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_dark.png
index 50e4ea3..12da4da 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_light.png
index bc6724f..5420e91 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_14_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_dark.png
index 9e3b410..8bb448e 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_light.png
index 2f18abd..6c7fb96 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_15_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_dark.png
index de81133..e000188 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_light.png
index b80b191..2afcf5b 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_16_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_dark.png
index 48aba3d..ead72cb 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_light.png
index ca34d5b..5e91f50 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_17_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_dark.png
index e9957b3..1939ceb 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_light.png
index a5d384f..3d6105c 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_18_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_dark.png
index ddc6297..4be02d4 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_light.png
index 28ab684..1b18aad 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_19_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_dark.png
index 51e7f75..25afe1a 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_light.png
index 4aa3ca3..219ac25 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_20_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_dark.png
index 9caecde..1ac72a3 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_light.png
index 1b8d0b6..9b0645d 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_21_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_dark.png
index 400be3c..62308f2 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_light.png
index c14f1bf..6bab08f 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_22_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_23_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_23_dark.png
deleted file mode 100644
index 4e18b46..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_23_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_23_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_23_light.png
deleted file mode 100644
index c4c2c00..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_23_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_24_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_24_dark.png
deleted file mode 100644
index 98fae44..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_24_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_24_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_24_light.png
deleted file mode 100644
index d64c289..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_24_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_25_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_25_dark.png
deleted file mode 100644
index 91f9327..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_25_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_25_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_25_light.png
deleted file mode 100644
index f5e1f69..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_25_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_26_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_26_dark.png
deleted file mode 100644
index 3e6fafd..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_26_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_26_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_26_light.png
deleted file mode 100644
index ae2bd87..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_26_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_27_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_27_dark.png
deleted file mode 100644
index f73a1f8..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_27_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_27_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_27_light.png
deleted file mode 100644
index 78c1069..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_27_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_28_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_28_dark.png
deleted file mode 100644
index 562b803..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_28_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_28_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_28_light.png
deleted file mode 100644
index ddfba02..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_28_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_29_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_29_dark.png
deleted file mode 100644
index 257f2d2..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_29_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_29_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_29_light.png
deleted file mode 100644
index 38f5478..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_29_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_30_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_30_dark.png
deleted file mode 100644
index f995af0..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_30_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_30_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_30_light.png
deleted file mode 100644
index c50b7f0..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connected_30_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_dark.png
index f6dd214..7c8b5bc 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_light.png
index 6b7bdcd..85fe39c 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_00_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_dark.png
index c7fe576..b904ed1 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_light.png
index 0a5d6aa..94bcad9 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_01_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_dark.png
index 0aadfa3..9c8f73d 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_light.png
index 125fe0b..70ecc18 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_02_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_dark.png
index 05c48a7..9cc01b3 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_light.png
index 741e911..6dc67ec 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_03_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_dark.png
index ae4218a..8692da8 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_light.png
index 8b30fab..92061ac 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_04_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_dark.png
index d7aa903..93af29a 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_light.png
index f7e2f29..3535d6f 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_05_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_dark.png
index e7871e2..7a17cdb 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_light.png
index 8c57f63..101207f 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_06_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_dark.png
index 0041b01..186133e 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_light.png
index 6dbb694..1e3afe1 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_07_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_dark.png
index 08e1013..34cb511 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_light.png
index 5c352c3..79f84ca 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_08_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_dark.png
index 70532e9..736bad8 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_light.png
index 9c6ba30..0fe61a4 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_09_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_dark.png
index 9ba3b5f..22862e3 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_light.png
index bd4bb22..6a310bd 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_10_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_dark.png
index f3570f4..3eb3fb4 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_light.png
index 65a403e..3bc4947 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_11_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_dark.png
index f644bfd..58a6f9e 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_light.png
index c7d6048..f017cc6 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_12_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_dark.png
index 6e0d558..ef3f046 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_light.png
index f3bc48d..cf52855 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_13_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_dark.png
index 14d8f8e..f701696 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_light.png
index 98b90e5..26587e1 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_14_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_dark.png
index 83234a7..7d3342c 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_light.png
index 47d452f..e6ea555 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_15_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_dark.png
index b81cf5a..aa1f673 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_light.png
index 20d08b4..5ad2aa3 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_16_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_dark.png
index 6feb3f1..4c412a8 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_light.png
index e6ae8b3..b919359 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_17_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_dark.png
index 0b0fc08..a27e3d7 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_light.png
index c2a16ac..efe5264 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_18_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_dark.png
index a3598cc..a048045 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_light.png
index 846d16d..8c31541 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_19_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_dark.png
index 2070455..fbb59c5 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_light.png
index ae6db13..0bf03e2 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_20_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_dark.png
index 7f3828a..6cfa4c4 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_light.png
index aaccc73..49f0f63 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_21_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_dark.png
index 5c8ced9..6fdd92f 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_light.png
index ad01b9e..63fd45f 100644
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_22_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_23_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_23_dark.png
deleted file mode 100644
index ce31dd3..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_23_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_23_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_23_light.png
deleted file mode 100644
index 9ef78e4..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_23_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_24_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_24_dark.png
deleted file mode 100644
index a7c2cdb..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_24_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_24_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_24_light.png
deleted file mode 100644
index e7c5bea..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_24_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_25_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_25_dark.png
deleted file mode 100644
index ecad0d4..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_25_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_25_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_25_light.png
deleted file mode 100644
index 5fa5923..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_25_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_26_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_26_dark.png
deleted file mode 100644
index f687e25..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_26_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_26_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_26_light.png
deleted file mode 100644
index 9c06db8..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_26_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_27_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_27_dark.png
deleted file mode 100644
index 90225ba..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_27_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_27_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_27_light.png
deleted file mode 100644
index 19697de..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_27_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_28_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_28_dark.png
deleted file mode 100644
index d37ec21..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_28_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_28_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_28_light.png
deleted file mode 100644
index 21840bf..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_28_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_29_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_29_dark.png
deleted file mode 100644
index 5445e3a..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_29_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_29_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_29_light.png
deleted file mode 100644
index 2337c65..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_29_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_30_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_30_dark.png
deleted file mode 100644
index f6dd214..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_30_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_30_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_30_light.png
deleted file mode 100644
index 6b7bdcd..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi-v4/ic_mr_button_connecting_30_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_dark.png
index 0db679e..e3fcc5a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_light.png
index 51c6051..8915e73 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_00_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_dark.png
index c083914..1f7c6a7 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_light.png
index c3c3caf..e2f859a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_01_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_dark.png
index fc444cf..5d7377d 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_light.png
index abd6377..e87e963 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_02_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_dark.png
index 6dbd1da..5d98ca9 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_light.png
index d2e7108..5dd1728 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_03_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_dark.png
index d9f596b..5768bf6 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_light.png
index 4f32e1a..33dcad3 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_04_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_dark.png
index c568e04..03b6d06 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_light.png
index ed20dd9..04de404 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_05_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_dark.png
index bbe39e7..b145e78 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_light.png
index 1edc15f..7f6b343 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_06_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_dark.png
index 78aebaf..f553b98 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_light.png
index b5a6a4f..3c6d7ec 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_07_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_dark.png
index 44b91ce..bc96ec5 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_light.png
index 85f66f9..78d7707 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_08_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_dark.png
index 51ea34b..1fc99d3 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_light.png
index 952de04..cecbb05 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_09_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_dark.png
index 8b1aa21..85c3404 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_light.png
index 534bcc0..9504282 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_10_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_dark.png
index f666b35..de5411f 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_light.png
index 145a8fb..75ac2b5 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_11_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_dark.png
index edeb132..bc5016f 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_light.png
index 9da2b60..e80a01a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_12_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_dark.png
index ab80aa9..d3bc15e 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_light.png
index 115efe4..2aec231 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_13_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_dark.png
index 8c0cc31..0dc7afa 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_light.png
index e6ae6fc..f6b8124 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_14_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_dark.png
index b8816c9..428f2a5 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_light.png
index bd42931..9b07aee 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_15_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_dark.png
index 10d5b7f..92b87f3 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_light.png
index 303a0fe..d3aa0ec 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_16_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_dark.png
index 3c2a655..c8f47f3 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_light.png
index 90debc2..0ffd70c 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_17_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_dark.png
index d3e78a7..bd6b74d 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_light.png
index 3a3f991..5a5644a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_18_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_dark.png
index 63fad9e..b9fcf3a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_light.png
index d6dd8d4..41904df 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_19_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_dark.png
index 890fd5f..7d765c3 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_light.png
index 6b0b5c1..1b38bd1 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_20_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_dark.png
index 9ce1ef1..1947769 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_light.png
index 81710d4..6c01a5f 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_21_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_dark.png
index 861c080..5d84106 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_light.png
index 1c4aa21..c03c7f6 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_22_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_23_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_23_dark.png
deleted file mode 100644
index 59a6b30..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_23_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_23_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_23_light.png
deleted file mode 100644
index c6e8fe0..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_23_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_24_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_24_dark.png
deleted file mode 100644
index 57b840e..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_24_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_24_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_24_light.png
deleted file mode 100644
index bf24050..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_24_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_25_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_25_dark.png
deleted file mode 100644
index 01c18c1..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_25_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_25_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_25_light.png
deleted file mode 100644
index be9753e..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_25_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_26_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_26_dark.png
deleted file mode 100644
index 3f291b1..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_26_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_26_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_26_light.png
deleted file mode 100644
index dc1c619..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_26_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_27_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_27_dark.png
deleted file mode 100644
index 6504a70..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_27_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_27_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_27_light.png
deleted file mode 100644
index a7e0a60..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_27_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_28_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_28_dark.png
deleted file mode 100644
index 57b1f3e..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_28_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_28_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_28_light.png
deleted file mode 100644
index 5c551ec..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_28_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_29_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_29_dark.png
deleted file mode 100644
index 238667e..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_29_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_29_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_29_light.png
deleted file mode 100644
index ffb8183..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_29_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_30_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_30_dark.png
deleted file mode 100644
index 4893f18..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_30_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_30_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_30_light.png
deleted file mode 100644
index ac5e156..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connected_30_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_dark.png
index 0db679e..5e481fb 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_light.png
index 51c6051..c1ebe58 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_00_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_dark.png
index c083914..f3c8f71 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_light.png
index c3c3caf..9a16dda 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_01_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_dark.png
index fc444cf..17d29bb 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_light.png
index abd6377..8e17432 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_02_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_dark.png
index 6dbd1da..72aec70 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_light.png
index d2e7108..b41b474 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_03_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_dark.png
index d9f596b..5a9aa0d 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_light.png
index 4f32e1a..9b7a3c7 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_04_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_dark.png
index c568e04..b0bd59e 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_light.png
index ed20dd9..f9544ee 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_05_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_dark.png
index bbe39e7..3543c84 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_light.png
index 1edc15f..9ecc2e4 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_06_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_dark.png
index 78aebaf..63a5a16 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_light.png
index b5a6a4f..8ae025a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_07_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_dark.png
index 44b91ce..2e506e8 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_light.png
index 85f66f9..7c96cc5 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_08_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_dark.png
index 51ea34b..aeb7151 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_light.png
index 952de04..deb6756 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_09_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_dark.png
index 8b1aa21..4f679de 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_light.png
index 534bcc0..54dbd70 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_10_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_dark.png
index 1fffa01..e971a46 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_light.png
index 0ff7e57..7bb99d5 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_11_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_dark.png
index 06ac4dc..c7dd030 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_light.png
index 42a86f5..1f081a0 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_12_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_dark.png
index 0301090..9da3f8f 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_light.png
index 4396f0e..38b45ab 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_13_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_dark.png
index e19001b..6c05acb 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_light.png
index 2271581..0294d12 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_14_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_dark.png
index 5e96208..043096d 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_light.png
index 0f69500..9d9672a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_15_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_dark.png
index 07e1bd6..321e868 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_light.png
index cde8f19..7d8f491 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_16_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_dark.png
index b632e95..ecd6c23 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_light.png
index 11d5d2e..0eb016b 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_17_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_dark.png
index 660d527..b6d08aa 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_light.png
index 2761ae1..4df7118 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_18_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_dark.png
index 0aa3f84..653754a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_light.png
index 27d166f..cf62d75 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_19_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_dark.png
index ebe527e..4fa3be0 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_light.png
index aeb2a8e..ca82881 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_20_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_dark.png
index 7337af5..86b20be 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_light.png
index f3f31ef..74521d0 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_21_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_dark.png
index 20d9f57..a646b60 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_dark.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_light.png
index bf8eb77..be0b12a 100644
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_light.png
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_22_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_23_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_23_dark.png
deleted file mode 100644
index 56a0e14..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_23_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_23_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_23_light.png
deleted file mode 100644
index 67425e1..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_23_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_24_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_24_dark.png
deleted file mode 100644
index 7c76e19..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_24_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_24_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_24_light.png
deleted file mode 100644
index e02f1ed..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_24_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_25_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_25_dark.png
deleted file mode 100644
index f5fdcdd..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_25_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_25_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_25_light.png
deleted file mode 100644
index 8ce9b81..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_25_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_26_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_26_dark.png
deleted file mode 100644
index a29e443..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_26_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_26_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_26_light.png
deleted file mode 100644
index 349ca89..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_26_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_27_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_27_dark.png
deleted file mode 100644
index 0fc75d5..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_27_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_27_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_27_light.png
deleted file mode 100644
index 5cbd27c..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_27_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_28_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_28_dark.png
deleted file mode 100644
index 0ebb0ac..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_28_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_28_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_28_light.png
deleted file mode 100644
index 5b514aa..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_28_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_29_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_29_dark.png
deleted file mode 100644
index 8e7fe5c..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_29_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_29_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_29_light.png
deleted file mode 100644
index efb2c10..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_29_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_30_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_30_dark.png
deleted file mode 100644
index 0db679e..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_30_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_30_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_30_light.png
deleted file mode 100644
index 51c6051..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi-v4/ic_mr_button_connecting_30_light.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable/mr_button_connected_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_button_connected_dark.xml
index c69ba33..ddf8c91 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_button_connected_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_button_connected_dark.xml
@@ -40,12 +40,4 @@
<item android:drawable="@drawable/ic_mr_button_connected_20_dark" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connected_21_dark" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connected_22_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_23_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_24_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_25_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_26_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_27_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_28_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_29_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_30_dark" android:duration="42" />
</animation-list>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_button_connected_light.xml b/current/support/v7/mediarouter/res/drawable/mr_button_connected_light.xml
index af7224b..ba0434a 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_button_connected_light.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_button_connected_light.xml
@@ -40,12 +40,4 @@
<item android:drawable="@drawable/ic_mr_button_connected_20_light" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connected_21_light" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connected_22_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_23_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_24_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_25_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_26_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_27_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_28_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_29_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connected_30_light" android:duration="42" />
</animation-list>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_button_connecting_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_button_connecting_dark.xml
index 697f17d..ba3a673 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_button_connecting_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_button_connecting_dark.xml
@@ -40,12 +40,4 @@
<item android:drawable="@drawable/ic_mr_button_connecting_20_dark" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connecting_21_dark" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connecting_22_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_23_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_24_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_25_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_26_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_27_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_28_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_29_dark" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_30_dark" android:duration="42" />
</animation-list>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_button_connecting_light.xml b/current/support/v7/mediarouter/res/drawable/mr_button_connecting_light.xml
index 07a135d..c511782 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_button_connecting_light.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_button_connecting_light.xml
@@ -40,12 +40,4 @@
<item android:drawable="@drawable/ic_mr_button_connecting_20_light" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connecting_21_light" android:duration="42" />
<item android:drawable="@drawable/ic_mr_button_connecting_22_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_23_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_24_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_25_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_26_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_27_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_28_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_29_light" android:duration="42" />
- <item android:drawable="@drawable/ic_mr_button_connecting_30_light" android:duration="42" />
</animation-list>
diff --git a/current/support/wear/res/color/ws_switch_track_color_material.xml b/current/support/v7/mediarouter/res/drawable/mr_button_dark_static.xml
similarity index 77%
copy from current/support/wear/res/color/ws_switch_track_color_material.xml
copy to current/support/v7/mediarouter/res/drawable/mr_button_dark_static.xml
index 214bf4a..20cb447 100644
--- a/current/support/wear/res/color/ws_switch_track_color_material.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_button_dark_static.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false"
- android:alpha="?android:attr/disabledAlpha"
- android:color="?android:attr/colorPrimary" />
- <item android:color="?android:attr/colorPrimary" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/ic_mr_button_disconnected_dark" />
+ <item android:drawable="@drawable/ic_mr_button_disabled_dark" />
</selector>
diff --git a/current/support/wear/res/color/ws_switch_track_color_material.xml b/current/support/v7/mediarouter/res/drawable/mr_button_light_static.xml
similarity index 77%
rename from current/support/wear/res/color/ws_switch_track_color_material.xml
rename to current/support/v7/mediarouter/res/drawable/mr_button_light_static.xml
index 214bf4a..9d805d1 100644
--- a/current/support/wear/res/color/ws_switch_track_color_material.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_button_light_static.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false"
- android:alpha="?android:attr/disabledAlpha"
- android:color="?android:attr/colorPrimary" />
- <item android:color="?android:attr/colorPrimary" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/ic_mr_button_disconnected_light" />
+ <item android:drawable="@drawable/ic_mr_button_disabled_light" />
</selector>
diff --git a/current/support/v7/mediarouter/res/values/values.xml b/current/support/v7/mediarouter/res/values/values.xml
index 6945920..888f847 100644
--- a/current/support/v7/mediarouter/res/values/values.xml
+++ b/current/support/v7/mediarouter/res/values/values.xml
@@ -12,7 +12,7 @@
<attr format="reference" name="mediaRouteStopDrawable"/>
<attr format="reference" name="mediaRouteTheme"/>
<attr format="reference" name="mediaRouteTvIconDrawable"/>
- <declare-styleable name="MediaRouteButton"><attr format="reference" name="externalRouteEnabledDrawable"/><attr format="color" name="mediaRouteButtonTint"/><attr name="android:minWidth"/><attr name="android:minHeight"/></declare-styleable>
+ <declare-styleable name="MediaRouteButton"><attr format="reference" name="externalRouteEnabledDrawable"/><attr format="reference" name="externalRouteEnabledDrawableStatic"/><attr format="color" name="mediaRouteButtonTint"/><attr name="android:minWidth"/><attr name="android:minHeight"/></declare-styleable>
<dimen name="mr_controller_volume_group_list_item_height">68dp</dimen>
<dimen name="mr_controller_volume_group_list_item_icon_size">24dp</dimen>
<dimen name="mr_controller_volume_group_list_max_height">288dp</dimen>
@@ -98,9 +98,11 @@
<item name="mediaRouteAudioTrackDrawable">@drawable/mr_vol_type_audiotrack_light</item>
</style>
<style name="Widget.MediaRouter.Light.MediaRouteButton" parent="Widget.AppCompat.Light.ActionButton">
+ <item name="externalRouteEnabledDrawableStatic">@drawable/mr_button_light_static</item>
<item name="externalRouteEnabledDrawable">@drawable/mr_button_light</item>
</style>
<style name="Widget.MediaRouter.MediaRouteButton" parent="Widget.AppCompat.ActionButton">
+ <item name="externalRouteEnabledDrawableStatic">@drawable/mr_button_dark_static</item>
<item name="externalRouteEnabledDrawable">@drawable/mr_button_dark</item>
</style>
</resources>
\ No newline at end of file
diff --git a/current/support/v7/palette/android-support-v7-palette.jar b/current/support/v7/palette/android-support-v7-palette.jar
index 1bb3809..d04b855 100644
--- a/current/support/v7/palette/android-support-v7-palette.jar
+++ b/current/support/v7/palette/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/preference/libs/android-support-v7-preference.jar b/current/support/v7/preference/libs/android-support-v7-preference.jar
index d8b1ce5..4a07885 100644
--- a/current/support/v7/preference/libs/android-support-v7-preference.jar
+++ b/current/support/v7/preference/libs/android-support-v7-preference.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index 2ffe1e9..34b82d0 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
diff --git a/current/support/wear/libs/android-support-wear.jar b/current/support/wear/libs/android-support-wear.jar
index f44b78d..8e57098 100644
--- a/current/support/wear/libs/android-support-wear.jar
+++ b/current/support/wear/libs/android-support-wear.jar
Binary files differ
diff --git a/current/support/wear/res/color/ws_switch_thumb_color_material.xml b/current/support/wear/res/color/ws_switch_thumb_color_material.xml
deleted file mode 100644
index 0707d69..0000000
--- a/current/support/wear/res/color/ws_switch_thumb_color_material.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?android:attr/colorButtonNormal"
- android:alpha="?android:attr/disabledAlpha" android:state_enabled="false" />
- <item android:color="?android:attr/colorControlActivated" android:state_checked="true" />
- <item android:color="?android:attr/colorButtonNormal" />
-</selector>
diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png
deleted file mode 100644
index 035e901..0000000
--- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png
deleted file mode 100644
index 6688631..0000000
--- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png
deleted file mode 100644
index 0dd9fce..0000000
--- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png
deleted file mode 100644
index a15b133..0000000
--- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png
deleted file mode 100644
index 1cd259e..0000000
--- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png
deleted file mode 100644
index 8ed1c97..0000000
--- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-v21/ws_ic_expand_more_white_22.xml b/current/support/wear/res/drawable-v21/ic_expand_more_white_22.xml
similarity index 100%
rename from current/support/wear/res/drawable-v21/ws_ic_expand_more_white_22.xml
rename to current/support/wear/res/drawable-v21/ic_expand_more_white_22.xml
diff --git a/current/support/wear/res/drawable-v21/ws_switch_thumb_material_anim.xml b/current/support/wear/res/drawable-v21/ws_switch_thumb_material_anim.xml
deleted file mode 100644
index 15423e5..0000000
--- a/current/support/wear/res/drawable-v21/ws_switch_thumb_material_anim.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
- android:constantSize="true">
- <item
- android:id="@+id/off"
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w"
- android:state_enabled="false" />
- <item
- android:id="@+id/on"
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w"
- android:state_checked="true" />
- <item
- android:id="@+id/off"
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w" />
- <transition
- android:fromId="@id/off"
- android:toId="@id/on">
- <animation-list>
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w"
- android:duration="30" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_15w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_16w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_17w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_18w"
- android:duration="75" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_17w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_16w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_15w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w"
- android:duration="30" />
- </animation-list>
- </transition>
- <transition
- android:fromId="@id/on"
- android:toId="@id/off">
- <animation-list>
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w"
- android:duration="30" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_15w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_16w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_17w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_18w"
- android:duration="75" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_17w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_16w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_15w"
- android:duration="15" />
- <item
- android:drawable="@drawable/ws_switch_thumb_mtrl_14w"
- android:duration="30" />
- </animation-list>
- </transition>
-</animated-selector>
diff --git a/current/support/wear/res/drawable-v23/ws_action_item_background.xml b/current/support/wear/res/drawable-v23/action_item_background.xml
similarity index 100%
rename from current/support/wear/res/drawable-v23/ws_action_item_background.xml
rename to current/support/wear/res/drawable-v23/action_item_background.xml
diff --git a/current/support/wear/res/drawable-v23/ws_action_item_icon_background.xml b/current/support/wear/res/drawable-v23/action_item_icon_background.xml
similarity index 100%
rename from current/support/wear/res/drawable-v23/ws_action_item_icon_background.xml
rename to current/support/wear/res/drawable-v23/action_item_icon_background.xml
diff --git a/current/support/wear/res/drawable-v23/ws_ic_expand_less_white_22.xml b/current/support/wear/res/drawable-v23/ic_expand_less_white_22.xml
similarity index 100%
rename from current/support/wear/res/drawable-v23/ws_ic_expand_less_white_22.xml
rename to current/support/wear/res/drawable-v23/ic_expand_less_white_22.xml
diff --git a/current/support/wear/res/drawable-v23/ws_ic_more_horiz_24dp_wht.xml b/current/support/wear/res/drawable-v23/ic_more_horiz_24dp_wht.xml
similarity index 100%
rename from current/support/wear/res/drawable-v23/ws_ic_more_horiz_24dp_wht.xml
rename to current/support/wear/res/drawable-v23/ic_more_horiz_24dp_wht.xml
diff --git a/current/support/wear/res/drawable-v23/ws_ic_more_vert_24dp_wht.xml b/current/support/wear/res/drawable-v23/ic_more_vert_24dp_wht.xml
similarity index 100%
rename from current/support/wear/res/drawable-v23/ws_ic_more_vert_24dp_wht.xml
rename to current/support/wear/res/drawable-v23/ic_more_vert_24dp_wht.xml
diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png
deleted file mode 100644
index 119207b..0000000
--- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png
deleted file mode 100644
index b89c86a..0000000
--- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png
deleted file mode 100644
index 7528731..0000000
--- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png
deleted file mode 100644
index dba351f..0000000
--- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png
deleted file mode 100644
index ab7b1df..0000000
--- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png
deleted file mode 100644
index 1769795..0000000
--- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png
deleted file mode 100644
index 8a00760..0000000
--- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png
deleted file mode 100644
index 64a0cab..0000000
--- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png
deleted file mode 100644
index ce7369e..0000000
--- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png
deleted file mode 100644
index 398e3f2..0000000
--- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png
deleted file mode 100644
index 1cf40e2..0000000
--- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png
deleted file mode 100644
index a329817..0000000
--- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png
+++ /dev/null
Binary files differ
diff --git a/current/support/wear/res/layout-v23/ws_action_drawer_item_view.xml b/current/support/wear/res/layout-v23/action_drawer_item_view.xml
similarity index 70%
rename from current/support/wear/res/layout-v23/ws_action_drawer_item_view.xml
rename to current/support/wear/res/layout-v23/action_drawer_item_view.xml
index fc84862..068e364 100644
--- a/current/support/wear/res/layout-v23/ws_action_drawer_item_view.xml
+++ b/current/support/wear/res/layout-v23/action_drawer_item_view.xml
@@ -18,24 +18,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/ws_action_item_background"
+ android:background="@drawable/action_item_background"
android:orientation="horizontal">
<ImageView
- android:id="@+id/ws_action_drawer_item_icon"
- android:layout_width="@dimen/ws_action_drawer_item_icon_size"
- android:layout_height="@dimen/ws_action_drawer_item_icon_size"
+ android:id="@+id/wearable_support_action_drawer_item_icon"
+ android:layout_width="@dimen/action_drawer_item_icon_size"
+ android:layout_height="@dimen/action_drawer_item_icon_size"
android:layout_gravity="center_vertical"
- android:background="@drawable/ws_action_item_icon_background"
+ android:background="@drawable/action_item_icon_background"
android:tint="?android:attr/colorBackground"
- android:padding="@dimen/ws_action_drawer_item_icon_padding"
+ android:padding="@dimen/action_drawer_item_icon_padding"
android:scaleType="fitCenter"
tools:ignore="ContentDescription" />
<TextView
- android:id="@+id/ws_action_drawer_item_text"
+ android:id="@+id/wearable_support_action_drawer_item_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/WsWearableActionDrawerItemText"/>
+ style="@style/WearableActionDrawerItemText"/>
</LinearLayout>
diff --git a/current/support/wear/res/layout-v23/ws_action_drawer_peek_view.xml b/current/support/wear/res/layout-v23/action_drawer_peek_view.xml
similarity index 66%
rename from current/support/wear/res/layout-v23/ws_action_drawer_peek_view.xml
rename to current/support/wear/res/layout-v23/action_drawer_peek_view.xml
index ce66d73..88946cb 100644
--- a/current/support/wear/res/layout-v23/ws_action_drawer_peek_view.xml
+++ b/current/support/wear/res/layout-v23/action_drawer_peek_view.xml
@@ -17,25 +17,25 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
- android:layout_height="@dimen/ws_action_drawer_peek_view_height"
+ android:layout_height="@dimen/action_drawer_peek_view_height"
android:layout_gravity="center"
android:gravity="center_vertical"
android:orientation="vertical"
- android:paddingTop="@dimen/ws_action_drawer_peek_top_padding">
+ android:paddingTop="@dimen/action_drawer_peek_top_padding">
<ImageView
- android:id="@+id/ws_action_drawer_peek_action_icon"
- android:layout_width="@dimen/ws_peek_view_icon_size"
- android:layout_height="@dimen/ws_peek_view_icon_size"
+ android:id="@+id/wearable_support_action_drawer_peek_action_icon"
+ android:layout_width="@dimen/peek_view_icon_size"
+ android:layout_height="@dimen/peek_view_icon_size"
android:tint="?android:attr/colorForeground"
tools:ignore="ContentDescription" />
<ImageView
- android:id="@+id/ws_action_drawer_expand_icon"
- android:layout_width="@dimen/ws_peek_view_icon_size"
- android:layout_height="@dimen/ws_peek_view_icon_size"
- android:layout_marginTop="@dimen/ws_action_drawer_expand_icon_top_margin"
- android:src="@drawable/ws_ic_expand_less_white_22"
+ android:id="@+id/wearable_support_action_drawer_expand_icon"
+ android:layout_width="@dimen/peek_view_icon_size"
+ android:layout_height="@dimen/peek_view_icon_size"
+ android:layout_marginTop="@dimen/action_drawer_expand_icon_top_margin"
+ android:src="@drawable/ic_expand_less_white_22"
android:alpha="0.5"
android:tint="?android:attr/colorForeground"
tools:ignore="NegativeMargin,ContentDescription" />
diff --git a/current/support/wear/res/layout-v23/ws_action_drawer_title_view.xml b/current/support/wear/res/layout-v23/action_drawer_title_view.xml
similarity index 83%
rename from current/support/wear/res/layout-v23/ws_action_drawer_title_view.xml
rename to current/support/wear/res/layout-v23/action_drawer_title_view.xml
index e5535c4..a2be3e1 100644
--- a/current/support/wear/res/layout-v23/ws_action_drawer_title_view.xml
+++ b/current/support/wear/res/layout-v23/action_drawer_title_view.xml
@@ -15,9 +15,9 @@
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/ws_action_drawer_title"
+ android:id="@+id/wearable_support_action_drawer_title"
android:layout_width="wrap_content"
- android:layout_height="@dimen/ws_action_drawer_item_icon_size"
+ android:layout_height="@dimen/action_drawer_item_icon_size"
android:layout_gravity="center"
android:gravity="center"
- style="@style/WsWearableActionDrawerTitleText" />
+ style="@style/WearableActionDrawerTitleText" />
diff --git a/current/support/wear/res/layout-v23/ws_wearable_drawer_view.xml b/current/support/wear/res/layout-v23/wearable_drawer_view.xml
similarity index 74%
rename from current/support/wear/res/layout-v23/ws_wearable_drawer_view.xml
rename to current/support/wear/res/layout-v23/wearable_drawer_view.xml
index c7c5907..8659aac 100644
--- a/current/support/wear/res/layout-v23/ws_wearable_drawer_view.xml
+++ b/current/support/wear/res/layout-v23/wearable_drawer_view.xml
@@ -19,16 +19,16 @@
<!-- Layout gravity for peek is set in code by WearableDrawerView. -->
<FrameLayout
- android:id="@+id/ws_drawer_view_peek_container"
+ android:id="@+id/wearable_support_drawer_view_peek_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
- android:id="@+id/ws_drawer_view_peek_icon"
- android:layout_width="@dimen/ws_peek_view_icon_size"
- android:layout_height="@dimen/ws_peek_view_icon_size"
- android:layout_marginTop="@dimen/ws_peek_view_top_padding"
- android:layout_marginBottom="@dimen/ws_peek_view_bottom_padding"
+ android:id="@+id/wearable_support_drawer_view_peek_icon"
+ android:layout_width="@dimen/peek_view_icon_size"
+ android:layout_height="@dimen/peek_view_icon_size"
+ android:layout_marginTop="@dimen/peek_view_top_padding"
+ android:layout_marginBottom="@dimen/peek_view_bottom_padding"
android:layout_gravity="center"
android:tint="?android:attr/colorForeground"
tools:ignore="ContentDescription" />
diff --git a/current/support/wear/res/layout/ws_navigation_drawer_item_view.xml b/current/support/wear/res/layout/navigation_drawer_item_view.xml
similarity index 86%
rename from current/support/wear/res/layout/ws_navigation_drawer_item_view.xml
rename to current/support/wear/res/layout/navigation_drawer_item_view.xml
index dcd5e41..9e4d86a 100644
--- a/current/support/wear/res/layout/ws_navigation_drawer_item_view.xml
+++ b/current/support/wear/res/layout/navigation_drawer_item_view.xml
@@ -19,17 +19,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
- android:id="@+id/ws_navigation_drawer_item_icon"
+ android:id="@+id/wearable_support_navigation_drawer_item_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_centerInParent="true"
android:scaleType="fitCenter"
tools:ignore="ContentDescription" />
<TextView
- android:id="@+id/ws_navigation_drawer_item_text"
+ android:id="@+id/wearable_support_navigation_drawer_item_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_below="@id/ws_navigation_drawer_item_icon"
+ android:layout_below="@id/wearable_support_navigation_drawer_item_icon"
android:layout_marginTop="6dp"
android:gravity="center_horizontal"
android:textColor="?android:attr/textColorPrimary"/>
diff --git a/current/support/wear/res/layout/ws_navigation_drawer_view.xml b/current/support/wear/res/layout/navigation_drawer_view.xml
similarity index 78%
rename from current/support/wear/res/layout/ws_navigation_drawer_view.xml
rename to current/support/wear/res/layout/navigation_drawer_view.xml
index ea4eced..9824bbf 100644
--- a/current/support/wear/res/layout/ws_navigation_drawer_view.xml
+++ b/current/support/wear/res/layout/navigation_drawer_view.xml
@@ -20,15 +20,15 @@
android:layout_height="match_parent" >
<android.support.v4.view.ViewPager
- android:id="@+id/ws_navigation_drawer_view_pager"
+ android:id="@+id/wearable_support_navigation_drawer_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<android.support.wear.widget.drawer.PageIndicatorView
- android:id="@+id/ws_navigation_drawer_page_indicator"
+ android:id="@+id/wearable_support_navigation_drawer_page_indicator"
android:layout_width="wrap_content"
- android:layout_height="@dimen/ws_peek_view_icon_size"
- android:layout_marginBottom="@dimen/ws_peek_view_bottom_padding"
+ android:layout_height="@dimen/peek_view_icon_size"
+ android:layout_marginBottom="@dimen/peek_view_bottom_padding"
android:layout_gravity="bottom|center_horizontal"
- app:wsPageIndicatorDotFadeWhenIdle="false" />
+ app:pageIndicatorDotFadeWhenIdle="false" />
</FrameLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_1_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_1_item.xml
similarity index 79%
rename from current/support/wear/res/layout/ws_single_page_nav_drawer_1_item.xml
rename to current/support/wear/res/layout/single_page_nav_drawer_1_item.xml
index 550d737..2911f43 100644
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_1_item.xml
+++ b/current/support/wear/res/layout/single_page_nav_drawer_1_item.xml
@@ -20,14 +20,14 @@
android:clipChildren="false">
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
android:layout_centerInParent="true"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<TextView
- android:id="@+id/ws_nav_drawer_text"
- android:layout_below="@id/ws_nav_drawer_icon_0"
- style="@style/WsSinglePageNavDrawerTextStyle"/>
+ android:id="@+id/wearable_support_nav_drawer_text"
+ android:layout_below="@id/wearable_support_nav_drawer_icon_0"
+ style="@style/SinglePageNavDrawerTextStyle"/>
</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_2_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_2_item.xml
similarity index 71%
rename from current/support/wear/res/layout/ws_single_page_nav_drawer_2_item.xml
rename to current/support/wear/res/layout/single_page_nav_drawer_2_item.xml
index 63dbbe6..cbdbb24 100644
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_2_item.xml
+++ b/current/support/wear/res/layout/single_page_nav_drawer_2_item.xml
@@ -21,24 +21,24 @@
android:clipChildren="false">
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_2_items"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_2_items"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_1"
+ android:id="@+id/wearable_support_nav_drawer_icon_1"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_2_items"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_2_items"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<TextView
- android:id="@+id/ws_nav_drawer_text"
- android:layout_below="@id/ws_nav_drawer_icon_1"
- style="@style/WsSinglePageNavDrawerTextStyle"/>
+ android:id="@+id/wearable_support_nav_drawer_text"
+ android:layout_below="@id/wearable_support_nav_drawer_icon_1"
+ style="@style/SinglePageNavDrawerTextStyle"/>
</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_3_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_3_item.xml
similarity index 69%
rename from current/support/wear/res/layout/ws_single_page_nav_drawer_3_item.xml
rename to current/support/wear/res/layout/single_page_nav_drawer_3_item.xml
index 209ec16..5e4fc52 100644
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_3_item.xml
+++ b/current/support/wear/res/layout/single_page_nav_drawer_3_item.xml
@@ -21,30 +21,30 @@
android:clipChildren="false">
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_3_items"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_3_items"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_1"
+ android:id="@+id/wearable_support_nav_drawer_icon_1"
android:layout_centerInParent="true"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_2"
+ android:id="@+id/wearable_support_nav_drawer_icon_2"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_3_items"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_3_items"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<TextView
- android:id="@+id/ws_nav_drawer_text"
- android:layout_below="@id/ws_nav_drawer_icon_2"
- style="@style/WsSinglePageNavDrawerTextStyle"/>
+ android:id="@+id/wearable_support_nav_drawer_text"
+ android:layout_below="@id/wearable_support_nav_drawer_icon_2"
+ style="@style/SinglePageNavDrawerTextStyle"/>
</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_4_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_4_item.xml
similarity index 66%
rename from current/support/wear/res/layout/ws_single_page_nav_drawer_4_item.xml
rename to current/support/wear/res/layout/single_page_nav_drawer_4_item.xml
index 1b2c163..4acfdab 100644
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_4_item.xml
+++ b/current/support/wear/res/layout/single_page_nav_drawer_4_item.xml
@@ -21,38 +21,38 @@
android:clipChildren="false">
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_4_items_vertical"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_4_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_1"
+ android:id="@+id/wearable_support_nav_drawer_icon_1"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_4_items_horizontal"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_4_items_horizontal"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_2"
+ android:id="@+id/wearable_support_nav_drawer_icon_2"
android:layout_centerInParent="true"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_3"
+ android:id="@+id/wearable_support_nav_drawer_icon_3"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_4_items_horizontal"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_4_items_horizontal"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<TextView
- android:id="@+id/ws_nav_drawer_text"
- android:layout_below="@id/ws_nav_drawer_icon_3"
- style="@style/WsSinglePageNavDrawerTextStyle"/>
+ android:id="@+id/wearable_support_nav_drawer_text"
+ android:layout_below="@id/wearable_support_nav_drawer_icon_3"
+ style="@style/SinglePageNavDrawerTextStyle"/>
</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/single_page_nav_drawer_5_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_5_item.xml
new file mode 100644
index 0000000..2a8c3af
--- /dev/null
+++ b/current/support/wear/res/layout/single_page_nav_drawer_5_item.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<android.support.percent.PercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false">
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_5_items_horizontal_outer_rows"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_5_items_vertical"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle"/>
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_1"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentTop="true"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_5_items_horizontal_outer_rows"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_5_items_vertical"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_2"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_5_items_horizontal_middle_row"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_3"
+ android:layout_centerInParent="true"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_4"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_5_items_horizontal_middle_row"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <TextView
+ android:id="@+id/wearable_support_nav_drawer_text"
+ android:layout_below="@id/wearable_support_nav_drawer_icon_4"
+ style="@style/SinglePageNavDrawerTextStyle"/>
+
+</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_6_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_6_item.xml
similarity index 60%
rename from current/support/wear/res/layout/ws_single_page_nav_drawer_6_item.xml
rename to current/support/wear/res/layout/single_page_nav_drawer_6_item.xml
index 00625a1..fd6cd65 100644
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_6_item.xml
+++ b/current/support/wear/res/layout/single_page_nav_drawer_6_item.xml
@@ -21,56 +21,56 @@
android:clipChildren="false">
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_6_items_horizontal"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_6_items_vertical"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_6_items_horizontal"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_6_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_1"
+ android:id="@+id/wearable_support_nav_drawer_icon_1"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_6_items_vertical"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_6_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_2"
+ android:id="@+id/wearable_support_nav_drawer_icon_2"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_6_items_horizontal"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_6_items_vertical"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_6_items_horizontal"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_6_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_3"
+ android:id="@+id/wearable_support_nav_drawer_icon_3"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_6_items_horizontal"
- app:layout_marginBottomPercent="@fraction/ws_nav_drawer_margin_6_items_vertical"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_6_items_horizontal"
+ app:layout_marginBottomPercent="@fraction/nav_drawer_margin_6_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_4"
+ android:id="@+id/wearable_support_nav_drawer_icon_4"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
- app:layout_marginBottomPercent="@fraction/ws_nav_drawer_margin_6_items_vertical"
+ app:layout_marginBottomPercent="@fraction/nav_drawer_margin_6_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
<android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_5"
+ android:id="@+id/wearable_support_nav_drawer_icon_5"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_6_items_horizontal"
- app:layout_marginBottomPercent="@fraction/ws_nav_drawer_margin_6_items_vertical"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_6_items_horizontal"
+ app:layout_marginBottomPercent="@fraction/nav_drawer_margin_6_items_vertical"
tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
+ style="@style/SinglePageNavDrawerIconStyle" />
</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/single_page_nav_drawer_7_item.xml b/current/support/wear/res/layout/single_page_nav_drawer_7_item.xml
new file mode 100644
index 0000000..45e0c24
--- /dev/null
+++ b/current/support/wear/res/layout/single_page_nav_drawer_7_item.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<android.support.percent.PercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false">
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_0"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_7_items_horizontal_outer_rows"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_7_items_vertical"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_1"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentTop="true"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_7_items_horizontal_outer_rows"
+ app:layout_marginTopPercent="@fraction/nav_drawer_margin_7_items_vertical"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_2"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_7_items_horizontal_middle_row"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_3"
+ android:layout_centerInParent="true"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_4"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_7_items_horizontal_middle_row"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_5"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentBottom="true"
+ app:layout_marginStartPercent="@fraction/nav_drawer_margin_7_items_horizontal_outer_rows"
+ app:layout_marginBottomPercent="@fraction/nav_drawer_margin_7_items_vertical"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+ <android.support.wear.widget.CircledImageView
+ android:id="@+id/wearable_support_nav_drawer_icon_6"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ app:layout_marginEndPercent="@fraction/nav_drawer_margin_7_items_horizontal_outer_rows"
+ app:layout_marginBottomPercent="@fraction/nav_drawer_margin_7_items_vertical"
+ tools:ignore="ContentDescription"
+ style="@style/SinglePageNavDrawerIconStyle" />
+
+</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_peek_view.xml b/current/support/wear/res/layout/single_page_nav_drawer_peek_view.xml
similarity index 78%
rename from current/support/wear/res/layout/ws_single_page_nav_drawer_peek_view.xml
rename to current/support/wear/res/layout/single_page_nav_drawer_peek_view.xml
index 8b11554..e0ed880 100644
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_peek_view.xml
+++ b/current/support/wear/res/layout/single_page_nav_drawer_peek_view.xml
@@ -20,13 +20,13 @@
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
- android:paddingTop="@dimen/ws_peek_view_top_padding"
- android:paddingBottom="@dimen/ws_peek_view_bottom_padding">
+ android:paddingTop="@dimen/peek_view_top_padding"
+ android:paddingBottom="@dimen/peek_view_bottom_padding">
<ImageView
- android:layout_width="@dimen/ws_peek_view_icon_size"
- android:layout_height="@dimen/ws_peek_view_icon_size"
- android:src="@drawable/ws_ic_expand_more_white_22"
+ android:layout_width="@dimen/peek_view_icon_size"
+ android:layout_height="@dimen/peek_view_icon_size"
+ android:src="@drawable/ic_expand_more_white_22"
android:tint="?android:attr/colorForeground"
tools:ignore="ContentDescription"/>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_5_item.xml b/current/support/wear/res/layout/ws_single_page_nav_drawer_5_item.xml
deleted file mode 100644
index 699533d..0000000
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_5_item.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<android.support.percent.PercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false">
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_5_items_horizontal_outer_rows"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_5_items_vertical"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle"/>
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_1"
- android:layout_alignParentEnd="true"
- android:layout_alignParentTop="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_5_items_horizontal_outer_rows"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_5_items_vertical"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_2"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_5_items_horizontal_middle_row"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_3"
- android:layout_centerInParent="true"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_4"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_5_items_horizontal_middle_row"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <TextView
- android:id="@+id/ws_nav_drawer_text"
- android:layout_below="@id/ws_nav_drawer_icon_4"
- style="@style/WsSinglePageNavDrawerTextStyle"/>
-
-</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/layout/ws_single_page_nav_drawer_7_item.xml b/current/support/wear/res/layout/ws_single_page_nav_drawer_7_item.xml
deleted file mode 100644
index 5daef22..0000000
--- a/current/support/wear/res/layout/ws_single_page_nav_drawer_7_item.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<android.support.percent.PercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false">
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_0"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_7_items_horizontal_outer_rows"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_7_items_vertical"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_1"
- android:layout_alignParentEnd="true"
- android:layout_alignParentTop="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_7_items_horizontal_outer_rows"
- app:layout_marginTopPercent="@fraction/ws_nav_drawer_margin_7_items_vertical"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_2"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_7_items_horizontal_middle_row"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_3"
- android:layout_centerInParent="true"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_4"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_7_items_horizontal_middle_row"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_5"
- android:layout_alignParentStart="true"
- android:layout_alignParentBottom="true"
- app:layout_marginStartPercent="@fraction/ws_nav_drawer_margin_7_items_horizontal_outer_rows"
- app:layout_marginBottomPercent="@fraction/ws_nav_drawer_margin_7_items_vertical"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
- <android.support.wear.widget.CircledImageView
- android:id="@+id/ws_nav_drawer_icon_6"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- app:layout_marginEndPercent="@fraction/ws_nav_drawer_margin_7_items_horizontal_outer_rows"
- app:layout_marginBottomPercent="@fraction/ws_nav_drawer_margin_7_items_vertical"
- tools:ignore="ContentDescription"
- style="@style/WsSinglePageNavDrawerIconStyle" />
-
-</android.support.percent.PercentRelativeLayout>
diff --git a/current/support/wear/res/values-sw180dp-notround-v23/values-sw180dp-notround-v23.xml b/current/support/wear/res/values-sw180dp-notround-v23/values-sw180dp-notround-v23.xml
index 42723eb..24df68a 100644
--- a/current/support/wear/res/values-sw180dp-notround-v23/values-sw180dp-notround-v23.xml
+++ b/current/support/wear/res/values-sw180dp-notround-v23/values-sw180dp-notround-v23.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="ws_action_drawer_item_bottom_padding">10dp</dimen>
- <dimen name="ws_action_drawer_item_icon_padding">8dp</dimen>
- <dimen name="ws_action_drawer_item_icon_right_margin">12dp</dimen>
- <dimen name="ws_action_drawer_item_icon_size">40dp</dimen>
- <dimen name="ws_action_drawer_item_text_size">16sp</dimen>
- <dimen name="ws_action_drawer_item_top_padding">10dp</dimen>
+ <dimen name="action_drawer_item_bottom_padding">10dp</dimen>
+ <dimen name="action_drawer_item_icon_padding">8dp</dimen>
+ <dimen name="action_drawer_item_icon_right_margin">12dp</dimen>
+ <dimen name="action_drawer_item_icon_size">40dp</dimen>
+ <dimen name="action_drawer_item_text_size">16sp</dimen>
+ <dimen name="action_drawer_item_top_padding">10dp</dimen>
</resources>
\ No newline at end of file
diff --git a/current/support/wear/res/values-sw210dp-round-v23/values-sw210dp-round-v23.xml b/current/support/wear/res/values-sw210dp-round-v23/values-sw210dp-round-v23.xml
index 42723eb..24df68a 100644
--- a/current/support/wear/res/values-sw210dp-round-v23/values-sw210dp-round-v23.xml
+++ b/current/support/wear/res/values-sw210dp-round-v23/values-sw210dp-round-v23.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="ws_action_drawer_item_bottom_padding">10dp</dimen>
- <dimen name="ws_action_drawer_item_icon_padding">8dp</dimen>
- <dimen name="ws_action_drawer_item_icon_right_margin">12dp</dimen>
- <dimen name="ws_action_drawer_item_icon_size">40dp</dimen>
- <dimen name="ws_action_drawer_item_text_size">16sp</dimen>
- <dimen name="ws_action_drawer_item_top_padding">10dp</dimen>
+ <dimen name="action_drawer_item_bottom_padding">10dp</dimen>
+ <dimen name="action_drawer_item_icon_padding">8dp</dimen>
+ <dimen name="action_drawer_item_icon_right_margin">12dp</dimen>
+ <dimen name="action_drawer_item_icon_size">40dp</dimen>
+ <dimen name="action_drawer_item_text_size">16sp</dimen>
+ <dimen name="action_drawer_item_top_padding">10dp</dimen>
</resources>
\ No newline at end of file
diff --git a/current/support/wear/res/values-sw210dp-v13/values-sw210dp-v13.xml b/current/support/wear/res/values-sw210dp-v13/values-sw210dp-v13.xml
index f433994..30826f4 100644
--- a/current/support/wear/res/values-sw210dp-v13/values-sw210dp-v13.xml
+++ b/current/support/wear/res/values-sw210dp-v13/values-sw210dp-v13.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="ws_nav_drawer_single_page_circle_radius">27dp</dimen>
- <dimen name="ws_nav_drawer_single_page_icon_size">32dp</dimen>
- <dimen name="ws_nav_drawer_text_size">14sp</dimen>
+ <dimen name="nav_drawer_single_page_circle_radius">27dp</dimen>
+ <dimen name="nav_drawer_single_page_icon_size">32dp</dimen>
+ <dimen name="nav_drawer_text_size">14sp</dimen>
</resources>
\ No newline at end of file
diff --git a/current/support/wear/res/values-v20/values-v20.xml b/current/support/wear/res/values-v20/values-v20.xml
index 47a6618..a2b0533 100644
--- a/current/support/wear/res/values-v20/values-v20.xml
+++ b/current/support/wear/res/values-v20/values-v20.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="WsPageIndicatorViewStyle">
- <item name="wsPageIndicatorDotSpacing">7.8dp</item>
- <item name="wsPageIndicatorDotRadius">2.1dp</item>
- <item name="wsPageIndicatorDotRadiusSelected">3.1dp</item>
- <item name="wsPageIndicatorDotColor">?android:attr/colorForeground</item>
- <item name="wsPageIndicatorDotColorSelected">?android:attr/colorForeground</item>
- <item name="wsPageIndicatorDotFadeOutDelay">1000</item>
- <item name="wsPageIndicatorDotFadeOutDuration">250</item>
- <item name="wsPageIndicatorDotFadeInDuration">100</item>
- <item name="wsPageIndicatorDotFadeWhenIdle">true</item>
- <item name="wsPageIndicatorDotShadowColor">#66000000</item>
- <item name="wsPageIndicatorDotShadowRadius">1dp</item>
- <item name="wsPageIndicatorDotShadowDx">0.5dp</item>
- <item name="wsPageIndicatorDotShadowDy">0.5dp</item>
+ <style name="PageIndicatorViewStyle">
+ <item name="pageIndicatorDotSpacing">7.8dp</item>
+ <item name="pageIndicatorDotRadius">2.1dp</item>
+ <item name="pageIndicatorDotRadiusSelected">3.1dp</item>
+ <item name="pageIndicatorDotColor">?android:attr/colorForeground</item>
+ <item name="pageIndicatorDotColorSelected">?android:attr/colorForeground</item>
+ <item name="pageIndicatorDotFadeOutDelay">1000</item>
+ <item name="pageIndicatorDotFadeOutDuration">250</item>
+ <item name="pageIndicatorDotFadeInDuration">100</item>
+ <item name="pageIndicatorDotFadeWhenIdle">true</item>
+ <item name="pageIndicatorDotShadowColor">#66000000</item>
+ <item name="pageIndicatorDotShadowRadius">1dp</item>
+ <item name="pageIndicatorDotShadowDx">0.5dp</item>
+ <item name="pageIndicatorDotShadowDy">0.5dp</item>
</style>
</resources>
\ No newline at end of file
diff --git a/current/support/wear/res/values-v23/values-v23.xml b/current/support/wear/res/values-v23/values-v23.xml
index b631117..08c0265 100644
--- a/current/support/wear/res/values-v23/values-v23.xml
+++ b/current/support/wear/res/values-v23/values-v23.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="WsWearableActionDrawerItemText">
+ <style name="WearableActionDrawerItemText">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:ellipsize">end</item>
<item name="android:fontFamily">sans-serif-condensed-light</item>
<item name="android:maxLines">3</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
- <item name="android:textSize">@dimen/ws_action_drawer_item_text_size</item>
+ <item name="android:textSize">@dimen/action_drawer_item_text_size</item>
</style>
- <style name="WsWearableActionDrawerTitleText" parent="android:TextAppearance.Material.Subhead">
+ <style name="WearableActionDrawerTitleText" parent="android:TextAppearance.Material.Subhead">
<item name="android:alpha">0.7</item>
</style>
</resources>
\ No newline at end of file
diff --git a/current/support/wear/res/values-v24/values-v24.xml b/current/support/wear/res/values-v24/values-v24.xml
deleted file mode 100644
index f145371..0000000
--- a/current/support/wear/res/values-v24/values-v24.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="Widget.Wear.RoundSwitch" parent="@android:style/Widget.Material.CompoundButton.Switch">
- <item name="android:layout_width">@dimen/ws_switch_size</item>
- <item name="android:layout_height">@dimen/ws_switch_size</item>
- <item name="android:switchMinWidth">@dimen/ws_switch_size</item>
- <item name="android:layout_gravity">center</item>
- <item name="android:thumb">@drawable/ws_switch_thumb_material_anim</item>
- <item name="android:thumbTint">@color/ws_switch_thumb_color_material</item>
- <item name="android:thumbTintMode">multiply</item>
- <item name="android:track">@drawable/ws_switch_track_mtrl</item>
- <item name="android:trackTint">@color/ws_switch_track_color_material</item>
- <item name="android:background">@empty</item>
- <item name="android:showText">false</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/current/support/wear/res/values/values.xml b/current/support/wear/res/values/values.xml
index a8560b0..1c2eb00 100644
--- a/current/support/wear/res/values/values.xml
+++ b/current/support/wear/res/values/values.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <array name="circular_progress_layout_color_scheme_colors">
- <item>@color/circular_progress_layout_red</item>
- <item>@color/circular_progress_layout_yellow</item>
- <item>@color/circular_progress_layout_green</item>
- <item>@color/circular_progress_layout_blue</item>
- </array>
- <color name="circular_progress_layout_background_color">#00000000</color>
- <color name="circular_progress_layout_blue">#FF2196F3</color>
- <color name="circular_progress_layout_green">#FF4CAF50</color>
- <color name="circular_progress_layout_red">#FFF44336</color>
- <color name="circular_progress_layout_yellow">#FFFFEB3B</color>
<declare-styleable name="BoxInsetLayout_Layout"><attr name="boxedEdges">
<flag name="none" value="0x00"/>
@@ -25,17 +14,16 @@
<flag name="all" value="0x0F"/>
</attr></declare-styleable>
- <declare-styleable name="CircledImageView"><attr name="android:src"/><attr format="color" name="background_color"/><attr format="dimension" name="background_radius"/><attr format="dimension" name="background_radius_pressed"/><attr format="dimension" name="background_border_width"/><attr format="color" name="background_border_color"/><attr format="enum" name="background_border_cap">
+ <declare-styleable name="CircledImageView"><attr name="android:src"/><attr format="color" name="circle_color"/><attr format="dimension" name="circle_radius"/><attr format="dimension" name="circle_radius_pressed"/><attr format="dimension" name="circle_border_width"/><attr format="color" name="circle_border_color"/><attr format="enum" name="circle_border_cap">
<enum name="butt" value="0"/>
<enum name="round" value="1"/>
<enum name="square" value="2"/>
- </attr><attr format="dimension" name="img_padding"/><attr format="dimension" name="background_shadow_width"/><attr format="dimension" name="img_circle_percentage"/><attr format="dimension" name="img_horizontal_offset_percentage"/><attr format="color" name="img_tint"/><attr format="fraction" name="background_radius_percent"/><attr format="fraction" name="background_radius_pressed_percent"/><attr format="enum" name="clip_dimen">
+ </attr><attr format="dimension" name="circle_padding"/><attr format="dimension" name="shadow_width"/><attr format="dimension" name="image_circle_percentage"/><attr format="dimension" name="image_horizontal_offcenter_percentage"/><attr format="color" name="image_tint"/><attr format="fraction" name="circle_radius_percent"/><attr format="fraction" name="circle_radius_pressed_percent"/><attr format="enum" name="square_dimen">
<enum name="none" value="0"/>
<enum name="height" value="1"/>
<enum name="width" value="2"/>
</attr></declare-styleable>
- <declare-styleable name="CircularProgressLayout"><attr format="color" name="backgroundColor"/><attr format="dimension" name="strokeWidth"/><attr format="reference|color" name="colorSchemeColors"/><attr format="boolean" name="indeterminate"/></declare-styleable>
- <declare-styleable name="PageIndicatorView"><attr format="dimension" name="wsPageIndicatorDotSpacing"/><attr format="dimension" name="wsPageIndicatorDotRadius"/><attr format="dimension" name="wsPageIndicatorDotRadiusSelected"/><attr format="color" name="wsPageIndicatorDotColor"/><attr format="color" name="wsPageIndicatorDotColorSelected"/><attr format="boolean" name="wsPageIndicatorDotFadeWhenIdle"/><attr format="integer" name="wsPageIndicatorDotFadeOutDelay"/><attr format="integer" name="wsPageIndicatorDotFadeOutDuration"/><attr format="integer" name="wsPageIndicatorDotFadeInDuration"/><attr format="color" name="wsPageIndicatorDotShadowColor"/><attr format="dimension" name="wsPageIndicatorDotShadowRadius"/><attr format="dimension" name="wsPageIndicatorDotShadowDx"/><attr format="dimension" name="wsPageIndicatorDotShadowDy"/></declare-styleable>
+ <declare-styleable name="PageIndicatorView"><attr format="dimension" name="pageIndicatorDotSpacing"/><attr format="dimension" name="pageIndicatorDotRadius"/><attr format="dimension" name="pageIndicatorDotRadiusSelected"/><attr format="color" name="pageIndicatorDotColor"/><attr format="color" name="pageIndicatorDotColorSelected"/><attr format="boolean" name="pageIndicatorDotFadeWhenIdle"/><attr format="integer" name="pageIndicatorDotFadeOutDelay"/><attr format="integer" name="pageIndicatorDotFadeOutDuration"/><attr format="integer" name="pageIndicatorDotFadeInDuration"/><attr format="color" name="pageIndicatorDotShadowColor"/><attr format="dimension" name="pageIndicatorDotShadowRadius"/><attr format="dimension" name="pageIndicatorDotShadowDx"/><attr format="dimension" name="pageIndicatorDotShadowDy"/></declare-styleable>
<declare-styleable name="WearableActionDrawerView"><attr format="string" name="drawerTitle"/><attr format="reference" name="actionMenu"/><attr format="boolean" name="showOverflowInPeek"/></declare-styleable>
<declare-styleable name="WearableDrawerView"><attr format="reference" name="peekView"/><attr format="reference" name="drawerContent"/><attr format="boolean" name="enableAutoPeek"/><attr name="android:background"/><attr name="android:elevation"/></declare-styleable>
<declare-styleable name="WearableNavigationDrawerView"><attr format="enum" name="navigationStyle">
@@ -45,68 +33,66 @@
<enum name="multiPage" value="1"/>
</attr></declare-styleable>
<declare-styleable name="WearableRecyclerView"><attr format="fraction" name="bezelWidth"/><attr format="boolean" name="circularScrollingGestureEnabled"/><attr format="float" name="scrollDegreesPerScreen"/></declare-styleable>
- <dimen name="circular_progress_layout_stroke_width">4dp</dimen>
- <dimen name="ws_action_drawer_expand_icon_top_margin">-3dp</dimen>
- <dimen name="ws_action_drawer_item_bottom_padding">8dp</dimen>
- <dimen name="ws_action_drawer_item_icon_padding">7dp</dimen>
- <dimen name="ws_action_drawer_item_icon_right_margin">8dp</dimen>
- <dimen name="ws_action_drawer_item_icon_size">36dp</dimen>
- <dimen name="ws_action_drawer_item_text_size">14sp</dimen>
- <dimen name="ws_action_drawer_item_top_padding">8dp</dimen>
- <dimen name="ws_action_drawer_peek_top_padding">2dp</dimen>
- <dimen name="ws_action_drawer_peek_view_height">43dp</dimen>
- <dimen name="ws_drawer_view_edge_size">38dp</dimen>
- <dimen name="ws_nav_drawer_single_page_circle_radius">24dp</dimen>
- <dimen name="ws_nav_drawer_single_page_icon_padding">6dp</dimen>
- <dimen name="ws_nav_drawer_single_page_icon_size">28dp</dimen>
- <dimen name="ws_nav_drawer_text_size">12sp</dimen>
- <dimen name="ws_peek_view_bottom_padding">8dp</dimen>
- <dimen name="ws_peek_view_icon_size">22dp</dimen>
- <dimen name="ws_peek_view_top_padding">8dp</dimen>
- <dimen name="ws_switch_size">40dp</dimen>
- <dimen name="ws_wearable_drawer_view_elevation">12dp</dimen>
- <dimen name="ws_wrv_curve_default_x_offset">24dp</dimen>
- <item name="ws_action_drawer_item_first_item_top_padding" type="fraction">15%</item>
- <item name="ws_action_drawer_item_last_item_bottom_padding" type="fraction">15%</item>
- <item name="ws_action_drawer_item_left_padding" type="fraction">15%</item>
- <item name="ws_action_drawer_item_right_padding" type="fraction">10%</item>
- <fraction name="ws_nav_drawer_margin_2_items">20%</fraction>
- <fraction name="ws_nav_drawer_margin_3_items">16%</fraction>
- <fraction name="ws_nav_drawer_margin_4_items_horizontal">13%</fraction>
- <fraction name="ws_nav_drawer_margin_4_items_vertical">16.9%</fraction>
- <fraction name="ws_nav_drawer_margin_5_items_horizontal_middle_row">13%</fraction>
- <fraction name="ws_nav_drawer_margin_5_items_horizontal_outer_rows">27.4%</fraction>
- <fraction name="ws_nav_drawer_margin_5_items_vertical">16.9%</fraction>
- <fraction name="ws_nav_drawer_margin_6_items_horizontal">16%</fraction>
- <fraction name="ws_nav_drawer_margin_6_items_vertical">26.8%</fraction>
- <fraction name="ws_nav_drawer_margin_7_items_horizontal_middle_row">13%</fraction>
- <fraction name="ws_nav_drawer_margin_7_items_horizontal_outer_rows">27.4%</fraction>
- <fraction name="ws_nav_drawer_margin_7_items_vertical">16.9%</fraction>
- <fraction name="ws_nav_drawer_text_margin">13%</fraction>
- <item name="ws_navigation_drawer_view_pager" type="id"/>
- <string name="ws_action_drawer_content_description">Action drawer</string>
- <string name="ws_navigation_drawer_content_description">Navigation drawer</string>
- <style name="Widget.Wear.WearableDrawerView" parent="">
- <item name="android:elevation">@dimen/ws_wearable_drawer_view_elevation</item>
- <item name="android:background">?android:attr/colorBackgroundFloating</item>
- </style>
- <style name="WsSinglePageNavDrawerIconStyle">
- <item name="android:layout_height">@dimen/ws_nav_drawer_single_page_icon_size</item>
- <item name="android:layout_width">@dimen/ws_nav_drawer_single_page_icon_size</item>
- <item name="android:padding">@dimen/ws_nav_drawer_single_page_icon_padding</item>
+ <dimen name="action_drawer_expand_icon_top_margin">-3dp</dimen>
+ <dimen name="action_drawer_item_bottom_padding">8dp</dimen>
+ <dimen name="action_drawer_item_icon_padding">7dp</dimen>
+ <dimen name="action_drawer_item_icon_right_margin">8dp</dimen>
+ <dimen name="action_drawer_item_icon_size">36dp</dimen>
+ <dimen name="action_drawer_item_text_size">14sp</dimen>
+ <dimen name="action_drawer_item_top_padding">8dp</dimen>
+ <dimen name="action_drawer_peek_top_padding">2dp</dimen>
+ <dimen name="action_drawer_peek_view_height">43dp</dimen>
+ <dimen name="drawer_view_edge_size">38dp</dimen>
+ <dimen name="nav_drawer_single_page_circle_radius">24dp</dimen>
+ <dimen name="nav_drawer_single_page_icon_padding">6dp</dimen>
+ <dimen name="nav_drawer_single_page_icon_size">28dp</dimen>
+ <dimen name="nav_drawer_text_size">12sp</dimen>
+ <dimen name="peek_view_bottom_padding">8dp</dimen>
+ <dimen name="peek_view_icon_size">22dp</dimen>
+ <dimen name="peek_view_top_padding">8dp</dimen>
+ <dimen name="wearable_drawer_view_elevation">12dp</dimen>
+ <dimen name="wrv_curve_default_x_offset">24dp</dimen>
+ <item name="action_drawer_item_first_item_top_padding" type="fraction">15%</item>
+ <item name="action_drawer_item_last_item_bottom_padding" type="fraction">15%</item>
+ <item name="action_drawer_item_left_padding" type="fraction">15%</item>
+ <item name="action_drawer_item_right_padding" type="fraction">10%</item>
+ <fraction name="nav_drawer_margin_2_items">20%</fraction>
+ <fraction name="nav_drawer_margin_3_items">16%</fraction>
+ <fraction name="nav_drawer_margin_4_items_horizontal">13%</fraction>
+ <fraction name="nav_drawer_margin_4_items_vertical">16.9%</fraction>
+ <fraction name="nav_drawer_margin_5_items_horizontal_middle_row">13%</fraction>
+ <fraction name="nav_drawer_margin_5_items_horizontal_outer_rows">27.4%</fraction>
+ <fraction name="nav_drawer_margin_5_items_vertical">16.9%</fraction>
+ <fraction name="nav_drawer_margin_6_items_horizontal">16%</fraction>
+ <fraction name="nav_drawer_margin_6_items_vertical">26.8%</fraction>
+ <fraction name="nav_drawer_margin_7_items_horizontal_middle_row">13%</fraction>
+ <fraction name="nav_drawer_margin_7_items_horizontal_outer_rows">27.4%</fraction>
+ <fraction name="nav_drawer_margin_7_items_vertical">16.9%</fraction>
+ <fraction name="nav_drawer_text_margin">13%</fraction>
+ <item name="wearable_support_navigation_drawer_view_pager" type="id"/>
+ <string name="action_drawer_content_description">Action drawer</string>
+ <string name="navigation_drawer_content_description">Navigation drawer</string>
+ <style name="SinglePageNavDrawerIconStyle">
+ <item name="android:layout_height">@dimen/nav_drawer_single_page_icon_size</item>
+ <item name="android:layout_width">@dimen/nav_drawer_single_page_icon_size</item>
+ <item name="android:padding">@dimen/nav_drawer_single_page_icon_padding</item>
<item name="android:clipToPadding">false</item>
- <item name="background_radius">@dimen/ws_nav_drawer_single_page_circle_radius</item>
- <item name="background_color">#33ffffff</item>
+ <item name="circle_radius">@dimen/nav_drawer_single_page_circle_radius</item>
+ <item name="circle_color">#33ffffff</item>
</style>
- <style name="WsSinglePageNavDrawerTextStyle">
+ <style name="SinglePageNavDrawerTextStyle">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:fontFamily">sans-serif-condensed</item>
- <item name="android:textSize">@dimen/ws_nav_drawer_text_size</item>
+ <item name="android:textSize">@dimen/nav_drawer_text_size</item>
<item name="android:gravity">center</item>
<item name="android:maxLines">2</item>
- <item name="layout_marginTopPercent">@fraction/ws_nav_drawer_text_margin</item>
- <item name="layout_marginStartPercent">@fraction/ws_nav_drawer_text_margin</item>
- <item name="layout_marginEndPercent">@fraction/ws_nav_drawer_text_margin</item>
+ <item name="layout_marginTopPercent">@fraction/nav_drawer_text_margin</item>
+ <item name="layout_marginStartPercent">@fraction/nav_drawer_text_margin</item>
+ <item name="layout_marginEndPercent">@fraction/nav_drawer_text_margin</item>
+ </style>
+ <style name="Widget.Wearable.WearableDrawerView" parent="">
+ <item name="android:elevation">@dimen/wearable_drawer_view_elevation</item>
+ <item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
</resources>
\ No newline at end of file
diff --git a/update_current.py b/update_current.py
index ba3e081..5b3045a 100755
--- a/update_current.py
+++ b/update_current.py
@@ -1,8 +1,5 @@
#!/usr/bin/python
-# This script is used to update platform SDK prebuilts, Support Library, and a variety of other
-# prebuilt libraries used by Android's Makefile builds. For details on how to use this script,
-# visit go/update-prebuilts.
import os, sys, getopt, zipfile, re
import argparse
import subprocess
@@ -11,10 +8,9 @@
current_path = 'current'
system_path = 'system_current'
-support_dir = os.path.join(current_path, 'support')
-extras_dir = os.path.join(current_path, 'extras')
+support_path = os.path.join(current_path, 'support')
-# See go/fetch_artifact for details on this script.
+# See go/fetch_artifact
FETCH_ARTIFACT = '/google/data/ro/projects/android/fetch_artifact'
# Does not import support-v4, which is handled as a separate Android.mk (../support-v4) to
@@ -54,9 +50,7 @@
'support-v13': ['android-support-v13-nodeps', 'v13'],
'support-vector-drawable': ['android-support-vectordrawable', 'graphics/drawable'],
'transition': ['android-support-transition', 'transition'],
- 'wear': ['android-support-wear', 'wear'],
- 'constraint-layout': ['android-support-constraint-layout', 'constraint-layout'],
- 'constraint-layout-solver': ['android-support-constraint-layout-solver', 'constraint-layout-solver']
+ 'wear': ['android-support-wear', 'wear']
}
# Always remove these files.
@@ -64,11 +58,10 @@
'annotations.zip',
'public.txt',
'R.txt',
- 'AndroidManifest.xml',
- os.path.join('libs','noto-emoji-compat-java.jar')
+ 'AndroidManifest.xml'
]
-artifact_pattern = re.compile(r"^(.+?)-(\d+\.\d+\.\d+(?:-\w+\d+)?(?:-[\d.]+)*)\.(jar|aar)$")
+artifact_pattern = re.compile(r"^(.+?)-(\d+\.\d+\.\d+(?:-\w+\d*)?)\.(jar|aar)$")
def touch(fname, times=None):
@@ -80,10 +73,6 @@
return reduce((lambda x, y: os.path.join(x, y)), path_parts)
-def flatten(list):
- return reduce((lambda x, y: "%s %s" % (x, y)), list)
-
-
def rm(path):
if os.path.isdir(path):
rmtree(path)
@@ -92,18 +81,23 @@
def mv(src_path, dst_path):
- if os.path.exists(dst_path):
- rm(dst_path)
- if not os.path.exists(os.path.dirname(dst_path)):
- os.makedirs(os.path.dirname(dst_path))
+ rm(dst_path)
os.rename(src_path, dst_path)
-def detect_artifacts(repo_dir):
+def transform_support(repoDir):
+ cwd = os.getcwd()
+
+ # Use a temporary working directory.
+ working_dir = os.path.join(cwd, 'support_tmp')
+ if os.path.exists(working_dir):
+ rmtree(working_dir)
+ os.mkdir(working_dir)
+
maven_lib_info = {}
# Find the latest revision for each artifact.
- for root, dirs, files in os.walk(repo_dir):
+ for root, dirs, files in os.walk(repoDir):
for file in files:
matcher = artifact_pattern.match(file)
if matcher:
@@ -115,29 +109,17 @@
or maven_lib_vers > maven_lib_info[maven_lib_name][0]:
maven_lib_info[maven_lib_name] = [maven_lib_vers, root, file]
- return maven_lib_info
-
-
-def transform_maven_repo(repo_dir, update_dir, use_make_dir=True):
- maven_lib_info = detect_artifacts(repo_dir)
-
- cwd = os.getcwd()
-
- # Use a temporary working directory.
- working_dir = os.path.join(cwd, 'support_tmp')
- if os.path.exists(working_dir):
- rmtree(working_dir)
- os.mkdir(working_dir)
-
for info in maven_lib_info.values():
- transform_maven_lib(working_dir, info[1], info[2], use_make_dir)
+ transform_maven_lib(working_dir, info[1], info[2])
# Replace the old directory.
- output_dir = os.path.join(cwd, update_dir)
- mv(working_dir, output_dir)
+ output_dir = os.path.join(cwd, support_path)
+ if os.path.exists(output_dir):
+ rmtree(output_dir)
+ os.rename(working_dir, output_dir)
-def transform_maven_lib(working_dir, root, file, use_make_dir):
+def transform_maven_lib(working_dir, root, file):
matcher = artifact_pattern.match(file)
maven_lib_name = matcher.group(1)
maven_lib_vers = matcher.group(2)
@@ -146,7 +128,7 @@
make_lib_name = maven_to_make[maven_lib_name][0]
make_dir_name = maven_to_make[maven_lib_name][1]
artifact_file = os.path.join(root, file)
- target_dir = os.path.join(working_dir, make_dir_name) if use_make_dir else working_dir
+ target_dir = os.path.join(working_dir, make_dir_name)
if not os.path.exists(target_dir):
os.makedirs(target_dir)
@@ -191,54 +173,30 @@
if os.path.exists(file_path):
os.remove(file_path)
-
-def fetch_artifact(target, build_id, artifact_path):
+def fetch_artifact(target, buildId, artifact_path):
print 'Fetching %s from %s...' % (artifact_path, target)
- fetch_cmd = [FETCH_ARTIFACT, '--bid', str(build_id), '--target', target, artifact_path]
+ fetchCmd = [FETCH_ARTIFACT, '--bid', str(buildId), '--target', target, artifact_path]
try:
- subprocess.check_output(fetch_cmd, stderr=subprocess.STDOUT)
+ subprocess.check_output(fetchCmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
- print >> sys.stderr, 'FAIL: Unable to retrieve %s artifact for build ID %d' % (artifact_path, build_id)
+ print >> sys.stderr, 'FAIL: Unable to retrieve %s artifact for build ID %d' % (artifact_path, buildId)
return None
return artifact_path
-def fetch_and_extract(target, build_id, file):
- artifact_path = fetch_artifact(target, build_id, file)
+def update_support(target, buildId):
+ platform = 'darwin' if 'mac' in target else 'linux'
+ artifact_path = fetch_artifact(target, buildId, 'top-of-tree-m2repository-%s.zip' % (buildId))
if not artifact_path:
- return None
+ return
# Unzip the repo archive into a separate directory.
- repo_dir = os.path.basename(artifact_path)[:-4]
+ repoDir = os.path.basename(artifact_path)[:-4]
with zipfile.ZipFile(artifact_path) as zipFile:
- zipFile.extractall(repo_dir)
-
- return repo_dir
-
-
-def update_support(target, build_id):
- repo_file = 'top-of-tree-m2repository-%s.zip' % build_id
- repo_dir = fetch_and_extract(target, build_id, repo_file)
- if not repo_dir:
- print >> sys.stderr, 'Failed to extract Support Library repository'
- return False
+ zipFile.extractall(repoDir)
# Transform the repo archive into a Makefile-compatible format.
- transform_maven_repo(repo_dir, support_dir)
- return True
-
-
-def update_constraint(target, build_id):
- layout_dir = fetch_and_extract(target, build_id, 'com.android.support.constraint-constraint-layout-%s.zip' % build_id)
- solver_dir = fetch_and_extract(target, build_id, 'com.android.support.constraint-constraint-layout-solver-%s.zip' % build_id)
- if not layout_dir or not solver_dir:
- return False
-
- # Passing False here is an inelegant solution, but it means we can replace
- # the top-level directory without worrying about other child directories.
- transform_maven_repo(layout_dir, os.path.join(extras_dir, 'constraint-layout'), False)
- transform_maven_repo(solver_dir, os.path.join(extras_dir, 'constraint-layout-solver'), False)
- return True
+ transform_support(repoDir)
def extract_to(zip_file, paths, filename, parent_path):
@@ -248,12 +206,11 @@
mv(src_path, dst_path)
-def update_sdk_repo(target, build_id):
+def update_sdk_repo(target, buildId):
platform = 'darwin' if 'mac' in target else 'linux'
- artifact_path = fetch_artifact(
- target, build_id, 'sdk-repo-%s-platforms-%s.zip' % (platform, build_id))
+ artifact_path = fetch_artifact(target, buildId, 'sdk-repo-%s-platforms-%s.zip' % (platform, buildId))
if not artifact_path:
- return False
+ return
with zipfile.ZipFile(artifact_path) as zipFile:
paths = zipFile.namelist()
@@ -264,22 +221,14 @@
# Unclear if this is actually necessary.
extract_to(zipFile, paths, 'framework.aidl', system_path)
- return True
-def update_system(target, build_id):
- artifact_path = fetch_artifact(target, build_id, 'android_system.jar')
+def update_system(target, buildId):
+ artifact_path = fetch_artifact(target, buildId, 'android_system.jar')
if not artifact_path:
- return False
+ return
mv(artifact_path, path(system_path, 'android.jar'))
- return True
-
-
-def append(text, more_text):
- if text:
- return "%s, %s" % (text, more_text)
- return more_text
parser = argparse.ArgumentParser(
@@ -289,9 +238,6 @@
type=int,
help='Build server build ID')
parser.add_argument(
- '-c', '--constraint', action="store_true",
- help='If specified, updates only Constraint Layout')
-parser.add_argument(
'-s', '--support', action="store_true",
help='If specified, updates only the Support Library')
parser.add_argument(
@@ -301,9 +247,6 @@
if not args.buildId:
parser.error("You must specify a build ID")
sys.exit(1)
-if not (args.support or args.platform or args.constraint):
- parser.error("You must specify at least one of --constraint, --support, or --platform")
- sys.exit(1)
try:
# Make sure we don't overwrite any pending changes.
@@ -314,33 +257,20 @@
sys.exit(1)
try:
- components = None
- if args.constraint:
- if update_constraint('studio', args.buildId):
- components = append(components, 'Constraint Layout')
- print >> sys.stderr, 'Failed to update Constraint Layout, aborting...'
- else:
- sys.exit(1)
- if args.support:
- if update_support('support_library', args.buildId):
- components = append(components, 'Support Library')
- else:
- print >> sys.stderr, 'Failed to update Support Library, aborting...'
- sys.exit(1)
- if args.platform:
- if update_sdk_repo('sdk_phone_armv7-sdk_mac', args.buildId) \
- and update_system('sdk_phone_armv7-sdk_mac', args.buildId):
- components = append(components, 'platform SDK')
- else:
- print >> sys.stderr, 'Failed to update platform SDK, aborting...'
- sys.exit(1)
+ has_args = args.support or args.platform
+
+ if has_args and args.support:
+ update_support('support_library', args.buildId)
+ if has_args and args.platform:
+ update_sdk_repo('sdk_phone_armv7-sdk_mac', args.buildId)
+ update_system('sdk_phone_armv7-sdk_mac', args.buildId)
# Commit all changes.
subprocess.check_call(['git', 'add', current_path])
subprocess.check_call(['git', 'add', system_path])
- msg = "Import %s from build %s\n\n%s" % (components, args.buildId, flatten(sys.argv))
+ msg = "Import support libs from build %s" % args.buildId
subprocess.check_call(['git', 'commit', '-m', msg])
- print 'Remember to test this change before uploading it to Gerrit!'
+ print 'Be sure to upload this manually to gerrit.'
finally:
# Revert all stray files, including the downloaded zip.
@@ -351,4 +281,4 @@
['git', 'commit', '-m', 'COMMIT TO REVERT - RESET ME!!!'], stdout=bitbucket)
subprocess.check_call(['git', 'reset', '--hard', 'HEAD~1'], stdout=bitbucket)
except subprocess.CalledProcessError:
- print >> sys.stderr, "ERROR: Failed cleaning up, manual cleanup required!!!"
+ print >> sys.stderr, "ERROR: Failed cleaning up, manual cleanup required!!!"
\ No newline at end of file
