Change taskbar edu size to wrap around icons (c9a317c7) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/values/dimens.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -268,6 +268,7 @@
	<dimen name="taskbar_stashed_handle_height">4dp</dimen>		<dimen name="taskbar_stashed_handle_height">4dp</dimen>
	<dimen name="taskbar_edu_wave_anim_trans_y">25dp</dimen>		<dimen name="taskbar_edu_wave_anim_trans_y">25dp</dimen>
	<dimen name="taskbar_edu_wave_anim_trans_y_return_overshoot">4dp</dimen>		<dimen name="taskbar_edu_wave_anim_trans_y_return_overshoot">4dp</dimen>
			<dimen name="taskbar_edu_horizontal_margin">112dp</dimen>
	<dimen name="taskbar_nav_buttons_width_kids">88dp</dimen>		<dimen name="taskbar_nav_buttons_width_kids">88dp</dimen>
	<dimen name="taskbar_nav_buttons_height_kids">40dp</dimen>		<dimen name="taskbar_nav_buttons_height_kids">40dp</dimen>
	<dimen name="taskbar_nav_buttons_corner_radius_kids">40dp</dimen>		<dimen name="taskbar_nav_buttons_corner_radius_kids">40dp</dimen>

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -217,5 +217,9 @@ public class TaskbarEduController implements TaskbarControllers.LoggableTaskbarC
	v -> mTaskbarEduView.snapToPage(currentPage + 1));		v -> mTaskbarEduView.snapToPage(currentPage + 1));
	}		}
	}		}

			int getIconLayoutBoundsWidth() {
			return mControllers.taskbarViewController.getIconLayoutBounds().width();
			}
	}		}
	}		}

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

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,9 @@ public class TaskbarEduView extends AbstractSlideInView<TaskbarActivityContext>

	private final Rect mInsets = new Rect();		private final Rect mInsets = new Rect();

			// Initialized in init.
			private TaskbarEduController.TaskbarEduCallbacks mTaskbarEduCallbacks;

	private Button mStartButton;		private Button mStartButton;
	private Button mEndButton;		private Button mEndButton;
	private TaskbarEduPagedView mPagedView;		private TaskbarEduPagedView mPagedView;
	@@ -56,6 +59,7 @@ public class TaskbarEduView extends AbstractSlideInView<TaskbarActivityContext>
	if (mPagedView != null) {		if (mPagedView != null) {
	mPagedView.setControllerCallbacks(callbacks);		mPagedView.setControllerCallbacks(callbacks);
	}		}
			mTaskbarEduCallbacks = callbacks;
	}		}

	@Override		@Override
	@@ -101,6 +105,22 @@ public class TaskbarEduView extends AbstractSlideInView<TaskbarActivityContext>
	Settings.Secure.LAUNCHER_TASKBAR_EDUCATION_SHOWING, 0);		Settings.Secure.LAUNCHER_TASKBAR_EDUCATION_SHOWING, 0);
	}		}

			@Override
			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
			super.onMeasure(widthMeasureSpec, heightMeasureSpec);

			int contentWidth = Math.min(getContentAreaWidth(), getMeasuredWidth());
			contentWidth = Math.max(contentWidth, mTaskbarEduCallbacks.getIconLayoutBoundsWidth());
			int contentAreaWidthSpec = MeasureSpec.makeMeasureSpec(contentWidth, MeasureSpec.EXACTLY);

			mContent.measure(contentAreaWidthSpec, MeasureSpec.UNSPECIFIED);
			}

			private int getContentAreaWidth() {
			return mTaskbarEduCallbacks.getIconLayoutBoundsWidth()
			+ getResources().getDimensionPixelSize(R.dimen.taskbar_edu_horizontal_margin) * 2;
			}

	/** Show the Education flow. */		/** Show the Education flow. */
	public void show() {		public void show() {
	attachToContainer();		attachToContainer();