commit 0c0dde7171c7ea35bbc6d64a41f94b428cb4d1f6
author Alan Viverette <alanv@google.com> Wed Jul 30 13:29:39 2014 -0700
committer Alan Viverette <alanv@google.com> Wed Jul 30 13:37:35 2014 -0700
tree 44f17649bc950877d054d5ed85dc2378562de39d
parent f660edb25a99282ce86b91804cd0145c1ef54bab

Update switch assets, fix SearchView asset 9-patch areas

BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index a3a99c7..45581db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1123,6 +1123,7 @@
     field public static final int showDividers = 16843561; // 0x1010329
     field public static final int showOnLockScreen = 16843721; // 0x10103c9
     field public static final int showSilent = 16843259; // 0x10101fb
+    field public static final int showText = 16843952; // 0x10104b0
     field public static final int showWeekNumber = 16843582; // 0x101033e
     field public static final int shownWeekCount = 16843585; // 0x1010341
     field public static final int shrinkColumns = 16843082; // 0x101014a
@@ -39379,6 +39380,7 @@
     ctor public Switch(android.content.Context, android.util.AttributeSet);
     ctor public Switch(android.content.Context, android.util.AttributeSet, int);
     ctor public Switch(android.content.Context, android.util.AttributeSet, int, int);
+    method public boolean getShowText();
     method public boolean getSplitTrack();
     method public int getSwitchMinWidth();
     method public int getSwitchPadding();
@@ -39388,6 +39390,7 @@
     method public int getThumbTextPadding();
     method public android.graphics.drawable.Drawable getTrackDrawable();
     method public void onMeasure(int, int);
+    method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
     method public void setSwitchMinWidth(int);
     method public void setSwitchPadding(int);

core/java/android/widget/Switch.java

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 8ea1090..682f2ae 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -100,13 +100,35 @@
     private int mMinFlingVelocity;
 
     private float mThumbPosition;
-    private int mSwitchWidth;
-    private int mSwitchHeight;
-    private int mThumbWidth; // Does not include padding
 
+    /**
+     * Width required to draw the switch track and thumb. Includes padding and
+     * optical bounds for both the track and thumb.
+     */
+    private int mSwitchWidth;
+
+    /**
+     * Height required to draw the switch track and thumb. Includes padding and
+     * optical bounds for both the track and thumb.
+     */
+    private int mSwitchHeight;
+
+    /**
+     * Width of the thumb's content region. Does not include padding or
+     * optical bounds.
+     */
+    private int mThumbWidth;
+
+    /** Left bound for drawing the switch track and thumb. */
     private int mSwitchLeft;
+
+    /** Top bound for drawing the switch track and thumb. */
     private int mSwitchTop;
+
+    /** Right bound for drawing the switch track and thumb. */
     private int mSwitchRight;
+
+    /** Bottom bound for drawing the switch track and thumb. */
     private int mSwitchBottom;
 
     private TextPaint mTextPaint;
@@ -539,7 +561,7 @@
      * Sets whether the on/off text should be displayed.
      *
      * @param showText {@code true} to display on/off text
-     * @hide
+     * @attr ref android.R.styleable#Switch_showText
      */
     public void setShowText(boolean showText) {
         if (mShowText != showText) {
@@ -550,7 +572,7 @@
 
     /**
      * @return whether the on/off text should be displayed
-     * @hide
+     * @attr ref android.R.styleable#Switch_showText
      */
     public boolean getShowText() {
         return mShowText;
@@ -568,8 +590,30 @@
             }
         }
 
-        final int trackHeight;
         final Rect padding = mTempRect;
+        final int thumbWidth;
+        final int thumbHeight;
+        if (mThumbDrawable != null) {
+            // Cached thumb width does not include padding.
+            mThumbDrawable.getPadding(padding);
+            thumbWidth = mThumbDrawable.getIntrinsicWidth() - padding.left - padding.right;
+            thumbHeight = mThumbDrawable.getIntrinsicHeight();
+        } else {
+            thumbWidth = 0;
+            thumbHeight = 0;
+        }
+
+        final int maxTextWidth;
+        if (mShowText) {
+            maxTextWidth = Math.max(mOnLayout.getWidth(), mOffLayout.getWidth())
+                    + mThumbTextPadding * 2;
+        } else {
+            maxTextWidth = 0;
+        }
+
+        mThumbWidth = Math.max(maxTextWidth, thumbWidth);
+
+        final int trackHeight;
         if (mTrackDrawable != null) {
             mTrackDrawable.getPadding(padding);
             trackHeight = mTrackDrawable.getIntrinsicHeight();
@@ -578,22 +622,18 @@
             trackHeight = 0;
         }
 
-        final int thumbWidth;
-        final int thumbHeight;
+        // Adjust left and right padding to ensure there's enough room for the
+        // thumb's padding (when present).
+        int paddingLeft = padding.left;
+        int paddingRight = padding.right;
         if (mThumbDrawable != null) {
-            thumbWidth = mThumbDrawable.getIntrinsicWidth();
-            thumbHeight = mThumbDrawable.getIntrinsicHeight();
-        } else {
-            thumbWidth = 0;
-            thumbHeight = 0;
+            final Insets inset = mThumbDrawable.getOpticalInsets();
+            paddingLeft = Math.max(paddingLeft, inset.left);
+            paddingRight = Math.max(paddingRight, inset.right);
         }
 
-        final int maxTextWidth = mShowText ? Math.max(mOnLayout.getWidth(), mOffLayout.getWidth())
-                + mThumbTextPadding * 2 : 0;
-        mThumbWidth = Math.max(maxTextWidth, thumbWidth);
-
         final int switchWidth = Math.max(mSwitchMinWidth,
-                2 * mThumbWidth + padding.left + padding.right);
+                2 * mThumbWidth + paddingLeft + paddingRight);
         final int switchHeight = Math.max(trackHeight, thumbHeight);
         mSwitchWidth = switchWidth;
         mSwitchHeight = switchHeight;
