summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-06-07 06:12:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-07 06:12:41 +0000
commitc11ea4e965daf3858a222f801fdae907fdc25087 (patch)
tree88e2454458c656468f9f54bf00b14d3ddc574371 /res
parentbfe171f9cbf3d3c86646e3f8685a461be0f77473 (diff)
parent0aefac860ff0f5f01e6a35de098d7c5e7b9b8cd7 (diff)
downloadandroid_packages_apps_Trebuchet-c11ea4e965daf3858a222f801fdae907fdc25087.tar.gz
android_packages_apps_Trebuchet-c11ea4e965daf3858a222f801fdae907fdc25087.tar.bz2
android_packages_apps_Trebuchet-c11ea4e965daf3858a222f801fdae907fdc25087.zip
Merge "Folder name should follow folder icon text color Bug: 134674880" into ub-launcher3-qt-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/user_folder_icon_normalized.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 835fee2d3..a1033f06c 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -56,9 +56,9 @@
android:paddingBottom="@dimen/folder_label_padding_bottom"
android:paddingTop="@dimen/folder_label_padding_top"
android:singleLine="true"
- android:textColor="?android:attr/textColorTertiary"
+ android:textColor="?attr/folderTextColor"
android:textColorHighlight="?android:attr/colorControlHighlight"
- android:textColorHint="?android:attr/textColorHint"
+ android:textColorHint="?attr/folderTextColor"
android:textSize="@dimen/folder_label_text_size" />
<com.android.launcher3.pageindicators.PageIndicatorDots