Merge "[13/n] Letterbox Education: change dialog width and handle oveflow cases." (e10d3a41) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml

+88 −68

Original line number	Diff line number	Diff line
		@@ -22,21 +22,37 @@

		<!-- The background of the top-level layout acts as the background dim. -->

		<!-- Setting the alpha of the dialog container to 0, since it shouldn't be visible until the
		<!-- Vertical margin will be set dynamically since it depends on task bounds.
		Setting the alpha of the dialog container to 0, since it shouldn't be visible until the
		enter animation starts. -->
		<LinearLayout
		<FrameLayout
		android:id="@+id/letterbox_education_dialog_container"
		android:layout_width="wrap_content"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginHorizontal="@dimen/letterbox_education_dialog_margin"
		android:background="@drawable/letterbox_education_dialog_background"
		android:alpha="0"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintWidth_max="@dimen/letterbox_education_dialog_width"
		app:layout_constrainedHeight="true">

		<!-- The ScrollView should only wrap the content of the dialog, otherwise the background
		corner radius will be cut off when scrolling to the top/bottom. -->
		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center_horizontal"
		android:orientation="vertical"
		android:background="@drawable/letterbox_education_dialog_background"
		android:padding="24dp"
		android:alpha="0">
		android:padding="24dp">

		<ImageView
		android:id="@+id/letterbox_education_icon"
		android:layout_width="@dimen/letterbox_education_dialog_icon_size"
		android:layout_height="@dimen/letterbox_education_dialog_icon_size"
		android:layout_marginBottom="12dp"
		@@ -44,9 +60,8 @@

		<TextView
		android:id="@+id/letterbox_education_dialog_title"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:maxWidth="@dimen/letterbox_education_dialog_title_max_width"
		android:lineSpacingExtra="4sp"
		android:text="@string/letterbox_education_dialog_title"
		android:textAlignment="center"
		@@ -54,10 +69,9 @@
		android:textSize="24sp"/>

		<TextView
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:maxWidth="@dimen/letterbox_education_dialog_title_max_width"
		android:lineSpacingExtra="4sp"
		android:text="@string/letterbox_education_dialog_subtext"
		android:textAlignment="center"
		@@ -80,7 +94,8 @@
		<com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogActionLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/letterbox_education_dialog_space_between_actions"
		android:layout_marginStart=
		"@dimen/letterbox_education_dialog_space_between_actions"
		app:icon="@drawable/letterbox_education_ic_reposition"
		app:text="@string/letterbox_education_reposition_text"/>

		@@ -91,7 +106,8 @@
		android:layout_width="match_parent"
		android:layout_height="56dp"
		android:layout_marginTop="48dp"
		android:background="@drawable/letterbox_education_dismiss_button_background_ripple"
		android:background=
		"@drawable/letterbox_education_dismiss_button_background_ripple"
		android:text="@string/letterbox_education_got_it"
		android:textColor="@android:color/system_neutral1_900"
		android:textAlignment="center"
		@@ -99,4 +115,8 @@

		</LinearLayout>

		</ScrollView>

		</FrameLayout>

		</com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogLayout>

