Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d49493 authored Jul 18, 2023 by Android Build Coastguard Worker

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558']...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f

Change-Id: I38720247bf3f5ca08e59bcc570558e456c88c411

parents 16d8dff2 8a18bc0f

src/com/android/launcher3/Launcher.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2194,6 +2194,8 @@ public class Launcher extends StatefulActivity<LauncherState>

	/**		/**
	* Returns the CellLayout of the specified container at the specified screen.		* Returns the CellLayout of the specified container at the specified screen.
			*
			* @param screenId must be presenterPos and not modelPos.
	*/		*/
	public CellLayout getCellLayout(int container, int screenId) {		public CellLayout getCellLayout(int container, int screenId) {
	return (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)		return (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)

src/com/android/launcher3/folder/LauncherDelegate.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@ public class LauncherDelegate {
	// Move the item from the folder to the workspace, in the position of the		// Move the item from the folder to the workspace, in the position of the
	// folder		// folder
	CellLayout cellLayout = mLauncher.getCellLayout(info.container,		CellLayout cellLayout = mLauncher.getCellLayout(info.container,
	info.screenId);		mLauncher.getCellPosMapper().mapModelToPresenter(info).screenId);
	if (cellLayout == null) {		if (cellLayout == null) {
	return;		return;
	}		}