openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Task Icon menu behavior. 

Tapping task icon will now show the scrim for rest of thumbnail and not snap to page that is already snapped to.
Pressing task icon from clear all will scroll to the page.
Link: https://drive.google.com/file/d/1I90rd6ELPZNIje2_VZ3CamWWeFN8ywhL/view?usp=sharing

Bug: 158004853
Change-Id: I9ac8229a603190ea09a74e1cfb70a6bb6e1e65b7
This commit is contained in:
Sreyas 2020-06-09 21:00:22 -07:00
parent 236f40d97e
commit b64b59d025
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
View File

@ -607,6 +607,17 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
} }
} }
/**
* Whether the Clear All button is hidden or fully visible. Used to determine if center
* displayed page is a task or the Clear All button.
*
* @return True = Clear All button not fully visible, center page is a task. False = Clear All
* button fully visible, center page is Clear All button.
*/
public boolean isClearAllHidden() {
return mClearAllButton.getAlpha() != 1f;
}
@Override @Override
protected void onPageBeginTransition() { protected void onPageBeginTransition() {
super.onPageBeginTransition(); super.onPageBeginTransition();
@ -616,7 +627,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
@Override @Override
protected void onPageEndTransition() { protected void onPageEndTransition() {
super.onPageEndTransition(); super.onPageEndTransition();
if (getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen())) { if (isClearAllHidden()) {
LayoutUtils.setViewEnabled(mActionsView, true); LayoutUtils.setViewEnabled(mActionsView, true);
} }
if (getNextPage() > 0) { if (getNextPage() > 0) {

17
quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
View File

@ -425,13 +425,16 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
} }
private boolean showTaskMenu(int action) { private boolean showTaskMenu(int action) {
getRecentsView().snapToPage(getRecentsView().indexOfChild(this)); if (!getRecentsView().isClearAllHidden()) {
mMenuView = TaskMenuView.showForTask(this); getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, buildProto()); } else {
UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE, mMenuView = TaskMenuView.showForTask(this);
LauncherLogProto.ItemType.TASK_ICON); mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, buildProto());
if (mMenuView != null) { UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener); LauncherLogProto.ItemType.TASK_ICON);
if (mMenuView != null) {
mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);
}
} }
return mMenuView != null; return mMenuView != null;
} }