Merge "Removing some obsolete features" into tm-qpr-dev (211496e3) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/values/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@

		<string name="hotseat_edu_message_migrate">Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your Home screen. </string>
		<string name="hotseat_edu_message_migrate_landscape">Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps in favorites row will move to your Home screen. </string>
		<string name="hotseat_edu_message_migrate_alt">Easily access your most-used apps, right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move to a new folder.</string>

		<!-- Button text to opt in for fully predicted hotseat -->
		<string name="hotseat_edu_accept">Get app suggestions</string>

quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java

+1 −95

Original line number	Diff line number	Diff line
		@@ -26,22 +26,17 @@ import android.view.View;
		import com.android.launcher3.BubbleTextView;
		import com.android.launcher3.CellLayout;
		import com.android.launcher3.Hotseat;
		import com.android.launcher3.InvariantDeviceProfile;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherSettings;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.Workspace;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.model.data.FolderInfo;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.util.GridOccupancy;
		import com.android.launcher3.util.IntArray;
		import com.android.launcher3.views.ArrowTipView;
		import com.android.launcher3.views.Snackbar;

		import java.util.ArrayDeque;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.stream.IntStream;
		@@ -74,101 +69,12 @@ public class HotseatEduController {
		*/
		void migrate() {
		HotseatRestoreHelper.createBackup(mLauncher);
		if (FeatureFlags.HOTSEAT_MIGRATE_TO_FOLDER.get()) {
		migrateToFolder();
		} else {
		migrateHotseatWhole();
		}
		Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_enabled,
		R.string.hotseat_prediction_settings, null,
		() -> mLauncher.startActivity(getSettingsIntent()));
		}

		/**
		* This migration places all non folder items in the hotseat into a folder and then moves
		* all folders in the hotseat to a workspace page that has enough empty spots.
		*
		* @return pageId that has accepted the items.
		*/
		private int migrateToFolder() {
		ArrayDeque<FolderInfo> folders = new ArrayDeque<>();
		ArrayList<WorkspaceItemInfo> putIntoFolder = new ArrayList<>();

		//separate folders and items that can get in folders
		for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) {
		View view = mHotseat.getChildAt(i, 0);
		if (view == null) continue;
		ItemInfo info = (ItemInfo) view.getTag();
		if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
		folders.add((FolderInfo) info);
		} else if (info instanceof WorkspaceItemInfo && info.container == LauncherSettings
		.Favorites.CONTAINER_HOTSEAT) {
		putIntoFolder.add((WorkspaceItemInfo) info);
		}
		}

		// create a temp folder and add non folder items to it
		if (!putIntoFolder.isEmpty()) {
		ItemInfo firstItem = putIntoFolder.get(0);
		FolderInfo folderInfo = new FolderInfo();
		mLauncher.getModelWriter().addItemToDatabase(folderInfo, firstItem.container,
		firstItem.screenId, firstItem.cellX, firstItem.cellY);
		folderInfo.setTitle("", mLauncher.getModelWriter());
		folderInfo.contents.addAll(putIntoFolder);
		for (int i = 0; i < folderInfo.contents.size(); i++) {
		ItemInfo item = folderInfo.contents.get(i);
		item.rank = i;
		mLauncher.getModelWriter().moveItemInDatabase(item, folderInfo.id, 0,
		item.cellX, item.cellY);
		}
		folders.add(folderInfo);
		}
		mNewItems.addAll(folders);

		return placeFoldersInWorkspace(folders);
		}

		private int placeFoldersInWorkspace(ArrayDeque<FolderInfo> folders) {
		if (folders.isEmpty()) return 0;

		Workspace<?> workspace = mLauncher.getWorkspace();
		InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv;

		GridOccupancy[] occupancyList = new GridOccupancy[workspace.getChildCount()];
		for (int i = 0; i < occupancyList.length; i++) {
		occupancyList[i] = ((CellLayout) workspace.getChildAt(i)).cloneGridOccupancy();
		}
		//scan every screen to find available spots to place folders
		int occupancyIndex = 0;
		int[] itemXY = new int[2];
		while (occupancyIndex < occupancyList.length && !folders.isEmpty()) {
		GridOccupancy occupancy = occupancyList[occupancyIndex];
		if (occupancy.findVacantCell(itemXY, 1, 1)) {
		FolderInfo info = folders.poll();
		mLauncher.getModelWriter().moveItemInDatabase(info,
		LauncherSettings.Favorites.CONTAINER_DESKTOP,
		workspace.getScreenIdForPageIndex(occupancyIndex), itemXY[0], itemXY[1]);
		occupancy.markCells(info, true);
		} else {
		occupancyIndex++;
		}
		}
		if (folders.isEmpty()) return workspace.getScreenIdForPageIndex(occupancyIndex);
		int screenId = LauncherSettings.Settings.call(mLauncher.getContentResolver(),
		LauncherSettings.Settings.METHOD_NEW_SCREEN_ID)
		.getInt(LauncherSettings.Settings.EXTRA_VALUE);
		// if all screens are full and we still have folders left, put those on a new page
		FolderInfo folderInfo;
		int col = 0;
		while ((folderInfo = folders.poll()) != null) {
		mLauncher.getModelWriter().moveItemInDatabase(folderInfo,
		LauncherSettings.Favorites.CONTAINER_DESKTOP, screenId, col++,
		idp.numRows - 1);
		}
		mNewScreens = IntArray.wrap(screenId);
		return workspace.getPageCount();
		}

		/**
		* This migration option attempts to move the entire hotseat up to the first workspace that
		* has space to host items. If no such page is found, it moves items to a new page.

quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -15,8 +15,7 @@
		*/
		package com.android.launcher3.hybridhotseat;

		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent
		.LAUNCHER_HOTSEAT_EDU_ACCEPT;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_ACCEPT;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_DENY;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_SEEN;

		@@ -39,7 +38,6 @@ import com.android.launcher3.InvariantDeviceProfile;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.R;
		import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.uioverrides.PredictedAppIcon;
		import com.android.launcher3.views.AbstractSlideInView;
		@@ -112,12 +110,6 @@ public class HotseatEduDialog extends AbstractSlideInView<Launcher> implements I
		((LinearLayout.LayoutParams) buttonContainer.getLayoutParams()).setMarginEnd(
		adjustedMarginEnd);
		}

		// update ui to reflect which migration method is going to be used
		if (FeatureFlags.HOTSEAT_MIGRATE_TO_FOLDER.get()) {
		((TextView) findViewById(R.id.hotseat_edu_content)).setText(
		R.string.hotseat_edu_message_migrate_alt);
		}
		}

		private void onAccept(View v) {

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
		import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_WIDGET_APP_START;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
		import static com.android.launcher3.testing.shared.TestProtocol.HINT_STATE_ORDINAL;
		import static com.android.launcher3.testing.shared.TestProtocol.HINT_STATE_TWO_BUTTON_ORDINAL;
		@@ -339,9 +338,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {

		protected LauncherAppWidgetHost createAppWidgetHost() {
		LauncherAppWidgetHost appWidgetHost = super.createAppWidgetHost();
		if (ENABLE_QUICKSTEP_WIDGET_APP_START.get()) {
		appWidgetHost.setInteractionHandler(new QuickstepInteractionHandler(this));
		}
		return appWidgetHost;
		}

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS
		import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PULL_BACK_TRANSLATION;
		import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
		import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
		@@ -106,7 +105,7 @@ public class NavBarToHomeTouchController implements TouchController,
		if (mStartState.overviewUi \|\| mStartState == ALL_APPS) {
		return true;
		}
		int typeToClose = ENABLE_ALL_APPS_EDU.get() ? TYPE_ALL & ~TYPE_ALL_APPS_EDU : TYPE_ALL;
		int typeToClose = TYPE_ALL & ~TYPE_ALL_APPS_EDU;
		if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) {
		return true;
		}