Merge "Fix noisy log from sysui flag changes" into sc-dev
diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index c61610a..1ee726e 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -21,5 +21,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/recents_clear_all"
- android:textColor="?attr/workspaceTextColor"
+ android:textColor="?android:attr/textColorPrimary"
android:textSize="14sp" />
\ No newline at end of file
diff --git a/quickstep/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml
index 9d71000..d7bcd9e 100644
--- a/quickstep/res/layout/overview_panel.xml
+++ b/quickstep/res/layout/overview_panel.xml
@@ -29,7 +29,6 @@
android:accessibilityPaneTitle="@string/accessibility_recent_apps"
android:clipChildren="false"
android:clipToPadding="false"
- android:theme="@style/HomeScreenElementTheme"
android:visibility="invisible" />
<include
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 8e92b59..cc3ccea 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -237,7 +237,9 @@
setTranslationY(scroll);
}
setAlpha(mScrolledOut ? 0 : 1);
- AlphaUpdateListener.updateVisibility(this);
+ if (getVisibility() != GONE) {
+ AlphaUpdateListener.updateVisibility(this);
+ }
}
@Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 5202d91..ccf6b41 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -27,7 +27,6 @@
import androidx.annotation.Nullable;
import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
import com.android.launcher3.util.TouchController;
import com.android.launcher3.views.BaseDragLayer;
import com.android.systemui.shared.system.ViewTreeObserverWrapper;
@@ -83,18 +82,13 @@
private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
return insetsInfo -> {
- if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
- || mTaskbarView.getVisibility() != VISIBLE || mTaskbarView.isDraggingItem()) {
- // We're invisible or dragging out of taskbar, let touches pass through us.
+ if (mControllerCallbacks.isTaskbarTouchable()) {
+ // Accept touches anywhere in our bounds.
+ insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+ } else {
+ // Let touches pass through us.
insetsInfo.touchableRegion.setEmpty();
insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
- // TODO(b/182234653): Shouldn't need to do this, but for the meantime, reporting
- // that visibleInsets is empty allows DragEvents through. Setting them as completely
- // empty reverts to default behavior, so set 1 px instead.
- insetsInfo.visibleInsets.set(0, 0, 0, 1);
- } else {
- // We're visible again, accept touches anywhere in our bounds.
- insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
}
// TaskbarContainerView provides insets to other apps based on contentInsets. These
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index de23ad2..559ede1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -42,6 +42,7 @@
import com.android.launcher3.LauncherState;
import com.android.launcher3.QuickstepTransitionManager;
import com.android.launcher3.R;
+import com.android.launcher3.anim.AlphaUpdateListener;
import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.folder.Folder;
import com.android.launcher3.folder.FolderIcon;
@@ -88,7 +89,6 @@
private @Nullable Animator mAnimator;
private boolean mIsAnimatingToLauncher;
- private boolean mIsAnimatingToApp;
public TaskbarController(BaseQuickstepLauncher launcher,
TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
@@ -141,6 +141,13 @@
setTaskbarWindowFullscreen(false);
}
}
+
+ @Override
+ public boolean isTaskbarTouchable() {
+ return mTaskbarContainerView.getAlpha() > AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
+ && mTaskbarViewInApp.getVisibility() == View.VISIBLE
+ && !mIsAnimatingToLauncher;
+ }
};
}
@@ -250,7 +257,9 @@
mHotseatController.init();
mRecentsController.init();
- updateWhichTaskbarViewIsVisible();
+ setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
+ ? mTaskbarViewOnHome
+ : mTaskbarViewInApp);
}
private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -284,6 +293,8 @@
mTaskbarAnimationController.cleanup();
mHotseatController.cleanup();
mRecentsController.cleanup();
+
+ setWhichTaskbarViewIsVisible(null);
}
private void removeFromWindowManager() {
@@ -364,7 +375,7 @@
@Override
public void onAnimationEnd(Animator animation) {
mIsAnimatingToLauncher = false;
- updateWhichTaskbarViewIsVisible();
+ setWhichTaskbarViewIsVisible(mTaskbarViewOnHome);
}
});
@@ -377,14 +388,12 @@
anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
- mIsAnimatingToApp = true;
mTaskbarViewInApp.updateHotseatItemsVisibility();
- updateWhichTaskbarViewIsVisible();
+ setWhichTaskbarViewIsVisible(mTaskbarViewInApp);
}
@Override
public void onAnimationEnd(Animator animation) {
- mIsAnimatingToApp = false;
}
});
return anim.buildAnim();
@@ -487,18 +496,12 @@
mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom);
}
- private void updateWhichTaskbarViewIsVisible() {
- boolean isInApp = !mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
- || mIsAnimatingToApp;
- if (isInApp) {
- mTaskbarViewInApp.setVisibility(View.VISIBLE);
- mTaskbarViewOnHome.setVisibility(View.INVISIBLE);
- mLauncher.getHotseat().setIconsAlpha(0);
- } else {
- mTaskbarViewInApp.setVisibility(View.INVISIBLE);
- mTaskbarViewOnHome.setVisibility(View.VISIBLE);
- mLauncher.getHotseat().setIconsAlpha(1);
- }
+ private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
+ mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
+ ? View.VISIBLE : View.INVISIBLE);
+ mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
+ ? View.VISIBLE : View.INVISIBLE);
+ mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
}
/**
@@ -549,6 +552,7 @@
*/
protected interface TaskbarContainerViewCallbacks {
void onViewRemoved();
+ boolean isTaskbarTouchable();
}
/**
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 65bbeea..464b90a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -111,7 +111,7 @@
float progressMultiplier = super.initCurrentAnimation();
if (mToState == HINT_STATE) {
// Track the drag across the entire height of the screen.
- progressMultiplier = -1 / getShiftRange();
+ progressMultiplier = -1f / mLauncher.getDeviceProfile().heightPx;
}
return progressMultiplier;
}
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b7c6743..2a903eb 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -217,6 +217,8 @@
// Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise
private RunningWindowAnim mRunningWindowAnim;
+ // Possible second animation running at the same time as mRunningWindowAnim
+ private Animator mParallelRunningAnim;
private boolean mIsMotionPaused;
private boolean mHasMotionEverBeenPaused;
@@ -317,9 +319,9 @@
mStateCallback.runOnceAtState(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
this::invalidateHandlerWithLauncher);
mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_RESUME_LAST_TASK,
- this::notifyTransitionCancelled);
+ this::resetStateForAnimationCancel);
mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,
- this::notifyTransitionCancelled);
+ this::resetStateForAnimationCancel);
if (!LIVE_TILE.get()) {
mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT
@@ -798,6 +800,13 @@
mRunningWindowAnim.end();
}
}
+ if (mParallelRunningAnim != null) {
+ if (cancel) {
+ mParallelRunningAnim.cancel();
+ } else {
+ mParallelRunningAnim.end();
+ }
+ }
}
private void onSettledOnEndTarget() {
@@ -1060,7 +1069,11 @@
ActivityManagerWrapper.getInstance().registerTaskStackListener(
mActivityRestartListener);
- mActivityInterface.onAnimateToLauncher(mGestureState.getEndTarget(), duration);
+ mParallelRunningAnim = mActivityInterface.getParallelAnimationToLauncher(
+ mGestureState.getEndTarget(), duration);
+ if (mParallelRunningAnim != null) {
+ mParallelRunningAnim.start();
+ }
}
if (mGestureState.getEndTarget() == HOME) {
@@ -1370,10 +1383,6 @@
mActivity.getRootView().setOnApplyWindowInsetsListener(null);
}
- private void notifyTransitionCancelled() {
- mAnimationFactory.onTransitionCancelled();
- }
-
private void resetStateForAnimationCancel() {
boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
mActivityInterface.onTransitionCancelled(wasVisible);
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 3afffc1..147297a 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -347,7 +347,9 @@
* Called when the gesture ends and the animation starts towards the given target. No-op by
* default, but subclasses can override to add an additional animation with the same duration.
*/
- public void onAnimateToLauncher(GestureState.GestureEndTarget endTarget, long duration) {
+ public @Nullable Animator getParallelAnimationToLauncher(
+ GestureState.GestureEndTarget endTarget, long duration) {
+ return null;
}
/**
@@ -366,8 +368,6 @@
void createActivityInterface(long transitionLength);
- default void onTransitionCancelled() { }
-
/**
* @param attached Whether to show RecentsView alongside the app window. If false, recents
* will be hidden by some property we can animate, e.g. alpha.
@@ -434,11 +434,6 @@
}
@Override
- public void onTransitionCancelled() {
- mActivity.getStateManager().goToState(mStartState, false /* animate */);
- }
-
- @Override
public void setRecentsAttachedToAppWindow(boolean attached, boolean animate) {
if (mIsAttachedToWindow == attached && animate) {
return;
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 98b96b2..878f5c9 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -22,6 +22,7 @@
import static com.android.launcher3.anim.Interpolators.LINEAR;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
+import android.animation.Animator;
import android.content.Context;
import android.graphics.Rect;
import android.view.MotionEvent;
@@ -267,13 +268,14 @@
}
@Override
- public void onAnimateToLauncher(GestureEndTarget endTarget, long duration) {
+ public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
+ long duration) {
TaskbarController taskbarController = getTaskbarController();
if (taskbarController == null) {
- return;
+ return null;
}
LauncherState toState = stateFromGestureEndTarget(endTarget);
- taskbarController.createAnimToLauncher(toState, duration).start();
+ return taskbarController.createAnimToLauncher(toState, duration);
}
@Override
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index 1544f00..6d6e802 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -26,6 +26,7 @@
import android.content.SharedPreferences;
import com.android.launcher3.LauncherState;
+import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.hybridhotseat.HotseatPredictionController;
@@ -63,7 +64,8 @@
});
}
- if (!hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
+ if (!Utilities.IS_RUNNING_IN_TEST_HARNESS
+ && !hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
stateManager.addStateListener(new StateListener<LauncherState>() {
boolean mFromAllApps = false;
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b62a029..3c171fe 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -559,6 +559,7 @@
.getDimension(R.dimen.recents_empty_message_text_size));
mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context),
Typeface.NORMAL));
+ mEmptyMessagePaint.setAntiAlias(true);
mEmptyMessagePadding = getResources()
.getDimensionPixelSize(R.dimen.recents_empty_message_text_padding);
setWillNotDraw(false);
diff --git a/res/xml/size_limits_80x104.xml b/res/xml/size_limits_80x104.xml
index e11bc5e..f375549 100644
--- a/res/xml/size_limits_80x104.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -36,11 +36,11 @@
launcher:a="0"
launcher:b="16dp"/>
<workspaceBottomPadding
- launcher:a="0.50"
+ launcher:a="0.56"
launcher:b="0"
launcher:c="16dp"/>
<hotseatBottomPadding
- launcher:a="0.50"
+ launcher:a="0.44"
launcher:b="0"
launcher:c="16dp"/>
</device-padding>