From 0812a9495cb53cc2bfc6d93f142eab28dea6bcc5 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Thu, 5 Oct 2023 16:37:47 -0700 Subject: [PATCH] Fix task bar crashing in small screen with task bar / nav bar unification on A few params are not set in device profile when task bar (in large screen) is not present, and hence the calculation below causes a crash Test: Make sure that it doesn't crash in small screen gesture nav mode Bug: 274517647 Change-Id: I3a61a64ac931fac4aee1a3c40ed54ab9ded298a7 --- .../com/android/launcher3/taskbar/TaskbarViewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index b4053207d0..858141aea0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -458,7 +458,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar */ private AnimatorPlaybackController createIconAlignmentController(DeviceProfile launcherDp) { PendingAnimation setter = new PendingAnimation(100); - if (TaskbarManager.isPhoneButtonNavMode(mActivity)) { + if (TaskbarManager.isPhoneMode(launcherDp)) { // No animation for icons in small-screen return setter.createPlaybackController(); }