Merge "Support different task icon margin for grid tasks" into sc-v2-dev (2683bd77) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/values/dimens.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,8 @@

		<dimen name="overview_minimum_next_prev_size">50dp</dimen>
		<dimen name="overview_task_margin">16dp</dimen>
		<dimen name="overview_task_margin_grid">12dp</dimen>
		<dimen name="overview_task_margin_focused">12dp</dimen>
		<dimen name="overview_task_margin_grid">4dp</dimen>

		<!-- Overrideable in overlay that provides the Overview Actions. -->
		<dimen name="overview_actions_height">48dp</dimen>
		@@ -45,8 +46,8 @@
		<dimen name="overview_actions_horizontal_margin">16dp</dimen>

		<dimen name="overview_grid_side_margin">50dp</dimen>
		<dimen name="overview_grid_row_spacing_portrait">37.13dp</dimen>
		<dimen name="overview_grid_row_spacing_landscape">33.38dp</dimen>
		<dimen name="overview_grid_row_spacing_portrait">17.13dp</dimen>
		<dimen name="overview_grid_row_spacing_landscape">13.38dp</dimen>
		<dimen name="overview_grid_focus_vertical_margin">0dp</dimen>

		<!-- These speeds are in dp/s -->

quickstep/src/com/android/quickstep/views/RecentsView.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1329,6 +1329,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		mFocusedTaskViewId = newFocusedTaskView != null ?
		newFocusedTaskView.getTaskViewId() : -1;
		updateTaskSize();
		updateChildTaskOrientations();

		TaskView newRunningTaskView = null;
		if (runningTaskId != -1) {
		@@ -1977,7 +1978,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		return as;
		}


		private void updateChildTaskOrientations() {
		for (int i = 0; i < getTaskViewCount(); i++) {
		getTaskViewAt(i).setOrientationState(mOrientationState);
		@@ -2120,6 +2120,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		setRunningTaskHidden(runningTaskTileHidden);
		// Update task size after setting current task.
		updateTaskSize();
		updateChildTaskOrientations();

		// Reload the task list
		mTaskListChangeId = mModel.getTasks(this::applyLoadPlan);
		@@ -2829,6 +2830,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		finalNextFocusedTaskView.animateIconScaleAndDimIntoView();
		}
		updateTaskSize(/isTaskDismissal=/ true);
		updateChildTaskOrientations();
		// Update scroll and snap to page.
		updateScrollSynchronously();

quickstep/src/com/android/quickstep/views/TaskView.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -825,8 +825,11 @@ public class TaskView extends FrameLayout implements Reusable {
		LayoutParams snapshotParams = (LayoutParams) mSnapshotView.getLayoutParams();
		DeviceProfile deviceProfile = mActivity.getDeviceProfile();
		snapshotParams.topMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;
		int taskIconMargin = deviceProfile.overviewTaskMarginPx;
		boolean isGridTask = deviceProfile.overviewShowAsGrid && !isFocusedTask();
		int taskIconHeight = deviceProfile.overviewTaskIconSizePx;
		int taskMargin = isGridTask ? deviceProfile.overviewTaskMarginGridPx
		: deviceProfile.overviewTaskMarginPx;
		int taskIconMargin = snapshotParams.topMargin - taskIconHeight - taskMargin;
		LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams();
		switch (orientationHandler.getRotation()) {
		case ROTATION_90:
		@@ -858,6 +861,9 @@ public class TaskView extends FrameLayout implements Reusable {
		iconParams.width = iconParams.height = taskIconHeight;
		mIconView.setLayoutParams(iconParams);
		mIconView.setRotation(orientationHandler.getDegreesRotated());
		int iconDrawableSize = isGridTask ? deviceProfile.overviewTaskIconDrawableSizeGridPx
		: deviceProfile.overviewTaskIconDrawableSizePx;
		mIconView.setDrawableSize(iconDrawableSize, iconDrawableSize);
		snapshotParams.topMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;
		mSnapshotView.setLayoutParams(snapshotParams);
		mSnapshotView.getTaskOverlay().updateOrientationState(orientationState);
		@@ -1401,7 +1407,6 @@ public class TaskView extends FrameLayout implements Reusable {
		float boxTranslationY;
		int expectedWidth;
		int expectedHeight;
		int iconDrawableSize;
		DeviceProfile deviceProfile = mActivity.getDeviceProfile();
		if (deviceProfile.overviewShowAsGrid) {
		final int thumbnailPadding = deviceProfile.overviewTaskThumbnailTopMarginPx;
		@@ -1417,13 +1422,11 @@ public class TaskView extends FrameLayout implements Reusable {
		// that is associated with the original orientation of the focused task.
		boxWidth = taskWidth;
		boxHeight = taskHeight;
		iconDrawableSize = deviceProfile.overviewTaskIconDrawableSizePx;
		} else {
		// Otherwise task is in grid, and should use lastComputedGridTaskSize.
		Rect lastComputedGridTaskSize = getRecentsView().getLastComputedGridTaskSize();
		boxWidth = lastComputedGridTaskSize.width();
		boxHeight = lastComputedGridTaskSize.height();
		iconDrawableSize = deviceProfile.overviewTaskIconDrawableSizeGridPx;
		}

		// Bound width/height to the box size.
		@@ -1440,7 +1443,6 @@ public class TaskView extends FrameLayout implements Reusable {
		boxTranslationY = 0f;
		expectedWidth = ViewGroup.LayoutParams.MATCH_PARENT;
		expectedHeight = ViewGroup.LayoutParams.MATCH_PARENT;
		iconDrawableSize = deviceProfile.overviewTaskIconDrawableSizePx;
		}

		setNonGridScale(nonGridScale);
		@@ -1450,7 +1452,6 @@ public class TaskView extends FrameLayout implements Reusable {
		params.height = expectedHeight;
		setLayoutParams(params);
		}
		mIconView.setDrawableSize(iconDrawableSize, iconDrawableSize);
		}

		private float getGridTrans(float endTranslation) {

res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,7 @@
		<dimen name="task_thumbnail_icon_drawable_size">0dp</dimen>
		<dimen name="task_thumbnail_icon_drawable_size_grid">0dp</dimen>
		<dimen name="overview_task_margin">0dp</dimen>
		<dimen name="overview_task_margin_focused">0dp</dimen>
		<dimen name="overview_task_margin_grid">0dp</dimen>
		<dimen name="overview_actions_margin_gesture">0dp</dimen>
		<dimen name="overview_actions_top_margin_gesture_grid_portrait">0dp</dimen>

src/com/android/launcher3/DeviceProfile.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -179,6 +179,7 @@ public class DeviceProfile {
		// Overview
		public final boolean overviewShowAsGrid;
		public int overviewTaskMarginPx;
		public int overviewTaskMarginGridPx;
		public int overviewTaskIconSizePx;
		public int overviewTaskIconDrawableSizePx;
		public int overviewTaskIconDrawableSizeGridPx;
		@@ -354,8 +355,9 @@ public class DeviceProfile {

		overviewShowAsGrid = isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
		overviewTaskMarginPx = overviewShowAsGrid
		? res.getDimensionPixelSize(R.dimen.overview_task_margin_grid)
		? res.getDimensionPixelSize(R.dimen.overview_task_margin_focused)
		: res.getDimensionPixelSize(R.dimen.overview_task_margin);
		overviewTaskMarginGridPx = res.getDimensionPixelSize(R.dimen.overview_task_margin_grid);
		overviewTaskIconSizePx = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_size);
		overviewTaskIconDrawableSizePx =
		res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_drawable_size);