PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Fix views not being visible on Recents Go." into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-17 00:44:44 +00:00
committed by Android (Google) Code Review
parent eeb8cdd87a cce954f334
commit b06a2a6ccc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
+7 -2
View File
@@ -107,6 +107,7 @@ public final class IconRecentsView extends FrameLayout {
private RecentsToActivityHelper mActivityHelper;
private RecyclerView mTaskRecyclerView;
private View mShowingContentView;
private View mEmptyView;
private View mContentView;
private View mClearAllView;
@@ -355,11 +356,13 @@ public final class IconRecentsView extends FrameLayout {
*/
private void updateContentViewVisibility() {
int taskListSize = mTaskAdapter.getItemCount();
if (mEmptyView.getVisibility() != VISIBLE && taskListSize == 0) {
if (mShowingContentView != mEmptyView && taskListSize == 0) {
mShowingContentView = mEmptyView;
crossfadeViews(mEmptyView, mContentView);
mActivityHelper.leaveRecents();
}
if (mContentView.getVisibility() != VISIBLE && taskListSize > 0) {
if (mShowingContentView != mContentView && taskListSize > 0) {
mShowingContentView = mContentView;
crossfadeViews(mContentView, mEmptyView);
}
}
@@ -371,6 +374,7 @@ public final class IconRecentsView extends FrameLayout {
* @param fadeOutView view that should fade out
*/
private void crossfadeViews(View fadeInView, View fadeOutView) {
fadeInView.animate().cancel();
fadeInView.setVisibility(VISIBLE);
fadeInView.setAlpha(0f);
fadeInView.animate()
@@ -378,6 +382,7 @@ public final class IconRecentsView extends FrameLayout {
.setDuration(CROSSFADE_DURATION)
.setListener(null);
fadeOutView.animate().cancel();
fadeOutView.animate()
.alpha(0f)
.setDuration(CROSSFADE_DURATION)