Merge "Add transient taskbar UI" into tm-qpr-dev am: 661f38cdb8 am: e095ae843f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20197462

Change-Id: I5b170eca6e19ce8e771d3dea7994cb6b3750e2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2022-10-26 15:59:32 +00:00
committed by Automerger Merge Worker
15 changed files with 260 additions and 35 deletions

View File

@@ -110,6 +110,7 @@ import com.android.launcher3.testing.shared.ResourceUtils;
import com.android.launcher3.touch.PagedOrientationHandler;
import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.ActivityOptionsWrapper;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.DynamicResource;
import com.android.launcher3.util.ObjectWrapper;
import com.android.launcher3.util.RunnableList;
@@ -452,7 +453,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
4 - rotationChange);
}
}
if (mDeviceProfile.isTaskbarPresentInApps && !target.willShowImeOnTarget) {
if (mDeviceProfile.isTaskbarPresentInApps
&& !target.willShowImeOnTarget
&& !DisplayController.isTransientTaskbar(mLauncher)) {
// Animate to above the taskbar.
bounds.bottom -= target.contentInsets.bottom;
}