Merge "Update overview grid icon sizes and paddings" into tm-dev (c9f3cc36) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/values-sw720dp/dimens.xml

+6 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,11 @@
		*/
		-->
		<resources>
		<dimen name="overview_grid_row_spacing">44dp</dimen>
		<dimen name="overview_task_margin">16dp</dimen>
		<dimen name="overview_task_margin_grid">16dp</dimen>
		<dimen name="overview_grid_side_margin">64dp</dimen>
		<dimen name="overview_grid_row_spacing">36dp</dimen>
		<dimen name="overview_page_spacing">44dp</dimen>
		<dimen name="task_thumbnail_icon_drawable_size">44dp</dimen>
		<dimen name="task_thumbnail_icon_drawable_size_grid">44dp</dimen>
		</resources>

quickstep/src/com/android/launcher3/taskbar/TaskbarEduPagedView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class TaskbarEduPagedView extends PagedView<PageIndicatorDots> {
		}

		@Override
		protected int getChildGap() {
		protected int getChildGap(int fromIndex, int toIndex) {
		return mTaskbarEduView.getPaddingLeft() + mTaskbarEduView.getPaddingRight();
		}

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

+25 −6

Original line number	Diff line number	Diff line
		@@ -1078,10 +1078,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		private int getSnapToLastTaskScrollDiff() {
		// Snap to a position where ClearAll is just invisible.
		int screenStart = mOrientationHandler.getPrimaryScroll(this);
		int clearAllWidth = mOrientationHandler.getPrimarySize(mClearAllButton);
		int clearAllScroll = getScrollForPage(indexOfChild(mClearAllButton));
		int targetScroll = clearAllScroll + (mIsRtl ? clearAllWidth : -clearAllWidth);
		return screenStart - targetScroll;
		int clearAllWidth = mOrientationHandler.getPrimarySize(mClearAllButton);
		int lastTaskScroll = getLastTaskScroll(clearAllScroll, clearAllWidth);
		return screenStart - lastTaskScroll;
		}

		private int getLastTaskScroll(int clearAllScroll, int clearAllWidth) {
		int distance = clearAllWidth + getClearAllExtraPageSpacing();
		return clearAllScroll + (mIsRtl ? distance : -distance);
		}

		private int getSnapToFocusedTaskScrollDiff(boolean isClearAllHidden) {
		@@ -4514,6 +4519,19 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		updateMinAndMaxScrollX();
		}

		@Override
		protected int getChildGap(int fromIndex, int toIndex) {
		int clearAllIndex = indexOfChild(mClearAllButton);
		return fromIndex == clearAllIndex \|\| toIndex == clearAllIndex
		? getClearAllExtraPageSpacing() : 0;
		}

		private int getClearAllExtraPageSpacing() {
		return showAsGrid()
		? Math.max(mActivity.getDeviceProfile().overviewGridSideMargin - mPageSpacing, 0)
		: 0;
		}

		@Override
		protected void updateMinAndMaxScrollX() {
		super.updateMinAndMaxScrollX();
		@@ -4596,9 +4614,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		TaskView taskView = requireTaskViewAt(i);
		float scrollDiff = taskView.getScrollAdjustment(showAsFullscreen, showAsGrid);
		int pageScroll = newPageScrolls[i] + (int) scrollDiff;
		if ((mIsRtl && pageScroll < clearAllScroll + clearAllWidth)
		\|\| (!mIsRtl && pageScroll > clearAllScroll - clearAllWidth)) {
		pageScroll = clearAllScroll + (mIsRtl ? clearAllWidth : -clearAllWidth);
		int lastTaskScroll = getLastTaskScroll(clearAllScroll, clearAllWidth);
		if ((mIsRtl && pageScroll < lastTaskScroll)
		\|\| (!mIsRtl && pageScroll > lastTaskScroll)) {
		pageScroll = lastTaskScroll;
		}
		if (outPageScrolls[i] != pageScroll) {
		pageScrollChanged = true;

src/com/android/launcher3/PagedView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -775,7 +775,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
		pageScrollChanged = true;
		outPageScrolls[i] = pageScroll;
		}
		childStart += primaryDimension + getChildGap();
		childStart += primaryDimension + getChildGap(i, i + delta);

		// This makes sure that the space is added after the page, not after each panel
		int lastPanel = mIsRtl ? 0 : panelCount - 1;
		@@ -799,7 +799,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
		return pageScrollChanged;
		}

		protected int getChildGap() {
		protected int getChildGap(int fromIndex, int toIndex) {
		return 0;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli
		}

		@Override
		protected int getChildGap() {
		protected int getChildGap(int fromIndex, int toIndex) {
		return getPaddingLeft() + getPaddingRight();
		}