Merge "Fixing minor issue with spatially sorting workspace items for binding."... (0edfe2c8) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -165,8 +165,6 @@ public class Launcher extends Activity
		*/
		protected static final int REQUEST_LAST = 100;

		static final int SCREEN_COUNT = 5;

		// To turn on these properties, type
		// adb shell setprop log.tag.PROPERTY_NAME [VERBOSE \| SUPPRESS]
		static final String DUMP_STATE_PROPERTY = "launcher_dump_state";
		@@ -294,8 +292,6 @@ public class Launcher extends Activity
		private ArrayList<Runnable> mBindOnResumeCallbacks = new ArrayList<Runnable>();
		private ArrayList<Runnable> mOnResumeCallbacks = new ArrayList<Runnable>();

		private Bundle mSavedInstanceState;

		private LauncherModel mModel;
		private IconCache mIconCache;
		@Thunk boolean mUserPresent = true;
		@@ -3614,7 +3610,7 @@ public class Launcher extends Activity
		if (mWorkspace != null) {
		return mWorkspace.getCurrentPage();
		} else {
		return SCREEN_COUNT / 2;
		return 0;
		}
		}

		@@ -4584,7 +4580,6 @@ public class Launcher extends Activity
		Log.d(TAG, "mWorkspaceLoading=" + mWorkspaceLoading);
		Log.d(TAG, "mRestoring=" + mRestoring);
		Log.d(TAG, "mWaitingForResult=" + mWaitingForResult);
		Log.d(TAG, "mSavedInstanceState=" + mSavedInstanceState);
		Log.d(TAG, "sFolders.size=" + sFolders.size());
		mModel.dumpState();
		// TODO(hyunyoungs): add mWidgetsView.dumpState(); or mWidgetsModel.dumpState();

src/com/android/launcher3/LauncherModel.java

+27 −10

Original line number	Diff line number	Diff line
		@@ -2436,20 +2436,37 @@ public class LauncherModel extends BroadcastReceiver
		private void sortWorkspaceItemsSpatially(ArrayList<ItemInfo> workspaceItems) {
		final LauncherAppState app = LauncherAppState.getInstance();
		final InvariantDeviceProfile profile = app.getInvariantDeviceProfile();
		// XXX: review this
		final int screenCols = profile.numColumns;
		final int screenCellCount = profile.numColumns * profile.numRows;
		Collections.sort(workspaceItems, new Comparator<ItemInfo>() {
		@Override
		public int compare(ItemInfo lhs, ItemInfo rhs) {
		int cellCountX = (int) profile.numColumns;
		int cellCountY = (int) profile.numRows;
		int screenOffset = cellCountX * cellCountY;
		int containerOffset = screenOffset * (Launcher.SCREEN_COUNT + 1); // +1 hotseat
		long lr = (lhs.container * containerOffset + lhs.screenId * screenOffset +
		lhs.cellY * cellCountX + lhs.cellX);
		long rr = (rhs.container * containerOffset + rhs.screenId * screenOffset +
		rhs.cellY * cellCountX + rhs.cellX);
		if (lhs.container == rhs.container) {
		// Within containers, order by their spatial position in that container
		switch ((int) lhs.container) {
		case LauncherSettings.Favorites.CONTAINER_DESKTOP: {
		long lr = (lhs.screenId * screenCellCount +
		lhs.cellY * screenCols + lhs.cellX);
		long rr = (rhs.screenId * screenCellCount +
		rhs.cellY * screenCols + rhs.cellX);
		return (int) (lr - rr);
		}
		case LauncherSettings.Favorites.CONTAINER_HOTSEAT: {
		// We currently use the screen id as the rank
		return (int) (lhs.screenId - rhs.screenId);
		}
		default:
		if (LauncherAppState.isDogfoodBuild()) {
		throw new RuntimeException("Unexpected container type when " +
		"sorting workspace items.");
		}
		return 0;
		}
		} else {
		// Between containers, order by hotseat, desktop
		return (int) (lhs.container - rhs.container);
		}
		}
		});
		}