Fix color of selected folder text for phone.
Just have it white on tablet.
Fixes a few bugs, incl:
b/6581482 UI for selected folders
Change-Id: I5c03d2e25a7836a94c7989d3d8a2b5aa39e5f410
diff --git a/res/color-sw600dp/folder_name_color_primary_invertible.xml b/res/color-sw600dp/folder_name_color_primary_invertible.xml
index 9f57209..18367c7 100644
--- a/res/color-sw600dp/folder_name_color_primary_invertible.xml
+++ b/res/color-sw600dp/folder_name_color_primary_invertible.xml
@@ -19,6 +19,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:color="#ff999999"/>
+ <item android:state_checked="true"
+ android:color="@android:color/white" />
<item android:state_activated="true"
android:color="@android:color/white" />
<item
diff --git a/res/color/folder_name_color_primary_invertible.xml b/res/color/folder_name_color_primary_invertible.xml
index 96172af..81e0e73 100644
--- a/res/color/folder_name_color_primary_invertible.xml
+++ b/res/color/folder_name_color_primary_invertible.xml
@@ -20,9 +20,9 @@
<item android:state_enabled="false"
android:color="#ff999999"/>
<item android:state_checked="true"
- android:color="@android:color/black" />
- <item android:state_activated="true"
android:color="@android:color/white" />
+ <item android:state_activated="true"
+ android:color="@android:color/black" />
<item
android:color="@android:color/black" />
</selector>
diff --git a/res/layout/folder_item.xml b/res/layout/folder_item.xml
index 4958b48..09a6f15 100644
--- a/res/layout/folder_item.xml
+++ b/res/layout/folder_item.xml
@@ -45,7 +45,7 @@
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentRight="true"
android:layout_toLeftOf="@id/folder_parent_icon"
- android:textColor="@color/text_color_unread_invertible" />
+ android:textColor="@color/folder_name_color_primary_invertible" />
<RelativeLayout
android:layout_width="match_parent"
@@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_below="@id/name"
- android:textColor="@color/text_color_primary_invertible"
+ android:textColor="@color/folder_name_color_primary_invertible"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone" />