diff --git a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java index 010694b0c5..bb1f6fcc00 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java +++ b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java @@ -60,6 +60,14 @@ public class DeviceFlag extends DebugFlag { mListeners.add(r); } + @Override + public void removeChangeListener(Runnable r) { + if (mListeners == null) { + return; + } + mListeners.remove(r); + } + private void registerDeviceConfigChangedListener(Context context) { DeviceConfig.addOnPropertiesChangedListener( NAMESPACE_LAUNCHER, diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index feeee502de..7a259d4838 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1746,7 +1746,9 @@ public abstract class AbsSwipeUpHandler, Q extends if (mWindowTransitionController != null) { mWindowTransitionController.setProgress(mCurrentShift.value, mDragLengthFactor); } - if (mRecentsAnimationTargets != null) { + // No need to apply any transform if there is ongoing swipe-pip-to-home animator since + // that animator handles the leash solely. + if (mRecentsAnimationTargets != null && !mIsSwipingPipToHome) { if (mRecentsViewScrollLinked) { mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset()); } diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index 35383d2831..67840d1a9e 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -200,8 +200,8 @@ public class NavigationModeSwitchRule implements TestRule { () -> launcher.getNavigationModel() == expectedMode, WAIT_TIME_MS, launcher); Wait.atMost(() -> "Switching nav mode: " - + launcher.getNavigationModeMismatchError(), - () -> launcher.getNavigationModeMismatchError() == null, + + launcher.getNavigationModeMismatchError(false), + () -> launcher.getNavigationModeMismatchError(false) == null, WAIT_TIME_MS, launcher); AbstractLauncherUiTest.checkDetectedLeaks(launcher); return true; diff --git a/res/drawable/bg_widgets_searchbox.xml b/res/drawable/bg_widgets_searchbox.xml new file mode 100644 index 0000000000..81dd2aa0c6 --- /dev/null +++ b/res/drawable/bg_widgets_searchbox.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/personal_work_tabs.xml b/res/layout/personal_work_tabs.xml index 8f29997802..5fb5bcbea0 100644 --- a/res/layout/personal_work_tabs.xml +++ b/res/layout/personal_work_tabs.xml @@ -23,6 +23,7 @@ android:layout_marginLeft="@dimen/all_apps_tabs_side_padding" android:layout_marginRight="@dimen/all_apps_tabs_side_padding" android:orientation="horizontal" + android:elevation="2dp" style="@style/TextHeadline">