diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-17 20:13:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-17 20:13:12 +0000 |
| commit | 098febafaa0fb68efac77bbfec7254aac3e0f681 (patch) | |
| tree | c6d75c33e72343e0a90cdbeba7817cf7c70d3a68 /src | |
| parent | a03bec439e6b505bc16110820dfcda85a9fef2a5 (diff) | |
| parent | d8c71598ee7f85215037b042acfc552d6c0a2372 (diff) | |
| download | android_packages_apps_Trebuchet-098febafaa0fb68efac77bbfec7254aac3e0f681.tar.gz android_packages_apps_Trebuchet-098febafaa0fb68efac77bbfec7254aac3e0f681.tar.bz2 android_packages_apps_Trebuchet-098febafaa0fb68efac77bbfec7254aac3e0f681.zip | |
Merge "Make folder backgrounds opaque" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/folder/FolderAnimationManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 9373976f1..962f21560 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -35,6 +35,8 @@ import android.util.Property; import android.view.View; import android.view.animation.AnimationUtils; +import androidx.core.graphics.ColorUtils; + import com.android.launcher3.BubbleTextView; import com.android.launcher3.CellLayout; import com.android.launcher3.Launcher; @@ -152,7 +154,8 @@ public class FolderAnimationManager { final float yDistance = initialY - lp.y; // Set up the Folder background. - final int finalColor = Themes.getAttrColor(mContext, R.attr.folderFillColor); + final int finalColor = ColorUtils.setAlphaComponent( + Themes.getAttrColor(mContext, R.attr.folderFillColor), 255); final int initialColor = setColorAlphaBound( finalColor, mPreviewBackground.getBackgroundAlpha()); mFolderBackground.mutate(); |