@@ -806,19 +846,33 @@
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
 
-        int switchRight;
-        int switchLeft;
+        int opticalInsetLeft = 0;
+        int opticalInsetRight = 0;
+        if (mThumbDrawable != null) {
+            final Rect trackPadding = mTempRect;
+            if (mTrackDrawable != null) {
+                mTrackDrawable.getPadding(trackPadding);
+            } else {
+                trackPadding.setEmpty();
+            }
 
-        if (isLayoutRtl()) {
-            switchLeft = getPaddingLeft();
-            switchRight = switchLeft + mSwitchWidth;
-        } else {
-            switchRight = getWidth() - getPaddingRight();
-            switchLeft = switchRight - mSwitchWidth;
+            final Insets insets = mThumbDrawable.getOpticalInsets();
+            opticalInsetLeft = Math.max(0, insets.left - trackPadding.left);
+            opticalInsetRight = Math.max(0, insets.right - trackPadding.right);
         }
 
-        int switchTop = 0;
-        int switchBottom = 0;
+        final int switchRight;
+        final int switchLeft;
+        if (isLayoutRtl()) {
+            switchLeft = getPaddingLeft() + opticalInsetLeft;
+            switchRight = switchLeft + mSwitchWidth - opticalInsetLeft - opticalInsetRight;
+        } else {
+            switchRight = getWidth() - getPaddingRight() - opticalInsetRight;
+            switchLeft = switchRight - mSwitchWidth + opticalInsetLeft + opticalInsetRight;
+        }
+
+        final int switchTop;
+        final int switchBottom;
         switch (getGravity() & Gravity.VERTICAL_GRAVITY_MASK) {
             default:
             case Gravity.TOP:
@@ -847,27 +901,55 @@
     @Override
     public void draw(Canvas c) {
         final Rect padding = mTempRect;
-
-        // Layout the track.
         final int switchLeft = mSwitchLeft;
         final int switchTop = mSwitchTop;
         final int switchRight = mSwitchRight;
         final int switchBottom = mSwitchBottom;
-        if (mTrackDrawable != null) {
-            mTrackDrawable.setBounds(switchLeft, switchTop, switchRight, switchBottom);
-            mTrackDrawable.getPadding(padding);
+
+        int thumbInitialLeft = switchLeft + getThumbOffset();
+
+        final Insets thumbInsets;
+        if (mThumbDrawable != null) {
+            thumbInsets = mThumbDrawable.getOpticalInsets();
+        } else {
+            thumbInsets = Insets.NONE;
         }
 
-        final int switchInnerLeft = switchLeft + padding.left;
+        // Layout the track.
+        if (mTrackDrawable != null) {
+            mTrackDrawable.getPadding(padding);
 
-        // Relies on mTempRect, MUST be called first!
-        final int thumbPos = getThumbOffset();
+            // Adjust thumb position for track padding.
+            thumbInitialLeft += padding.left;
+
+            // If necessary, offset by the optical insets of the thumb asset.
+            int trackLeft = switchLeft;
+            int trackTop = switchTop;
+            int trackRight = switchRight;
+            int trackBottom = switchBottom;
+            if (thumbInsets != Insets.NONE) {
+                if (thumbInsets.left > padding.left) {
+                    trackLeft += thumbInsets.left - padding.left;
+                }
+                if (thumbInsets.top > padding.top) {
+                    trackTop += thumbInsets.top - padding.top;
+                }
+                if (thumbInsets.right > padding.right) {
+                    trackRight -= thumbInsets.right - padding.right;
+                }
+                if (thumbInsets.bottom > padding.bottom) {
+                    trackBottom -= thumbInsets.bottom - padding.bottom;
+                }
+            }
+            mTrackDrawable.setBounds(trackLeft, trackTop, trackRight, trackBottom);
+        }
 
         // Layout the thumb.
         if (mThumbDrawable != null) {
             mThumbDrawable.getPadding(padding);
-            final int thumbLeft = switchInnerLeft - padding.left + thumbPos;
-            final int thumbRight = switchInnerLeft + thumbPos + mThumbWidth + padding.right;
+
+            final int thumbLeft = thumbInitialLeft - padding.left;
+            final int thumbRight = thumbInitialLeft + mThumbWidth + padding.right;
             mThumbDrawable.setBounds(thumbLeft, switchTop, thumbRight, switchBottom);
 
             final Drawable background = getBackground();
@@ -894,9 +976,7 @@
 
         final int switchTop = mSwitchTop;
         final int switchBottom = mSwitchBottom;
-        final int switchInnerLeft = mSwitchLeft + padding.left;
         final int switchInnerTop = switchTop + padding.top;
-        final int switchInnerRight = mSwitchRight - padding.right;
         final int switchInnerBottom = switchBottom - padding.bottom;
 
         final Drawable thumbDrawable = mThumbDrawable;
@@ -919,7 +999,6 @@
         final int saveCount = canvas.save();
 
         if (thumbDrawable != null) {
-            canvas.clipRect(switchInnerLeft, switchTop, switchInnerRight, switchBottom);
             thumbDrawable.draw(canvas);
         }
 
@@ -974,7 +1053,7 @@
 
     /**
      * Translates thumb position to offset according to current RTL setting and
-     * thumb scroll range.
+     * thumb scroll range. Accounts for both track and thumb padding.
      *
      * @return thumb offset
      */
@@ -990,8 +1069,18 @@
 
     private int getThumbScrollRange() {
         if (mTrackDrawable != null) {
-            mTrackDrawable.getPadding(mTempRect);
-            return mSwitchWidth - mThumbWidth - mTempRect.left - mTempRect.right;
+            final Rect padding = mTempRect;
+            mTrackDrawable.getPadding(padding);
+
+            final Insets insets;
+            if (mThumbDrawable != null) {
+                insets = mThumbDrawable.getOpticalInsets();
+            } else {
+                insets = Insets.NONE;
+            }
+
+            return mSwitchWidth - mThumbWidth - padding.left - padding.right
+                    - insets.left - insets.right;
         } else {
             return 0;
         }

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_000.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_000.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_000.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png
new file mode 100644
index 0000000..9076900
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png
new file mode 100644
index 0000000..3c72bf8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png
new file mode 100644
index 0000000..d31e113
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png
new file mode 100644
index 0000000..d0c693e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png
new file mode 100644
index 0000000..dfa19b4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png
new file mode 100644
index 0000000..151f205
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png
new file mode 100644
index 0000000..ad3ee2c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png
new file mode 100644
index 0000000..43d66d7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png
new file mode 100644
index 0000000..13e4f8b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png
new file mode 100644
index 0000000..a09b6b2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png
new file mode 100644
index 0000000..be02e53
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png
new file mode 100644
index 0000000..655d387
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_001.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_001.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_001.png
deleted file mode 100644
index e062f61..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_002.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_002.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_002.png
deleted file mode 100644
index 7737646..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_003.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_003.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_003.png
deleted file mode 100644
index 65ff45e..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_004.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_004.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_004.png
deleted file mode 100644
index 11aaec0..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_005.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_005.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_005.png
deleted file mode 100644
index 9e1b60f..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_006.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_006.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_006.png
deleted file mode 100644
index 1e45687..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_007.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_007.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_007.png
deleted file mode 100644
index 1e45687..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_008.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_008.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_008.png
deleted file mode 100644
index 6c48456..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_009.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_009.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_009.png
deleted file mode 100644
index a4d084b..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_010.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_010.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_010.png
deleted file mode 100644
index 1e1a1b0..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_011.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_011.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_011.png
deleted file mode 100644
index 1e1a1b0..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_012.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_012.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_012.png
deleted file mode 100644
index 1e1a1b0..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_013.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_013.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_013.png
deleted file mode 100644
index 1e1a1b0..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_014.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_014.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_014.png
deleted file mode 100644
index 1e1a1b0..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_000.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_000.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_000.png
deleted file mode 100644
index cf09f97..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png
new file mode 100644
index 0000000..e870a0a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png
new file mode 100644
index 0000000..1d8f805
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png
new file mode 100644
index 0000000..d348871
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png
new file mode 100644
index 0000000..941e91e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png
new file mode 100644
index 0000000..adee78d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png
new file mode 100644
index 0000000..e6b4ca3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png
new file mode 100644
index 0000000..6c2bc0d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png
new file mode 100644
index 0000000..763833c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png
new file mode 100644
index 0000000..9a87fbc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png
new file mode 100644
index 0000000..6ccf70b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png
new file mode 100644
index 0000000..d1c14a5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png
new file mode 100644
index 0000000..c2290f0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_001.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_001.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_001.png
deleted file mode 100644
index 3218e66..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_002.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_002.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_002.png
deleted file mode 100644
index 0acff03..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_003.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_003.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_003.png
deleted file mode 100644
index c93adf4..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_004.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_004.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_004.png
deleted file mode 100644
index 5d8ddc96..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_005.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_005.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_005.png
deleted file mode 100644
index 47206a4..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_006.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_006.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_006.png
deleted file mode 100644
index 7d6a91f..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_007.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_007.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_007.png
deleted file mode 100644
index e062f61..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_008.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_008.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_008.png
deleted file mode 100644
index b0f0dde..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_009.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_009.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_009.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_010.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_010.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_010.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_011.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_011.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_011.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_012.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_012.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_012.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_013.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_013.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_013.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_014.png

diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_014.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_014.png
deleted file mode 100644
index c54f8d7..0000000
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png

diff --git a/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png
index ac1fc23..0ebe65e 100644
--- a/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png
+++ b/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_000.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_000.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_000.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png
new file mode 100644
index 0000000..0238898
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png
new file mode 100644
index 0000000..ada1be9
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png
new file mode 100644
index 0000000..82aec64
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png
new file mode 100644
index 0000000..1c6ea9f
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png
new file mode 100644
index 0000000..ac11400
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png
new file mode 100644
index 0000000..2025972
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png
new file mode 100644
index 0000000..7420fd8
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png
new file mode 100644
index 0000000..1f40832
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png
new file mode 100644
index 0000000..cf58e44
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png
new file mode 100644
index 0000000..930a280
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png
new file mode 100644
index 0000000..ed9bc37
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png
new file mode 100644
index 0000000..cddb5b0
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_001.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_001.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_001.png
deleted file mode 100644
index 3617168..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_002.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_002.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_002.png
deleted file mode 100644
index e4366f4..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_003.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_003.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_003.png
deleted file mode 100644
index ea4533b..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_004.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_004.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_004.png
deleted file mode 100644
index 94aedbb..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_005.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_005.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_005.png
deleted file mode 100644
index ef84578..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_006.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_006.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_006.png
deleted file mode 100644
index 4de2321..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_007.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_007.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_007.png
deleted file mode 100644
index 4de2321..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_008.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_008.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_008.png
deleted file mode 100644
index d62fbd5..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_009.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_009.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_009.png
deleted file mode 100644
index 3d87c4e..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_010.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_010.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_010.png
deleted file mode 100644
index 536ed46..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_011.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_011.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_011.png
deleted file mode 100644
index 536ed46..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_012.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_012.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_012.png
deleted file mode 100644
index 536ed46..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_013.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_013.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_013.png
deleted file mode 100644
index 536ed46..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_014.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_014.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_014.png
deleted file mode 100644
index 536ed46..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_000.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_000.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_000.png
deleted file mode 100644
index f5b660d..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png
new file mode 100644
index 0000000..bc1f979
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png
new file mode 100644
index 0000000..e6fdbcc
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png
new file mode 100644
index 0000000..3d60b43
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png
new file mode 100644
index 0000000..b9afdc2
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png
new file mode 100644
index 0000000..c3c8bf2
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png
new file mode 100644
index 0000000..1c7e5e1
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png
new file mode 100644
index 0000000..6329b73
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png
new file mode 100644
index 0000000..424202c
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png
new file mode 100644
index 0000000..313beca
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png
new file mode 100644
index 0000000..f18d86a
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png
new file mode 100644
index 0000000..8ab48c0
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png
new file mode 100644
index 0000000..fbc2c16
--- /dev/null
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_001.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_001.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_001.png
deleted file mode 100644
index 9e4db6c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_002.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_002.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_002.png
deleted file mode 100644
index 7de2128..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_003.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_003.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_003.png
deleted file mode 100644
index 1980c2c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_004.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_004.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_004.png
deleted file mode 100644
index 6e73ef0..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_005.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_005.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_005.png
deleted file mode 100644
index f897392..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_006.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_006.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_006.png
deleted file mode 100644
index 74a6ebd..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_007.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_007.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_007.png
deleted file mode 100644
index 3617168..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_008.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_008.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_008.png
deleted file mode 100644
index 884eb66..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_009.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_009.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_009.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_010.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_010.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_010.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_011.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_011.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_011.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_012.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_012.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_012.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_013.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_013.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_013.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_014.png

diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_014.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_014.png
deleted file mode 100644
index 8c3f26c..0000000
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-mdpi/switch_track_mtrl_alpha.9.png

diff --git a/core/res/res/drawable-mdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/switch_track_mtrl_alpha.9.png
index b6538e4..4918d33 100644
--- a/core/res/res/drawable-mdpi/switch_track_mtrl_alpha.9.png
+++ b/core/res/res/drawable-mdpi/switch_track_mtrl_alpha.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_000.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_000.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_000.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png
new file mode 100644
index 0000000..265aeb7
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png
new file mode 100644
index 0000000..2f036ad
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png
new file mode 100644
index 0000000..bb26440
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png
new file mode 100644
index 0000000..1b70047
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png
new file mode 100644
index 0000000..b544b98
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png
new file mode 100644
index 0000000..c461f3d
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png
new file mode 100644
index 0000000..f57da14
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png
new file mode 100644
index 0000000..22c6fbc
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png
new file mode 100644
index 0000000..cd21ac9
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png
new file mode 100644
index 0000000..a38dc87
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png
new file mode 100644
index 0000000..d84a342
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png
new file mode 100644
index 0000000..b82a2eb
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_001.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_001.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_001.png
deleted file mode 100644
index 7bd99fe..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_002.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_002.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_002.png
deleted file mode 100644
index 2ef623b..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_003.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_003.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_003.png
deleted file mode 100644
index 19db3e0..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_004.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_004.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_004.png
deleted file mode 100644
index 984c3c5..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_005.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_005.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_005.png
deleted file mode 100644
index 6454190..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_006.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_006.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_006.png
deleted file mode 100644
index cee9393..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_007.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_007.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_007.png
deleted file mode 100644
index cee9393..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_008.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_008.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_008.png
deleted file mode 100644
index 437ffdd..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_009.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_009.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_009.png
deleted file mode 100644
index d2e14ad..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_010.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_010.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_010.png
deleted file mode 100644
index 4e2f5bc..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_011.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_011.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_011.png
deleted file mode 100644
index 4e2f5bc..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_012.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_012.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_012.png
deleted file mode 100644
index 4e2f5bc..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_013.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_013.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_013.png
deleted file mode 100644
index 4e2f5bc..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_014.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_014.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_014.png
deleted file mode 100644
index 4e2f5bc..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_000.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_000.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_000.png
deleted file mode 100644
index f1bcfa3..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png
new file mode 100644
index 0000000..6a33ebf
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png
new file mode 100644
index 0000000..dafc250
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png
new file mode 100644
index 0000000..27df6ff
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png
new file mode 100644
index 0000000..cb4121c
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png
new file mode 100644
index 0000000..c5cbb75
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png
new file mode 100644
index 0000000..c69ef41
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png
new file mode 100644
index 0000000..aff03d1
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png
new file mode 100644
index 0000000..fb56ae6
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png
new file mode 100644
index 0000000..88b9d28
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png
new file mode 100644
index 0000000..8451958
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png
new file mode 100644
index 0000000..6f57654
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png
new file mode 100644
index 0000000..21bfc28
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_001.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_001.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_001.png
deleted file mode 100644
index ede2fec..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_002.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_002.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_002.png
deleted file mode 100644
index 94ce017..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_003.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_003.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_003.png
deleted file mode 100644
index 647cfe3..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_004.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_004.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_004.png
deleted file mode 100644
index b3bf923..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_005.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_005.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_005.png
deleted file mode 100644
index ae95b2b..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_006.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_006.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_006.png
deleted file mode 100644
index b8e4bd6..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_007.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_007.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_007.png
deleted file mode 100644
index ec6d6d7..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_008.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_008.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_008.png
deleted file mode 100644
index c0e493f..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_009.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_009.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_009.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_010.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_010.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_010.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_011.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_011.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_011.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_012.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_012.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_012.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_013.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_013.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_013.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_014.png

diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_014.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_014.png
deleted file mode 100644
index 2494fd4..0000000
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xhdpi/switch_track_mtrl_alpha.9.png

diff --git a/core/res/res/drawable-xhdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/switch_track_mtrl_alpha.9.png
index d6a0ab2..fd47f15 100644
--- a/core/res/res/drawable-xhdpi/switch_track_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xhdpi/switch_track_mtrl_alpha.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_000.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_000.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_000.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png
new file mode 100644
index 0000000..c30cb5a
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png
new file mode 100644
index 0000000..eaba558
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png
new file mode 100644
index 0000000..17c18c9
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png
new file mode 100644
index 0000000..0fce07a
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png
new file mode 100644
index 0000000..c29b837
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png
new file mode 100644
index 0000000..ae56a41
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png
new file mode 100644
index 0000000..85290ac
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png
new file mode 100644
index 0000000..1e8513b
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png
new file mode 100644
index 0000000..8810a12
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png
new file mode 100644
index 0000000..717207f
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png
new file mode 100644
index 0000000..db046f3
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png
new file mode 100644
index 0000000..c5c07a4
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_001.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_001.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_001.png
deleted file mode 100644
index eff3dd0..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_002.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_002.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_002.png
deleted file mode 100644
index 000a23a..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_003.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_003.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_003.png
deleted file mode 100644
index 394d661..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_004.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_004.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_004.png
deleted file mode 100644
index 4e7311d..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_005.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_005.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_005.png
deleted file mode 100644
index d9dcf91..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_006.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_006.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_006.png
deleted file mode 100644
index 674142e..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_007.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_007.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_007.png
deleted file mode 100644
index 674142e..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_008.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_008.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_008.png
deleted file mode 100644
index 9d4026a..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_009.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_009.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_009.png
deleted file mode 100644
index bb4b426..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_010.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_010.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_010.png
deleted file mode 100644
index a37076d..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_011.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_011.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_011.png
deleted file mode 100644
index a37076d..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_012.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_012.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_012.png
deleted file mode 100644
index a37076d..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_013.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_013.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_013.png
deleted file mode 100644
index a37076d..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_014.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_014.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_014.png
deleted file mode 100644
index a37076d..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_000.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_000.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_000.png
deleted file mode 100644
index 22e9951..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png
new file mode 100644
index 0000000..c9bdf1f
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png
new file mode 100644
index 0000000..6bfd943
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png
new file mode 100644
index 0000000..a1d3fbb
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png
new file mode 100644
index 0000000..40c3a5b
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png
new file mode 100644
index 0000000..26b8736
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png
new file mode 100644
index 0000000..88c027e
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png
new file mode 100644
index 0000000..02567c6
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png
new file mode 100644
index 0000000..037d3bf
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png
new file mode 100644
index 0000000..0252769
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png
new file mode 100644
index 0000000..3ae501d
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png
new file mode 100644
index 0000000..ecf2831
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png
new file mode 100644
index 0000000..0877749
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_001.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_001.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_001.png
deleted file mode 100644
index 14e6b39..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_002.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_002.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_002.png
deleted file mode 100644
index 86b2c01..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_003.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_003.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_003.png
deleted file mode 100644
index 1c565df..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_004.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_004.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_004.png
deleted file mode 100644
index b825449..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_005.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_005.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_005.png
deleted file mode 100644
index 170c234..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_006.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_006.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_006.png
deleted file mode 100644
index 5477007..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_007.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_007.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_007.png
deleted file mode 100644
index eff3dd0..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_008.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_008.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_008.png
deleted file mode 100644
index e3fd96a..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_009.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_009.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_009.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_010.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_010.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_010.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_011.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_011.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_011.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_012.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_012.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_012.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_013.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_013.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_013.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_014.png

diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_014.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_014.png
deleted file mode 100644
index 198ac07..0000000
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxhdpi/switch_track_mtrl_alpha.9.png

diff --git a/core/res/res/drawable-xxhdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/switch_track_mtrl_alpha.9.png
index a8067cb..3e3174d 100644
--- a/core/res/res/drawable-xxhdpi/switch_track_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xxhdpi/switch_track_mtrl_alpha.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_000.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_000.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_000.png
deleted file mode 100644
index 8b202c6..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png
new file mode 100644
index 0000000..bc21279
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png
new file mode 100644
index 0000000..b57b592
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png
new file mode 100644
index 0000000..0fb9277
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png
new file mode 100644
index 0000000..340722d
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png
new file mode 100644
index 0000000..8554a76
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png
new file mode 100644
index 0000000..a05e335
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png
new file mode 100644
index 0000000..a5ded14
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png
new file mode 100644
index 0000000..0300a49
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png
new file mode 100644
index 0000000..37dd7ce
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png
new file mode 100644
index 0000000..6bc549a
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png
new file mode 100644
index 0000000..b026d5d
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png
new file mode 100644
index 0000000..89238dc
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_001.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_001.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_001.png
deleted file mode 100644
index 3b497f3..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_002.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_002.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_002.png
deleted file mode 100644
index 532b6de..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_003.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_003.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_003.png
deleted file mode 100644
index 403b2fe..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_004.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_004.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_004.png
deleted file mode 100644
index 8c5086c..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_005.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_005.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_005.png
deleted file mode 100644
index d4870f8..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_006.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_006.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_006.png
deleted file mode 100644
index c05adf5..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_007.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_007.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_007.png
deleted file mode 100644
index 99b2056..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_008.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_008.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_008.png
deleted file mode 100644
index d839358..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_009.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_009.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_009.png
deleted file mode 100644
index 913f94d..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_010.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_010.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_010.png
deleted file mode 100644
index 7f325b3..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_011.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_011.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_011.png
deleted file mode 100644
index 149a9aa..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_012.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_012.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_012.png
deleted file mode 100644
index 95c219e..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_013.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_013.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_013.png
deleted file mode 100644
index 462a128d..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_014.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_014.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_014.png
deleted file mode 100644
index 5911d16..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_000.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_000.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_000.png
deleted file mode 100644
index e0c6d85..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_000.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png
new file mode 100644
index 0000000..1d309fe
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png
new file mode 100644
index 0000000..2e58fa9
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png
new file mode 100644
index 0000000..2ebe7a7
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png
new file mode 100644
index 0000000..04bab76
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png
new file mode 100644
index 0000000..3497e48
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png
new file mode 100644
index 0000000..42333b4
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png
new file mode 100644
index 0000000..732e175
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png
new file mode 100644
index 0000000..12eddd8
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png
new file mode 100644
index 0000000..95cbc61
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png
new file mode 100644
index 0000000..105ec07
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png
new file mode 100644
index 0000000..fac253a
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png
new file mode 100644
index 0000000..1b8d11c
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_001.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_001.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_001.png
deleted file mode 100644
index 5679943..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_001.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_002.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_002.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_002.png
deleted file mode 100644
index 54b636d..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_002.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_003.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_003.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_003.png
deleted file mode 100644
index bf9fac0..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_003.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_004.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_004.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_004.png
deleted file mode 100644
index 25d5319..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_004.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_005.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_005.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_005.png
deleted file mode 100644
index d2df595..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_005.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_006.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_006.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_006.png
deleted file mode 100644
index 7700bde..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_006.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_007.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_007.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_007.png
deleted file mode 100644
index 883f98b..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_007.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_008.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_008.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_008.png
deleted file mode 100644
index b3b2108..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_008.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_009.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_009.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_009.png
deleted file mode 100644
index 3aad596..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_009.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_010.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_010.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_010.png
deleted file mode 100644
index 2017e17..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_010.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_011.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_011.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_011.png
deleted file mode 100644
index 1fc2700..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_011.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_012.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_012.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_012.png
deleted file mode 100644
index bb8b0f2..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_012.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_013.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_013.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_013.png
deleted file mode 100644
index 66ab8f6..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_013.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_014.png

diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_014.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_014.png
deleted file mode 100644
index e3424db..0000000
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_014.png
+++ /dev/null
Binary files differ

core/res/res/drawable-xxxhdpi/switch_track_mtrl_alpha.9.png

diff --git a/core/res/res/drawable-xxxhdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/switch_track_mtrl_alpha.9.png
index fb07f2a..1e4a74c 100644
--- a/core/res/res/drawable-xxxhdpi/switch_track_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xxxhdpi/switch_track_mtrl_alpha.9.png
Binary files differ

core/res/res/drawable/switch_thumb_material_anim.xml

diff --git a/core/res/res/drawable/switch_thumb_material_anim.xml b/core/res/res/drawable/switch_thumb_material_anim.xml
index 67e460a..71f6cfd 100644
--- a/core/res/res/drawable/switch_thumb_material_anim.xml
+++ b/core/res/res/drawable/switch_thumb_material_anim.xml
@@ -19,130 +19,116 @@
     <item
         android:state_enabled="false"
         android:state_checked="true">
-        <bitmap
-            android:src="@drawable/btn_switch_to_on_mtrl_014"
+        <nine-patch
+            android:src="@drawable/btn_switch_to_on_mtrl_00012"
             android:gravity="center"
+            android:tintMode="multiply"
             android:tint="?attr/colorControlActivated"
             android:alpha="?attr/disabledAlpha" />
     </item>
     <item android:state_enabled="false">
-        <bitmap
-            android:src="@drawable/btn_switch_to_on_mtrl_000"
+        <nine-patch
+            android:src="@drawable/btn_switch_to_on_mtrl_00001"
             android:gravity="center"
-            android:tint="?attr/colorControlNormal"
+            android:tintMode="multiply"
+            android:tint="?attr/colorButtonNormal"
             android:alpha="?attr/disabledAlpha" />
     </item>
     <item
         android:state_checked="true"
         android:id="@+id/on">
-        <bitmap
-            android:src="@drawable/btn_switch_to_on_mtrl_014"
+        <nine-patch
+            android:src="@drawable/btn_switch_to_on_mtrl_00012"
             android:gravity="center"
+            android:tintMode="multiply"
             android:tint="?attr/colorControlActivated" />
     </item>
     <item android:id="@+id/off">
-        <bitmap
-            android:src="@drawable/btn_switch_to_on_mtrl_000"
+        <nine-patch
+            android:src="@drawable/btn_switch_to_on_mtrl_00001"
             android:gravity="center"
-            android:tint="?attr/colorControlNormal" />
+            android:tintMode="multiply"
+            android:tint="?attr/colorButtonNormal" />
     </item>
     <transition
         android:fromId="@+id/off"
         android:toId="@+id/on">
         <animation-list>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_000" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00001" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_001" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00002" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_002" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00003" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_003" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00004" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_004" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00005" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_005" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_006" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_007" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00008" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_008" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00009" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_009" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00010" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_010" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00011" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_011" android:gravity="center" android:tint="?attr/colorControlActivated" />
-            </item>
-            <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_012" android:gravity="center" android:tint="?attr/colorControlActivated" />
-            </item>
-            <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_013" android:gravity="center" android:tint="?attr/colorControlActivated" />
-            </item>
-            <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_014" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00012" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
         </animation-list>
     </transition>
     <transition android:fromId="@+id/on" android:toId="@+id/off">
         <animation-list>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_000" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00001" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_001" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00002" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_002" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00003" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_003" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00004" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_004" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00005" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_005" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_006" android:gravity="center" android:tint="?attr/colorControlActivated" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_007" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00008" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_008" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00009" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_009" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00010" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_010" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00011" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
             <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_011" android:gravity="center" android:tint="?attr/colorControlNormal" />
-            </item>
-            <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_012" android:gravity="center" android:tint="?attr/colorControlNormal" />
-            </item>
-            <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_013" android:gravity="center" android:tint="?attr/colorControlNormal" />
-            </item>
-            <item android:duration="15">
-                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_014" android:gravity="center" android:tint="?attr/colorControlNormal" />
+                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00012" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />
             </item>
         </animation-list>
     </transition>

core/res/res/drawable/switch_track_material.xml

diff --git a/core/res/res/drawable/switch_track_material.xml b/core/res/res/drawable/switch_track_material.xml
index 6ca2489..b400644 100644
--- a/core/res/res/drawable/switch_track_material.xml
+++ b/core/res/res/drawable/switch_track_material.xml
@@ -18,19 +18,21 @@
     <item android:state_enabled="false" android:state_checked="true">
         <nine-patch android:src="@drawable/switch_track_mtrl_alpha"
             android:tint="?attr/colorControlActivated"
-            android:alpha="?attr/disabledAlpha" />
+            android:alpha="0.15" />
     </item>
     <item android:state_enabled="false">
         <nine-patch android:src="@drawable/switch_track_mtrl_alpha"
-            android:tint="?attr/colorControlNormal"
-            android:alpha="?attr/disabledAlpha" />
+            android:tint="?attr/colorButtonNormal"
+            android:alpha="0.15" />
     </item>
     <item android:state_checked="true">
         <nine-patch android:src="@drawable/switch_track_mtrl_alpha"
-            android:tint="?attr/colorControlActivated" />
+            android:tint="?attr/colorControlActivated"
+            android:alpha="0.3" />
     </item>
     <item>
         <nine-patch android:src="@drawable/switch_track_mtrl_alpha"
-            android:tint="?attr/colorControlNormal" />
+            android:tint="?attr/colorButtonNormal"
+            android:alpha="0.3" />
     </item>
 </selector>

core/res/res/values/arrays.xml

diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index 1af4d10..327782d 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -368,36 +368,30 @@
        <item>@drawable/btn_rating_star_off_mtrl_alpha</item>
        <item>@drawable/btn_rating_star_on_mtrl_alpha</item>
        <item>@drawable/btn_star_mtrl_alpha</item>
-       <item>@drawable/btn_switch_to_off_mtrl_000</item>
-       <item>@drawable/btn_switch_to_off_mtrl_001</item>
-       <item>@drawable/btn_switch_to_off_mtrl_002</item>
-       <item>@drawable/btn_switch_to_off_mtrl_003</item>
-       <item>@drawable/btn_switch_to_off_mtrl_004</item>
-       <item>@drawable/btn_switch_to_off_mtrl_005</item>
-       <item>@drawable/btn_switch_to_off_mtrl_006</item>
-       <item>@drawable/btn_switch_to_off_mtrl_007</item>
-       <item>@drawable/btn_switch_to_off_mtrl_008</item>
-       <item>@drawable/btn_switch_to_off_mtrl_009</item>
-       <item>@drawable/btn_switch_to_off_mtrl_010</item>
-       <item>@drawable/btn_switch_to_off_mtrl_011</item>
-       <item>@drawable/btn_switch_to_off_mtrl_012</item>
-       <item>@drawable/btn_switch_to_off_mtrl_013</item>
-       <item>@drawable/btn_switch_to_off_mtrl_014</item>
-       <item>@drawable/btn_switch_to_on_mtrl_000</item>
-       <item>@drawable/btn_switch_to_on_mtrl_001</item>
-       <item>@drawable/btn_switch_to_on_mtrl_002</item>
-       <item>@drawable/btn_switch_to_on_mtrl_003</item>
-       <item>@drawable/btn_switch_to_on_mtrl_004</item>
-       <item>@drawable/btn_switch_to_on_mtrl_005</item>
-       <item>@drawable/btn_switch_to_on_mtrl_006</item>
-       <item>@drawable/btn_switch_to_on_mtrl_007</item>
-       <item>@drawable/btn_switch_to_on_mtrl_008</item>
-       <item>@drawable/btn_switch_to_on_mtrl_009</item>
-       <item>@drawable/btn_switch_to_on_mtrl_010</item>
-       <item>@drawable/btn_switch_to_on_mtrl_011</item>
-       <item>@drawable/btn_switch_to_on_mtrl_012</item>
-       <item>@drawable/btn_switch_to_on_mtrl_013</item>
-       <item>@drawable/btn_switch_to_on_mtrl_014</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00001</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00002</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00003</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00004</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00005</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00006</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00007</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00008</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00009</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00010</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00011</item>
+       <item>@drawable/btn_switch_to_off_mtrl_00012</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00001</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00002</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00003</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00004</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00005</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00006</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00007</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00008</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00009</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00010</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00011</item>
+       <item>@drawable/btn_switch_to_on_mtrl_00012</item>
        <item>@drawable/btn_toggle_indicator_mtrl_alpha</item>
        <item>@drawable/expander_close_mtrl_alpha</item>
        <item>@drawable/expander_open_mtrl_alpha</item>

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 9acd4a6..0cb14e3 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2264,6 +2264,7 @@
   <public type="attr" name="toolbarStyle" />
   <public type="attr" name="windowClipToOutline" />
   <public type="attr" name="datePickerDialogTheme" />
+  <public type="attr" name="showText" />
 
   <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />
 

core/res/res/values/styles_material.xml

diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 61dff1b..9ee377f 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -537,12 +537,9 @@
     <style name="Widget.Material.CompoundButton.Switch">
         <item name="track">@drawable/switch_track_material</item>
         <item name="thumb">@drawable/switch_thumb_material_anim</item>
-        <item name="splitTrack">true</item>
         <item name="switchTextAppearance">@style/TextAppearance.Material.Widget.Switch</item>
         <item name="textOn">@string/capital_on</item>
         <item name="textOff">@string/capital_off</item>
-        <item name="switchMinWidth">4dip</item>
-        <item name="switchPadding">4dip</item>
         <item name="background">?attr/selectableItemBackgroundBorderless</item>
         <item name="showText">false</item>
     </style>

graphics/java/android/graphics/drawable/NinePatchDrawable.java

diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index 241ec65..6afce41 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -245,9 +245,8 @@
 
         final int restoreAlpha;
         if (mNinePatchState.mBaseAlpha != 1.0f) {
-            final Paint p = getPaint();
-            restoreAlpha = p.getAlpha();
-            p.setAlpha((int) (restoreAlpha * mNinePatchState.mBaseAlpha + 0.5f));
+            restoreAlpha = mPaint.getAlpha();
+            mPaint.setAlpha((int) (restoreAlpha * mNinePatchState.mBaseAlpha + 0.5f));
         } else {
             restoreAlpha = -1;
         }
@@ -445,6 +444,16 @@
             // Hey, now might be a good time to actually load optical bounds!
             bitmap.getOpticalInsets(opticalInsets);
 
+            // Sanity check for valid padding when we have optical insets.
+            if (padding.left < opticalInsets.left) {
+                padding.left = opticalInsets.left;
+                padding.right = opticalInsets.right;
+            }
+            if (padding.top < opticalInsets.top) {
+                padding.top = opticalInsets.top;
+                padding.bottom = opticalInsets.bottom;
+            }
+
             state.mNinePatch = new NinePatch(bitmap, bitmap.getNinePatchChunk());
             state.mPadding = padding;
             state.mOpticalInsets = Insets.of(opticalInsets);
@@ -611,6 +620,16 @@
             mOpticalInsets = Insets.of(opticalInsets);
             mDither = dither;
             mAutoMirrored = autoMirror;
+
+            // Sanity check for valid padding when we have optical insets.
+            if (mPadding.left < mOpticalInsets.left) {
+                mPadding.left = mOpticalInsets.left;
+                mPadding.right = mOpticalInsets.right;
+            }
+            if (mPadding.top < mOpticalInsets.top) {
+                mPadding.top = mOpticalInsets.top;
+                mPadding.bottom = mOpticalInsets.bottom;
+            }
         }
 
         // Copy constructor