From aba72f50b974b7782b2394c4ed646436deb7d35a Mon Sep 17 00:00:00 2001 From: Jeremy Sim Date: Tue, 24 May 2022 16:30:31 -0700 Subject: [PATCH] Fix Overview screenshot bug in fake landscape Fixes an issue where the user would not be able to take a screenshot through the Overview menu when: 1) the task thumbnail was in LiveTile mode and 2) the phone was in fake landscape. The issue arose because all Overview menu items, upon selection, were forcing LiveTile to end immediately, even before running the onClick method of each menu item. In the case of screenshots, this resulted in the onClick method being unable to take a screenshot because LiveTile was already ended. This fix prevents Overview menu items from always forcing LiveTile to end, instead allowing each onClick method to determine its own order of operations and end LiveTile when appropriate. The functionality of all other current menu items (Select, Split, etc) should not be affected by this change. Fixes: 231047451 Test: Manual Change-Id: Ibfc79a114718fc4674dc434a907044184c7f5dd0 --- .../com/android/quickstep/views/TaskMenuView.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java index 3803f1b426..bdf21b82cf 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java +++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java @@ -16,7 +16,6 @@ package com.android.quickstep.views; -import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED; import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA; @@ -245,17 +244,9 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams(); mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp, menuOptionView, mActivity.getDeviceProfile()); - menuOptionView.setOnClickListener(view -> { - if (ENABLE_QUICKSTEP_LIVE_TILE.get()) { - RecentsView recentsView = mTaskView.getRecentsView(); - recentsView.switchToScreenshot(null, - () -> recentsView.finishRecentsAnimation(true /* toRecents */, - false /* shouldPip */, - () -> menuOption.onClick(view))); - } else { - menuOption.onClick(view); - } - }); + // Set an onClick listener on each menu option. The onClick method is responsible for + // ending LiveTile mode on the thumbnail if needed. + menuOptionView.setOnClickListener(menuOption::onClick); mOptionLayout.addView(menuOptionView); }