commit e13895182b5a3b43319ee19033e637b60d8d3eff
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 27 01:31:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 27 01:31:36 2019 +0000
tree 846550029bb348c7189af0800db8bd564c50a5a0
parent 66ae05f1dd31ab1a21ddb7d2121a7438b16c34cb
parent dd50f6a7dca9c884b257c6afa04a71f436552785

Merge "Fix build break for Launcher3GoIconRecents" into ub-launcher3-master

go/quickstep/src/com/android/quickstep/views/IconRecentsView.java

diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
index ae8166c..00415fe 100644
--- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
+++ b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
@@ -51,6 +51,11 @@
                 @Override
                 public void setValue(IconRecentsView view, float v) {
                     ALPHA.set(view, v);
+                    if (view.getVisibility() != VISIBLE && v > 0) {
+                        view.setVisibility(VISIBLE);
+                    } else if (view.getVisibility() != GONE && v == 0){
+                        view.setVisibility(GONE);
+                    }
                 }
 
                 @Override

quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
index 6d374c6..4450b4b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -185,6 +185,7 @@
                     if (mSupportsRoundedCornersOnWindows) {
                         cornerRadius = Utilities.mapRange(params.progress, mWindowCornerRadius,
                                 mTaskCornerRadius);
+                        mCurrentCornerRadius = cornerRadius;
                     }
                 }
                 alpha = mTaskAlphaCallback.apply(app, params.targetAlpha);