libs/WindowManager/Shell/res/values/dimen.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -225,15 +225,18 @@
		<!-- The size of an icon in the letterbox education dialog. -->
		<dimen name="letterbox_education_dialog_icon_size">48dp</dimen>

		<!-- The fixed width of the dialog if there is enough space in the parent. -->
		<dimen name="letterbox_education_dialog_width">472dp</dimen>

		<!-- The margin between the dialog container and its parent. -->
		<dimen name="letterbox_education_dialog_margin">16dp</dimen>

		<!-- The width of each action container in the letterbox education dialog -->
		<dimen name="letterbox_education_dialog_action_width">140dp</dimen>

		<!-- The space between two actions in the letterbox education dialog -->
		<dimen name="letterbox_education_dialog_space_between_actions">24dp</dimen>

		<!-- The maximum width of the title and subtitle in the letterbox education dialog. -->
		<dimen name="letterbox_education_dialog_title_max_width">444dp</dimen>

		<!-- The width of the brand image on staring surface. -->
		<dimen name="starting_surface_brand_image_width">200dp</dimen>

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -189,15 +189,18 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract {
		}

		@Override
		protected void updateSurfacePosition(Rect taskBounds, Rect stableBounds) {
		@VisibleForTesting
		public void updateSurfacePosition() {
		if (mLayout == null) {
		return;
		}
		// Position of the button in the container coordinate.
		final Rect taskBounds = getTaskBounds();
		final Rect taskStableBounds = getTaskStableBounds();
		final int positionX = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL
		? stableBounds.left - taskBounds.left
		: stableBounds.right - taskBounds.left - mLayout.getMeasuredWidth();
		final int positionY = stableBounds.bottom - taskBounds.top
		? taskStableBounds.left - taskBounds.left
		: taskStableBounds.right - taskBounds.left - mLayout.getMeasuredWidth();
		final int positionY = taskStableBounds.bottom - taskBounds.top
		- mLayout.getMeasuredHeight();

		updateSurfacePosition(positionX, positionY);

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java

+35 −35

Original line number	Diff line number	Diff line
		@@ -51,15 +51,15 @@ import com.android.wm.shell.common.SyncTransactionQueue;
		*/
		public abstract class CompatUIWindowManagerAbstract extends WindowlessWindowManager {

		protected final SyncTransactionQueue mSyncQueue;
		protected final int mDisplayId;
		protected final int mTaskId;

		protected Context mContext;
		protected Configuration mTaskConfig;
		protected ShellTaskOrganizer.TaskListener mTaskListener;
		protected DisplayLayout mDisplayLayout;
		protected final Rect mStableBounds;

		private final SyncTransactionQueue mSyncQueue;
		private final int mDisplayId;
		private Configuration mTaskConfig;
		private ShellTaskOrganizer.TaskListener mTaskListener;
		private DisplayLayout mDisplayLayout;
		private final Rect mStableBounds;

		/**
		* Utility class for adding and releasing a View hierarchy for this {@link
		@@ -211,7 +211,7 @@ public abstract class CompatUIWindowManagerAbstract extends WindowlessWindowMana
		boolean layoutDirectionUpdated =
		mTaskConfig.getLayoutDirection() != prevTaskConfig.getLayoutDirection();
		if (boundsUpdated \|\| layoutDirectionUpdated) {
		updateSurface();
		onParentBoundsChanged();
		}

		if (layout != null && layoutDirectionUpdated) {
		@@ -248,8 +248,9 @@ public abstract class CompatUIWindowManagerAbstract extends WindowlessWindowMana
		displayLayout.getStableBounds(curStableBounds);
		mDisplayLayout = displayLayout;
		if (!prevStableBounds.equals(curStableBounds)) {
		updateSurface();
		// mStableBounds should be updated before we call onParentBoundsChanged.
		mStableBounds.set(curStableBounds);
		onParentBoundsChanged();
		}
		}

		@@ -289,51 +290,39 @@ public abstract class CompatUIWindowManagerAbstract extends WindowlessWindowMana
		}

		/** Re-layouts the view host and updates the surface position. */
		public void relayout() {
		void relayout() {
		relayout(getWindowLayoutParams());
		}

		protected void relayout(WindowManager.LayoutParams windowLayoutParams) {
		if (mViewHost == null) {
		return;
		}
		mViewHost.relayout(getWindowLayoutParams());
		mViewHost.relayout(windowLayoutParams);
		updateSurfacePosition();
		}

		/**
		* Updates the surface following a change in the task bounds, display layout stable bounds,
		* or the layout direction.
		* Called following a change in the task bounds, display layout stable bounds, or the layout
		* direction.
		*/
		protected void updateSurface() {
		protected void onParentBoundsChanged() {
		updateSurfacePosition();
		}

		/**
		* Updates the position of the surface with respect to the task bounds and display layout
		* stable bounds.
		*/
		@VisibleForTesting
		void updateSurfacePosition() {
		if (mLeash == null) {
		return;
		}
		// Use stable bounds to prevent controls from overlapping with system bars.
		final Rect taskBounds = mTaskConfig.windowConfiguration.getBounds();
		final Rect stableBounds = new Rect();
		mDisplayLayout.getStableBounds(stableBounds);
		stableBounds.intersect(taskBounds);

		updateSurfacePosition(taskBounds, stableBounds);
		}

		/**
		* Updates the position of the surface with respect to the given {@code taskBounds} and {@code
		* stableBounds}.
		* Updates the position of the surface with respect to the parent bounds.
		*/
		protected abstract void updateSurfacePosition(Rect taskBounds, Rect stableBounds);
		protected abstract void updateSurfacePosition();

		/**
		* Updates the position of the surface with respect to the given {@code positionX} and {@code
		* positionY}.
		*/
		protected void updateSurfacePosition(int positionX, int positionY) {
		if (mLeash == null) {
		return;
		}
		mSyncQueue.runInSync(t -> {
		if (mLeash == null \|\| !mLeash.isValid()) {
		Log.w(getTag(), "The leash has been released.");
		@@ -347,6 +336,17 @@ public abstract class CompatUIWindowManagerAbstract extends WindowlessWindowMana
		return mContext.getResources().getConfiguration().getLayoutDirection();
		}

		protected Rect getTaskBounds() {
		return mTaskConfig.windowConfiguration.getBounds();
		}

		/** Returns the intersection between the task bounds and the display layout stable bounds. */
		protected Rect getTaskStableBounds() {
		final Rect result = new Rect(mStableBounds);
		result.intersect(getTaskBounds());
		return result;
		}

		@VisibleForTesting
		SurfaceControlViewHost createSurfaceViewHost() {
		return new SurfaceControlViewHost(mContext, mContext.getDisplay(), this);

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduAnimationController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ import com.android.internal.policy.TransitionAnimation;
		class LetterboxEduAnimationController {
		private static final String TAG = "LetterboxEduAnimation";

		private static final int ENTER_ANIM_START_DELAY_MILLIS = 500;

		private final TransitionAnimation mTransitionAnimation;
		private final String mPackageName;
		@AnyRes
		@@ -87,6 +89,9 @@ class LetterboxEduAnimationController {
		mDialogAnimation.getDuration());
		mBackgroundDimAnimator.addListener(getDimAnimatorListener());

		mDialogAnimation.setStartOffset(ENTER_ANIM_START_DELAY_MILLIS);
		mBackgroundDimAnimator.setStartDelay(ENTER_ANIM_START_DELAY_MILLIS);

		dialogContainer.startAnimation(mDialogAnimation);
		mBackgroundDimAnimator.start();
		}