summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2019-06-06 23:18:59 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-06 23:18:59 -0700
commit994d97daf851e409dc8f6810e3c25c2245d8476b (patch)
tree6e556847fb3e28cc3570630299b1a1e83a92897c /res
parent9d14e5520e56049bf88cedfda59a1de53845ea95 (diff)
parentc11ea4e965daf3858a222f801fdae907fdc25087 (diff)
downloadandroid_packages_apps_Trebuchet-994d97daf851e409dc8f6810e3c25c2245d8476b.tar.gz
android_packages_apps_Trebuchet-994d97daf851e409dc8f6810e3c25c2245d8476b.tar.bz2
android_packages_apps_Trebuchet-994d97daf851e409dc8f6810e3c25c2245d8476b.zip
Merge "Folder name should follow folder icon text color Bug: 134674880" into ub-launcher3-qt-dev
am: c11ea4e965 Change-Id: Ifa061aa75dd46f42b8b47c7825cbd696d84c77fb
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