Snap for 11180250 from 1aaa3aa7951ce2b427197677b5abb2bab415df1f to 24Q1-release (a96ea678) · Commits · e / os / BlissLauncher3

aconfig/launcher.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -76,3 +76,10 @@ flag {
		description: "Enables logging of Launcher restore metrics to the Backup & Restore team"
		bug: "307527314"
		}

		flag {
		name: "enable_unfolded_two_pane_picker"
		namespace: "launcher"
		description: "Enables two pane widget picker for unfolded foldables"
		bug: "313922374"
		}

+12 −4

Original line number	Diff line number	Diff line
		@@ -133,11 +133,20 @@ public class KeyboardQuickSwitchViewController {
		GroupTask task = mControllerCallbacks.getTaskAt(index);
		if (task == null) {
		return Math.max(0, index);
		} else if (mOnDesktop) {
		}
		Task task2 = task.task2;
		int runningTaskId = ActivityManagerWrapper.getInstance().getRunningTask().taskId;
		if (runningTaskId == task.task1.key.id
		\|\| (task2 != null && runningTaskId == task2.key.id)) {
		// Ignore attempts to run the selected task if it is already running.
		return -1;
		}

		if (mOnDesktop) {
		UI_HELPER_EXECUTOR.execute(() ->
		SystemUiProxy.INSTANCE.get(mKeyboardQuickSwitchView.getContext())
		.showDesktopApp(task.task1.key.id));
		} else if (task.task2 == null) {
		} else if (task2 == null) {
		UI_HELPER_EXECUTOR.execute(() ->
		ActivityManagerWrapper.getInstance().startActivityFromRecents(
		task.task1.key,
		@@ -145,8 +154,7 @@ public class KeyboardQuickSwitchViewController {
		taskView == null ? mKeyboardQuickSwitchView : taskView, null)
		.options));
		} else {
		mControllers.uiController.launchSplitTasks(
		taskView == null ? mKeyboardQuickSwitchView : taskView, task);
		mControllers.uiController.launchSplitTasks(task);
		}
		return -1;
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.animation.AnimatorSet;
		import android.os.RemoteException;
		import android.util.Log;
		import android.view.TaskTransitionSpec;
		import android.view.View;
		import android.view.WindowManagerGlobal;

		import androidx.annotation.NonNull;
		@@ -386,8 +385,8 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		}

		@Override
		public void launchSplitTasks(@NonNull View taskView, @NonNull GroupTask groupTask) {
		mLauncher.launchSplitTasks(taskView, groupTask);
		public void launchSplitTasks(@NonNull GroupTask groupTask) {
		mLauncher.launchSplitTasks(groupTask);
		}

		@Override

+8 −3

Original line number	Diff line number	Diff line
		@@ -203,11 +203,16 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		Display display = windowContext.getDisplay();
		Context c = getApplicationContext();
		mWindowManager = c.getSystemService(WindowManager.class);
		mLeftCorner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT);
		mRightCorner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT);

		// Inflate views.
		boolean phoneMode = TaskbarManager.isPhoneMode(mDeviceProfile);
		mLeftCorner = phoneMode
		? null
		: display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT);
		mRightCorner = phoneMode
		? null
		: display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT);

		// Inflate views.
		int taskbarLayout = DisplayController.isTransientTaskbar(this) && !phoneMode
		? R.layout.transient_taskbar
		: R.layout.taskbar;

+2 −4

Original line number	Diff line number	Diff line
		@@ -297,11 +297,9 @@ public class TaskbarUIController {
		}

		/**
		* Launches the focused task in splitscreen.
		*
		* No-op if the view is not yet open.
		* Launches the given task in split-screen.
		*/
		public void launchSplitTasks(@NonNull View taskview, @NonNull GroupTask groupTask) { }
		public void launchSplitTasks(@NonNull GroupTask groupTask) { }

		/**
		* Returns the matching view (if any) in the taskbar.