summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-04-13 11:41:50 -0700
committerSunny Goyal <sunnygoyal@google.com>2018-04-17 20:08:10 +0000
commited7a6937cbe11179403b31079d8c54ffa8f30019 (patch)
tree4a70112d89ef5e5ffb713b582a84a8926b97222c /src/com/android/launcher3/folder
parentde967a2355752c2653ed14a1d57a7a8c8c2eef57 (diff)
downloadandroid_packages_apps_Trebuchet-ed7a6937cbe11179403b31079d8c54ffa8f30019.tar.gz
android_packages_apps_Trebuchet-ed7a6937cbe11179403b31079d8c54ffa8f30019.tar.bz2
android_packages_apps_Trebuchet-ed7a6937cbe11179403b31079d8c54ffa8f30019.zip
Unifying and maintaining the text-alpha and text visibility property
Bug: 76228194 Change-Id: I70be5f9fd22c53864a9a0308f256baa7dc1f3ab7
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r--src/com/android/launcher3/folder/FolderAnimationManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index ec448e997..9ae377535 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -16,6 +16,7 @@
package com.android.launcher3.folder;
+import static com.android.launcher3.BubbleTextView.TEXT_ALPHA_PROPERTY;
import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
@@ -172,9 +173,8 @@ public class FolderAnimationManager {
AnimatorSet a = LauncherAnimUtils.createAnimatorSet();
// Initialize the Folder items' text.
- PropertyResetListener colorResetListener = new PropertyResetListener<>(
- BubbleTextView.TEXT_ALPHA_PROPERTY,
- Color.alpha(Themes.getAttrColor(mContext, android.R.attr.textColorSecondary)));
+ PropertyResetListener colorResetListener =
+ new PropertyResetListener<>(TEXT_ALPHA_PROPERTY, 1f);
for (BubbleTextView icon : mFolder.getItemsOnPage(mFolder.mContent.getCurrentPage())) {
if (mIsOpening) {
icon.setTextVisibility(false);