Merge "Set condition secondary text to 70% alpha." into nyc-dev

This commit is contained in:
Jason Monk
2016-03-10 20:46:58 +00:00
committed by Android (Google) Code Review

View File

@@ -71,6 +71,8 @@
android:visibility="gone" android:visibility="gone"
android:orientation="vertical"> android:orientation="vertical">
<!-- TODO: Don't set alpha here, and do proper themeing that
handles night mode -->
<TextView <TextView
android:id="@android:id/summary" android:id="@android:id/summary"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -78,6 +80,7 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:alpha=".7"
android:textColor="?android:attr/textColorPrimaryInverse" /> android:textColor="?android:attr/textColorPrimaryInverse" />
<!-- TODO: Better background --> <!-- TODO: Better background -->
@@ -99,6 +102,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="0dp" android:paddingStart="0dp"
android:alpha=".7"
android:textColor="?android:attr/textColorPrimaryInverse" android:textColor="?android:attr/textColorPrimaryInverse"
style="?android:attr/buttonBarButtonStyle" /> style="?android:attr/buttonBarButtonStyle" />
@@ -106,6 +110,7 @@
android:id="@+id/second_action" android:id="@+id/second_action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha=".7"
android:textColor="?android:attr/textColorPrimaryInverse" android:textColor="?android:attr/textColorPrimaryInverse"
style="?android:attr/buttonBarButtonStyle" /> style="?android:attr/buttonBarButtonStyle" />