diff options
| author | 2014-07-30 02:39:07 +0000 | |
|---|---|---|
| committer | 2014-07-30 02:39:07 +0000 | |
| commit | 9b38f6c2cd1d97bb0d1a21e2f9545e02fae851e0 (patch) | |
| tree | c9a8856f89705603de49e4b8fbc118a6e5eb8153 | |
| parent | 8bb399069da4e46b231333cff6880a0cf35b9417 (diff) | |
Revert "Update switch assets, fix SearchView asset 9-patch areas"
Missing updated current.txt
This reverts commit dbf6b0d68a3d502430d061cd14f03f344b50f019.
Change-Id: I70846883f56be661fa89f9eaf20f5d103f2833c6
281 files changed, 132 insertions, 219 deletions
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 682f2ae1f311..8ea1090e792b 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -100,35 +100,13 @@ public class Switch extends CompoundButton { private int mMinFlingVelocity; private float mThumbPosition; - - /** - * 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; + private int mThumbWidth; // Does not include padding - /** - * 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; @@ -561,7 +539,7 @@ public class Switch extends CompoundButton { * Sets whether the on/off text should be displayed. * * @param showText {@code true} to display on/off text - * @attr ref android.R.styleable#Switch_showText + * @hide */ public void setShowText(boolean showText) { if (mShowText != showText) { @@ -572,7 +550,7 @@ public class Switch extends CompoundButton { /** * @return whether the on/off text should be displayed - * @attr ref android.R.styleable#Switch_showText + * @hide */ public boolean getShowText() { return mShowText; @@ -590,30 +568,8 @@ public class Switch extends CompoundButton { } } - 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; + final Rect padding = mTempRect; if (mTrackDrawable != null) { mTrackDrawable.getPadding(padding); trackHeight = mTrackDrawable.getIntrinsicHeight(); @@ -622,18 +578,22 @@ public class Switch extends CompoundButton { trackHeight = 0; } - // 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; + final int thumbWidth; + final int thumbHeight; if (mThumbDrawable != null) { - final Insets inset = mThumbDrawable.getOpticalInsets(); - paddingLeft = Math.max(paddingLeft, inset.left); - paddingRight = Math.max(paddingRight, inset.right); + thumbWidth = mThumbDrawable.getIntrinsicWidth(); + thumbHeight = mThumbDrawable.getIntrinsicHeight(); + } else { + thumbWidth = 0; + thumbHeight = 0; } + 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 + paddingLeft + paddingRight); + 2 * mThumbWidth + padding.left + padding.right); final int switchHeight = Math.max(trackHeight, thumbHeight); mSwitchWidth = switchWidth; mSwitchHeight = switchHeight; @@ -846,33 +806,19 @@ public class Switch extends CompoundButton { protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); - int opticalInsetLeft = 0; - int opticalInsetRight = 0; - if (mThumbDrawable != null) { - final Rect trackPadding = mTempRect; - if (mTrackDrawable != null) { - mTrackDrawable.getPadding(trackPadding); - } else { - trackPadding.setEmpty(); - } - - final Insets insets = mThumbDrawable.getOpticalInsets(); - opticalInsetLeft = Math.max(0, insets.left - trackPadding.left); - opticalInsetRight = Math.max(0, insets.right - trackPadding.right); - } + int switchRight; + int switchLeft; - final int switchRight; - final int switchLeft; if (isLayoutRtl()) { - switchLeft = getPaddingLeft() + opticalInsetLeft; - switchRight = switchLeft + mSwitchWidth - opticalInsetLeft - opticalInsetRight; + switchLeft = getPaddingLeft(); + switchRight = switchLeft + mSwitchWidth; } else { - switchRight = getWidth() - getPaddingRight() - opticalInsetRight; - switchLeft = switchRight - mSwitchWidth + opticalInsetLeft + opticalInsetRight; + switchRight = getWidth() - getPaddingRight(); + switchLeft = switchRight - mSwitchWidth; } - final int switchTop; - final int switchBottom; + int switchTop = 0; + int switchBottom = 0; switch (getGravity() & Gravity.VERTICAL_GRAVITY_MASK) { default: case Gravity.TOP: @@ -901,55 +847,27 @@ public class Switch extends CompoundButton { @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; - - int thumbInitialLeft = switchLeft + getThumbOffset(); - - final Insets thumbInsets; - if (mThumbDrawable != null) { - thumbInsets = mThumbDrawable.getOpticalInsets(); - } else { - thumbInsets = Insets.NONE; - } - - // Layout the track. if (mTrackDrawable != null) { + mTrackDrawable.setBounds(switchLeft, switchTop, switchRight, switchBottom); mTrackDrawable.getPadding(padding); - - // 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); } + final int switchInnerLeft = switchLeft + padding.left; + + // Relies on mTempRect, MUST be called first! + final int thumbPos = getThumbOffset(); + // Layout the thumb. if (mThumbDrawable != null) { mThumbDrawable.getPadding(padding); - - final int thumbLeft = thumbInitialLeft - padding.left; - final int thumbRight = thumbInitialLeft + mThumbWidth + padding.right; + final int thumbLeft = switchInnerLeft - padding.left + thumbPos; + final int thumbRight = switchInnerLeft + thumbPos + mThumbWidth + padding.right; mThumbDrawable.setBounds(thumbLeft, switchTop, thumbRight, switchBottom); final Drawable background = getBackground(); @@ -976,7 +894,9 @@ public class Switch extends CompoundButton { 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; @@ -999,6 +919,7 @@ public class Switch extends CompoundButton { final int saveCount = canvas.save(); if (thumbDrawable != null) { + canvas.clipRect(switchInnerLeft, switchTop, switchInnerRight, switchBottom); thumbDrawable.draw(canvas); } @@ -1053,7 +974,7 @@ public class Switch extends CompoundButton { /** * Translates thumb position to offset according to current RTL setting and - * thumb scroll range. Accounts for both track and thumb padding. + * thumb scroll range. * * @return thumb offset */ @@ -1069,18 +990,8 @@ public class Switch extends CompoundButton { private int getThumbScrollRange() { if (mTrackDrawable != null) { - 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; + mTrackDrawable.getPadding(mTempRect); + return mSwitchWidth - mThumbWidth - mTempRect.left - mTempRect.right; } else { return 0; } 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 Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png Binary files differdeleted file mode 100644 index 9076900d0873..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3c72bf80aa8e..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d31e113e379c..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d0c693e5dd09..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index dfa19b46eb13..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 151f205f87af..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ad3ee2cfecb9..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 43d66d753a92..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 13e4f8b963b8..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index a09b6b23e497..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index be02e531e680..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 655d3873bea6..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..e062f61df370 --- /dev/null +++ b/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_002.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..7737646ab8ef --- /dev/null +++ b/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_003.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..65ff45e75f9d --- /dev/null +++ b/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_004.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..11aaec068e79 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..9e1b60fb3cfa --- /dev/null +++ b/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_006.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..1e45687118d5 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..1e45687118d5 --- /dev/null +++ b/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_008.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..6c484566e4ba --- /dev/null +++ b/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_009.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..a4d084b300ba --- /dev/null +++ b/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_010.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..1e1a1b0bd9f2 --- /dev/null +++ b/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_011.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..1e1a1b0bd9f2 --- /dev/null +++ b/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_012.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..1e1a1b0bd9f2 --- /dev/null +++ b/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_013.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..1e1a1b0bd9f2 --- /dev/null +++ b/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_014.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..1e1a1b0bd9f2 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_014.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 Binary files differnew file mode 100644 index 000000000000..cf09f975391f --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png Binary files differdeleted file mode 100644 index e870a0ace268..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1d8f805be836..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d3488710db43..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 941e91e6603c..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index adee78d84bd5..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index e6b4ca3546ac..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6c2bc0d610f8..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 763833c9b312..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 9a87fbc5a087..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6ccf70bd5e91..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d1c14a5a64fc..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c2290f0567aa..000000000000 --- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..3218e6642316 --- /dev/null +++ b/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_002.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..0acff03618d8 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..c93adf418230 --- /dev/null +++ b/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_004.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..5d8ddc9684b1 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..47206a41b0e1 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..7d6a91f6a885 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..e062f61df370 --- /dev/null +++ b/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_008.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..b0f0dde38251 --- /dev/null +++ b/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_009.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/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_010.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/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_011.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/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_012.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/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_013.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/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_014.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..c54f8d777e1e --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_014.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 Binary files differindex 0ebe65e79684..ac1fc23f746b 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 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 Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png Binary files differdeleted file mode 100644 index 023889801372..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ada1be913dcd..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 82aec64eae4d..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1c6ea9fcfdbe..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ac11400021c7..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 20259720ce69..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7420fd87b99f..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1f40832b588c..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index cf58e44f37f0..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 930a280b54e3..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ed9bc372d9ed..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index cddb5b0ae672..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..36171684c06f --- /dev/null +++ b/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_002.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..e4366f447ca1 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..ea4533b3ac88 --- /dev/null +++ b/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_004.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..94aedbbb23c1 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..ef84578953b6 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..4de2321cf181 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..4de2321cf181 --- /dev/null +++ b/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_008.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..d62fbd510b2b --- /dev/null +++ b/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_009.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..3d87c4e932f2 --- /dev/null +++ b/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_010.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..536ed46bcd5c --- /dev/null +++ b/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_011.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..536ed46bcd5c --- /dev/null +++ b/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_012.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..536ed46bcd5c --- /dev/null +++ b/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_013.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..536ed46bcd5c --- /dev/null +++ b/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_014.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..536ed46bcd5c --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_014.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 Binary files differnew file mode 100644 index 000000000000..f5b660d56c31 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png Binary files differdeleted file mode 100644 index bc1f9792a118..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index e6fdbcc86742..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3d60b439074c..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b9afdc2595cd..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c3c8bf2ca01f..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1c7e5e102e60..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6329b73a539a..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 424202cade04..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 313becaa31ef..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index f18d86a1393e..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8ab48c0ef128..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index fbc2c1664067..000000000000 --- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..9e4db6c51e78 --- /dev/null +++ b/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_002.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..7de21283ddf5 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..1980c2ceca1e --- /dev/null +++ b/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_004.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..6e73ef038ba1 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..f89739282ea1 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..74a6ebd70d28 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..36171684c06f --- /dev/null +++ b/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_008.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..884eb666f88e --- /dev/null +++ b/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_009.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/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_010.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/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_011.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/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_012.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/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_013.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/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_014.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..8c3f26c3d4dd --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_014.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 Binary files differindex 4918d33fde0f..b6538e453cf6 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 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 Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png Binary files differdeleted file mode 100644 index 265aeb776de7..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2f036ade35a5..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index bb264402df16..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1b7004701ca9..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b544b98dcfc1..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c461f3defc48..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index f57da14e323c..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 22c6fbc1eb38..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index cd21ac92b890..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index a38dc87f29e4..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d84a34203fd9..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b82a2ebf0c36..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..7bd99fe8c35a --- /dev/null +++ b/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_002.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..2ef623bcbde9 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..19db3e0633bc --- /dev/null +++ b/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_004.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..984c3c5ed008 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..645419000454 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..cee939377417 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..cee939377417 --- /dev/null +++ b/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_008.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..437ffdd1ba25 --- /dev/null +++ b/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_009.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..d2e14ad75509 --- /dev/null +++ b/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_010.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..4e2f5bc005f0 --- /dev/null +++ b/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_011.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..4e2f5bc005f0 --- /dev/null +++ b/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_012.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..4e2f5bc005f0 --- /dev/null +++ b/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_013.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..4e2f5bc005f0 --- /dev/null +++ b/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_014.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..4e2f5bc005f0 --- /dev/null +++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_014.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 Binary files differnew file mode 100644 index 000000000000..f1bcfa30c139 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png Binary files differdeleted file mode 100644 index 6a33ebfeaf69..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index dafc250872fd..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 27df6ffdab0d..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index cb4121ca3d64..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c5cbb750ecee..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c69ef4165b8a..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index aff03d18426d..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index fb56ae6a82b7..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 88b9d28d839b..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 84519583bb48..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6f57654b9d54..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 21bfc2840201..000000000000 --- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..ede2fecab72a --- /dev/null +++ b/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_002.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..94ce01730c73 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..647cfe3a7f40 --- /dev/null +++ b/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_004.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..b3bf92363612 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..ae95b2be8ca1 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..b8e4bd62ecdb --- /dev/null +++ b/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_007.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..ec6d6d7ecaec --- /dev/null +++ b/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_008.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..c0e493f4b3ec --- /dev/null +++ b/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_009.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/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_010.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/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_011.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/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_012.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/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_013.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/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_014.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..2494fd413ef7 --- /dev/null +++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_014.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 Binary files differindex fd47f15e4bbd..d6a0ab27e632 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 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 Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png Binary files differdeleted file mode 100644 index c30cb5a2072a..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index eaba5583a1dd..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 17c18c98afcf..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0fce07a5c15e..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c29b837f6485..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ae56a41198f3..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 85290acab0b4..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1e8513b953d2..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8810a12730f6..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 717207f65a3a..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index db046f30a464..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c5c07a4f2356..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..eff3dd0c90ef --- /dev/null +++ b/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_002.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..000a23a75817 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..394d661d57de --- /dev/null +++ b/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_004.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..4e7311d00c62 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..d9dcf91c6f41 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..674142e62afe --- /dev/null +++ b/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_007.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..674142e62afe --- /dev/null +++ b/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_008.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..9d4026aa0c5d --- /dev/null +++ b/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_009.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..bb4b4266ca22 --- /dev/null +++ b/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_010.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..a37076d7e8cb --- /dev/null +++ b/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_011.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..a37076d7e8cb --- /dev/null +++ b/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_012.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..a37076d7e8cb --- /dev/null +++ b/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_013.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..a37076d7e8cb --- /dev/null +++ b/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_014.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..a37076d7e8cb --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_014.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 Binary files differnew file mode 100644 index 000000000000..22e995130095 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png Binary files differdeleted file mode 100644 index c9bdf1f4c7ff..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6bfd9438eec4..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index a1d3fbb6a25c..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 40c3a5ba403d..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 26b8736aa4d1..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 88c027ee25e5..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 02567c6c4a1f..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 037d3bf1c537..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0252769caa04..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3ae501d31060..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ecf2831a4693..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0877749d85ed..000000000000 --- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..14e6b397bc94 --- /dev/null +++ b/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_002.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..86b2c01afd43 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..1c565df50609 --- /dev/null +++ b/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_004.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..b825449d2c69 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..170c2343f701 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..54770075547b --- /dev/null +++ b/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_007.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..eff3dd0c90ef --- /dev/null +++ b/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_008.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..e3fd96aeb9e5 --- /dev/null +++ b/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_009.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/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_010.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/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_011.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/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_012.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/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_013.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/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_014.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..198ac07c00e2 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_014.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 Binary files differindex 3e3174d08c57..a8067cbed3d0 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 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 Binary files differnew file mode 100644 index 000000000000..8b202c6fdf02 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png Binary files differdeleted file mode 100644 index bc21279e1d95..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b57b5924b27f..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0fb927704a90..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 340722db0fa8..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8554a7694264..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index a05e33557798..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index a5ded1467296..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0300a49de501..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 37dd7ced4ed5..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6bc549a69e78..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b026d5d92fa8..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 89238dc00732..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..3b497f32d799 --- /dev/null +++ b/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_002.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..532b6de8071a --- /dev/null +++ b/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_003.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..403b2fe31ff5 --- /dev/null +++ b/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_004.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..8c5086c2d2a3 --- /dev/null +++ b/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_005.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..d4870f8af095 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..c05adf57a496 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..99b205609492 --- /dev/null +++ b/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_008.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..d8393580b34a --- /dev/null +++ b/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_009.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..913f94d7cf8f --- /dev/null +++ b/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_010.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..7f325b31a233 --- /dev/null +++ b/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_011.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..149a9aaa7f61 --- /dev/null +++ b/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_012.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..95c219ee2f07 --- /dev/null +++ b/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_013.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..462a128d6c04 --- /dev/null +++ b/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_014.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..5911d1681550 --- /dev/null +++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_014.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 Binary files differnew file mode 100644 index 000000000000..e0c6d85d6ed0 --- /dev/null +++ b/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_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png Binary files differdeleted file mode 100644 index 1d309feda1d3..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2e58fa911b7e..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2ebe7a72a1ef..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 04bab76c3d31..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3497e48a471d..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 42333b4beba6..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 732e175d4696..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 12eddd886b13..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 95cbc61ba223..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 105ec07cadb9..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index fac253ad5084..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1b8d11ce0cb7..000000000000 --- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png +++ /dev/null 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 Binary files differnew file mode 100644 index 000000000000..56799436d0ab --- /dev/null +++ b/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_002.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_002.png Binary files differnew file mode 100644 index 000000000000..54b636de91f1 --- /dev/null +++ b/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_003.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_003.png Binary files differnew file mode 100644 index 000000000000..bf9fac0f3746 --- /dev/null +++ b/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_004.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_004.png Binary files differnew file mode 100644 index 000000000000..25d53195173b --- /dev/null +++ b/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_005.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_005.png Binary files differnew file mode 100644 index 000000000000..d2df59506774 --- /dev/null +++ b/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_006.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_006.png Binary files differnew file mode 100644 index 000000000000..7700bdeccfd7 --- /dev/null +++ b/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_007.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_007.png Binary files differnew file mode 100644 index 000000000000..883f98b2582b --- /dev/null +++ b/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_008.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_008.png Binary files differnew file mode 100644 index 000000000000..b3b2108f3d30 --- /dev/null +++ b/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_009.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_009.png Binary files differnew file mode 100644 index 000000000000..3aad5964608a --- /dev/null +++ b/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_010.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_010.png Binary files differnew file mode 100644 index 000000000000..2017e17b2cbe --- /dev/null +++ b/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_011.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_011.png Binary files differnew file mode 100644 index 000000000000..1fc2700ccbea --- /dev/null +++ b/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_012.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_012.png Binary files differnew file mode 100644 index 000000000000..bb8b0f2610b1 --- /dev/null +++ b/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_013.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_013.png Binary files differnew file mode 100644 index 000000000000..66ab8f63b461 --- /dev/null +++ b/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_014.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_014.png Binary files differnew file mode 100644 index 000000000000..e3424db5a53f --- /dev/null +++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_014.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 Binary files differindex 1e4a74c8a9e8..fb07f2af4ec8 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 diff --git a/core/res/res/drawable/switch_thumb_material_anim.xml b/core/res/res/drawable/switch_thumb_material_anim.xml index 71f6cfdc8942..67e460a6b1cf 100644 --- a/core/res/res/drawable/switch_thumb_material_anim.xml +++ b/core/res/res/drawable/switch_thumb_material_anim.xml @@ -19,116 +19,130 @@ <item android:state_enabled="false" android:state_checked="true"> - <nine-patch - android:src="@drawable/btn_switch_to_on_mtrl_00012" + <bitmap + android:src="@drawable/btn_switch_to_on_mtrl_014" android:gravity="center" - android:tintMode="multiply" android:tint="?attr/colorControlActivated" android:alpha="?attr/disabledAlpha" /> </item> <item android:state_enabled="false"> - <nine-patch - android:src="@drawable/btn_switch_to_on_mtrl_00001" + <bitmap + android:src="@drawable/btn_switch_to_on_mtrl_000" android:gravity="center" - android:tintMode="multiply" - android:tint="?attr/colorButtonNormal" + android:tint="?attr/colorControlNormal" android:alpha="?attr/disabledAlpha" /> </item> <item android:state_checked="true" android:id="@+id/on"> - <nine-patch - android:src="@drawable/btn_switch_to_on_mtrl_00012" + <bitmap + android:src="@drawable/btn_switch_to_on_mtrl_014" android:gravity="center" - android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> </item> <item android:id="@+id/off"> - <nine-patch - android:src="@drawable/btn_switch_to_on_mtrl_00001" + <bitmap + android:src="@drawable/btn_switch_to_on_mtrl_000" android:gravity="center" - android:tintMode="multiply" - android:tint="?attr/colorButtonNormal" /> + android:tint="?attr/colorControlNormal" /> </item> <transition android:fromId="@+id/off" android:toId="@+id/on"> <animation-list> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00001" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_000" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00002" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_001" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00003" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_002" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00004" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_003" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00005" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_004" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_005" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_006" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00008" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_007" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00009" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_008" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00010" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_009" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00011" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_on_mtrl_010" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00012" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <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" /> </item> </animation-list> </transition> <transition android:fromId="@+id/on" android:toId="@+id/off"> <animation-list> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00001" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_000" android:gravity="center" 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" /> + </item> + <item android:duration="15"> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_002" android:gravity="center" 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" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00002" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_004" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00003" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_005" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00004" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_006" android:gravity="center" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00005" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_007" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_008" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_009" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00008" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_010" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00009" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_011" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00010" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_012" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00011" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_013" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00012" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" /> + <bitmap android:src="@drawable/btn_switch_to_off_mtrl_014" android:gravity="center" android:tint="?attr/colorControlNormal" /> </item> </animation-list> </transition> diff --git a/core/res/res/drawable/switch_track_material.xml b/core/res/res/drawable/switch_track_material.xml index 90d8ca4fa9f8..6ca2489f7c8a 100644 --- a/core/res/res/drawable/switch_track_material.xml +++ b/core/res/res/drawable/switch_track_material.xml @@ -18,21 +18,19 @@ <item android:state_enabled="false" android:state_checked="true"> <nine-patch android:src="@drawable/switch_track_mtrl_alpha" android:tint="?attr/colorControlActivated" - android:alpha="0.15" /> + android:alpha="?attr/disabledAlpha" /> </item> <item android:state_enabled="false"> <nine-patch android:src="@drawable/switch_track_mtrl_alpha" android:tint="?attr/colorControlNormal" - android:alpha="0.15" /> + android:alpha="?attr/disabledAlpha" /> </item> <item android:state_checked="true"> <nine-patch android:src="@drawable/switch_track_mtrl_alpha" - android:tint="?attr/colorControlActivated" - android:alpha="0.3" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <nine-patch android:src="@drawable/switch_track_mtrl_alpha" - android:tint="?attr/colorControlNormal" - android:alpha="0.3" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index 327782dbfa29..1af4d10a506c 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -368,30 +368,36 @@ <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_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_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_toggle_indicator_mtrl_alpha</item> <item>@drawable/expander_close_mtrl_alpha</item> <item>@drawable/expander_open_mtrl_alpha</item> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 9ee377f5cbae..61dff1b8a2ef 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -537,9 +537,12 @@ please see styles_device_defaults.xml. <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> diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index 6afce41d1d81..241ec653f516 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -245,8 +245,9 @@ public class NinePatchDrawable extends Drawable { final int restoreAlpha; if (mNinePatchState.mBaseAlpha != 1.0f) { - restoreAlpha = mPaint.getAlpha(); - mPaint.setAlpha((int) (restoreAlpha * mNinePatchState.mBaseAlpha + 0.5f)); + final Paint p = getPaint(); + restoreAlpha = p.getAlpha(); + p.setAlpha((int) (restoreAlpha * mNinePatchState.mBaseAlpha + 0.5f)); } else { restoreAlpha = -1; } @@ -444,16 +445,6 @@ public class NinePatchDrawable extends Drawable { // 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); @@ -620,16 +611,6 @@ public class NinePatchDrawable extends Drawable { 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 |
