Merge "Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877" into nyc-dev

This commit is contained in:
Noah Wang
2016-04-13 23:17:35 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 4 deletions

View File

@@ -63,7 +63,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_font_size_16dp" android:src="@drawable/ic_font_size_16dp"
android:tint="?android:attr/colorControlNormal" android:tint="?android:attr/textColorPrimary"
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"
@@ -82,7 +82,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_font_size_24dp" android:src="@drawable/ic_font_size_24dp"
android:tint="?android:attr/colorControlNormal" android:tint="?android:attr/textColorPrimary"
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"

View File

@@ -62,7 +62,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_remove_24dp" android:src="@drawable/ic_remove_24dp"
android:tint="?android:attr/colorControlNormal" android:tint="?android:attr/textColorPrimary"
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"
@@ -81,7 +81,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_add_24dp" android:src="@drawable/ic_add_24dp"
android:tint="?android:attr/colorControlNormal" android:tint="?android:attr/textColorPrimary"
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"