Revert "Removed disabled overview actions at end of scroll"
This reverts commit 96cad794d75d284930391084d8f47c68e861c95b.
Reason for revert: Breaks build test_suites_x86_64_coverage (linux) build 9222442 in git_tm-qpr-dev.
Change-Id: I482f526da169505cf5d3f42ef999303dcc162a1f
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index d098ffc..50be5ea 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -99,10 +99,6 @@
return false;
}
- public float getScrollAlpha() {
- return mScrollAlpha;
- }
-
public void setContentAlpha(float alpha) {
if (mContentAlpha != alpha) {
mContentAlpha = alpha;
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 997200b..abace7c 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -81,8 +81,6 @@
private static final int INDEX_FULLSCREEN_ALPHA = 2;
private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3;
private static final int INDEX_SHARE_TARGET_ALPHA = 4;
- private static final int INDEX_SCROLL_ALPHA = 5;
- private static final int NUM_ALPHAS = 6;
public @interface SplitButtonHiddenFlags { }
public static final int FLAG_IS_NOT_TABLET = 1 << 0;
@@ -127,7 +125,7 @@
@Override
protected void onFinishInflate() {
super.onFinishInflate();
- mMultiValueAlpha = new MultiValueAlpha(findViewById(R.id.action_buttons), NUM_ALPHAS);
+ mMultiValueAlpha = new MultiValueAlpha(findViewById(R.id.action_buttons), 5);
mMultiValueAlpha.setUpdateVisibility(true);
findViewById(R.id.action_screenshot).setOnClickListener(this);
@@ -249,10 +247,6 @@
return mMultiValueAlpha.getProperty(INDEX_SHARE_TARGET_ALPHA);
}
- public AlphaProperty getIndexScrollAlpha() {
- return mMultiValueAlpha.getProperty(INDEX_SCROLL_ALPHA);
- }
-
/**
* Offsets OverviewActionsView horizontal position based on 3 button nav container in taskbar.
*/
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 64e8295..68b80c2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1890,9 +1890,6 @@
}
int scroll = mOrientationHandler.getPrimaryScroll(this);
mClearAllButton.onRecentsViewScroll(scroll, mOverviewGridEnabled);
-
- // Clear all button alpha was set by the previous line.
- mActionsView.getIndexScrollAlpha().setValue(1 - mClearAllButton.getScrollAlpha());
}
@Override
diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
index afeb8d7..f47f710 100644
--- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
+++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
@@ -244,39 +244,43 @@
* Returns if clear all button is visible.
*/
public boolean isClearAllVisible() {
- return verifyActiveContainer().hasObject(
- mLauncher.getOverviewObjectSelector("clear_all"));
+ return mLauncher.hasLauncherObject(mLauncher.getOverviewObjectSelector("clear_all"));
}
protected boolean isActionsViewVisible() {
- if (!hasTasks() || isClearAllVisible()) {
- return false;
- }
OverviewTask task = mLauncher.isTablet() ? getFocusedTaskForTablet() : getCurrentTask();
if (task == null) {
return false;
}
- // In tablets, if focused task is not in center, overview actions aren't visible.
- if (mLauncher.isTablet()
- && Math.abs(task.getExactCenterX() - mLauncher.getExactScreenCenterX()) >= 1) {
- return false;
- }
- // Overview actions aren't visible for split screen tasks.
return !task.isTaskSplit();
}
private void verifyActionsViewVisibility() {
+ if (!hasTasks() || !isActionsViewVisible()) {
+ return;
+ }
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to assert overview actions view visibility")) {
- if (isActionsViewVisible()) {
- mLauncher.waitForOverviewObject("action_buttons");
- } else {
+ if (mLauncher.isTablet() && !isOverviewSnappedToFocusedTaskForTablet()) {
mLauncher.waitUntilOverviewObjectGone("action_buttons");
+ } else {
+ mLauncher.waitForOverviewObject("action_buttons");
}
}
}
/**
+ * Returns if focused task is currently snapped task in tablet grid overview.
+ */
+ private boolean isOverviewSnappedToFocusedTaskForTablet() {
+ OverviewTask focusedTask = getFocusedTaskForTablet();
+ if (focusedTask == null) {
+ return false;
+ }
+ return Math.abs(focusedTask.getExactCenterX() - mLauncher.getExactScreenCenterX()) < 1;
+ }
+
+ /**
* Returns Overview focused task if it exists.
*
* @throws IllegalStateException if not run on a tablet device.