Merge "Fix visual styling for Material Spinner background" (3797a788) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -12412,7 +12412,9 @@ package android.graphics.drawable {
		method public void draw(android.graphics.Canvas);
		method public android.graphics.drawable.Drawable findDrawableByLayerId(int);
		method public int findIndexByLayerId(int);
		method public int getBottomPadding();
		method public android.graphics.drawable.Drawable getDrawable(int);
		method public int getEndPadding();
		method public int getId(int);
		method public int getLayerGravity(int);
		method public int getLayerHeight(int);
		@@ -12423,9 +12425,13 @@ package android.graphics.drawable {
		method public int getLayerInsetStart(int);
		method public int getLayerInsetTop(int);
		method public int getLayerWidth(int);
		method public int getLeftPadding();
		method public int getNumberOfLayers();
		method public int getOpacity();
		method public int getPaddingMode();
		method public int getRightPadding();
		method public int getStartPadding();
		method public int getTopPadding();
		method public void invalidateDrawable(android.graphics.drawable.Drawable);
		method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
		method public void setAlpha(int);
		@@ -12446,7 +12452,9 @@ package android.graphics.drawable {
		method public void setLayerSize(int, int, int);
		method public void setLayerWidth(int, int);
		method public void setOpacity(int);
		method public void setPadding(int, int, int, int);
		method public void setPaddingMode(int);
		method public void setPaddingRelative(int, int, int, int);
		method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
		field public static final int PADDING_MODE_NEST = 0; // 0x0
		field public static final int PADDING_MODE_STACK = 1; // 0x1

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -12706,7 +12706,9 @@ package android.graphics.drawable {
		method public void draw(android.graphics.Canvas);
		method public android.graphics.drawable.Drawable findDrawableByLayerId(int);
		method public int findIndexByLayerId(int);
		method public int getBottomPadding();
		method public android.graphics.drawable.Drawable getDrawable(int);
		method public int getEndPadding();
		method public int getId(int);
		method public int getLayerGravity(int);
		method public int getLayerHeight(int);
		@@ -12717,9 +12719,13 @@ package android.graphics.drawable {
		method public int getLayerInsetStart(int);
		method public int getLayerInsetTop(int);
		method public int getLayerWidth(int);
		method public int getLeftPadding();
		method public int getNumberOfLayers();
		method public int getOpacity();
		method public int getPaddingMode();
		method public int getRightPadding();
		method public int getStartPadding();
		method public int getTopPadding();
		method public void invalidateDrawable(android.graphics.drawable.Drawable);
		method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
		method public void setAlpha(int);
		@@ -12740,7 +12746,9 @@ package android.graphics.drawable {
		method public void setLayerSize(int, int, int);
		method public void setLayerWidth(int, int);
		method public void setOpacity(int);
		method public void setPadding(int, int, int, int);
		method public void setPaddingMode(int);
		method public void setPaddingRelative(int, int, int, int);
		method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
		field public static final int PADDING_MODE_NEST = 0; // 0x0
		field public static final int PADDING_MODE_STACK = 1; // 0x1

core/res/res/drawable/ic_spinner_caret.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path
		android:pathData="M7,10l5,5,5-5z"
		android:fillColor="@color/white"/>
		</vector>

core/res/res/drawable/spinner_background_material.xml

+19 −16

Original line number	Diff line number	Diff line
		@@ -15,21 +15,24 @@
		-->

		<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
		android:paddingMode="stack">
		<item android:drawable="@drawable/item_background_borderless_material"
		android:paddingMode="stack"
		android:paddingStart="0dp"
		android:paddingEnd="48dp"
		android:paddingLeft="0dp"
		android:paddingRight="0dp">
		<item
		android:gravity="end\|center_vertical"
		android:width="48dp"
		android:height="48dp">
		<ripple
		android:color="?attr/colorControlHighlight"
		android:radius="24dp" />
		</item>

		<item
		android:drawable="@drawable/ic_spinner_caret"
		android:gravity="end\|center_vertical"
		android:width="24dp"
		android:height="24dp" />
		<item android:gravity="end\|center_vertical">
		<vector android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path android:pathData="M7,10l5,5,5-5z"
		android:fillColor="@color/white"/>
		</vector>
		</item>
		<item android:end="48dp"
		android:drawable="@color/transparent" />
		android:end="12dp" />
		</layer-list>

core/res/res/values/attrs.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -5183,6 +5183,20 @@
		<!-- Stack each layer directly atop the previous layer. -->
		<enum name="stack" value="1" />
		</attr>
		<!-- Explicit top padding. Overrides child padding. -->
		<attr name="paddingTop" />
		<!-- Explicit bottom padding. Overrides child padding. -->
		<attr name="paddingBottom" />
		<!-- Explicit left padding. Overrides child padding. -->
		<attr name="paddingLeft" />
		<!-- Explicit right padding. Overrides child padding. -->
		<attr name="paddingRight" />
		<!-- Explicit start padding. Overrides child padding. Takes precedence
		over absolute padding (e.g. left when layout direction is LTR). -->
		<attr name="paddingStart" />
		<!-- Explicit end padding. Overrides child padding. Takes precedence
		over absolute padding (e.g. right when layout direction is LTR). -->
		<attr name="paddingEnd" />
		</declare-styleable>

		<!-- Describes an item (or child) of a LayerDrawable. -->