Snap for 11220357 from b7a5eb9ef418c9dce6f597244d2fb5b9b491610d to 24Q1-release (6295aabd) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/util/TaskViewSimulator.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -427,9 +427,16 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
		// conflict with layers that WM core positions (ie. the input consumers). For shell
		// transitions, the animation leashes are reparented to an animation container so we
		// can bump layers as needed.
		if (ENABLE_SHELL_TRANSITIONS) {
		builder.setLayer(mDrawsBelowRecents
		? Integer.MIN_VALUE + app.prefixOrderIndex
		: ENABLE_SHELL_TRANSITIONS ? Integer.MAX_VALUE : 0);
		// 1000 is an arbitrary number to give room for multiple layers.
		: Integer.MAX_VALUE - 1000 + app.prefixOrderIndex);
		} else {
		builder.setLayer(mDrawsBelowRecents
		? Integer.MIN_VALUE + app.prefixOrderIndex
		: 0);
		}
		}
		}

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -1035,9 +1035,6 @@ public class TaskView extends FrameLayout implements Reusable {
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		if (!recentsView.showAsGrid()) {
		return;
		}
		recentsView.runActionOnRemoteHandles(
		(Consumer<RemoteTargetHandle>) remoteTargetHandle ->
		remoteTargetHandle

src/com/android/launcher3/DeviceProfile.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ public class DeviceProfile {
		final Resources res = context.getResources();
		mMetrics = res.getDisplayMetrics();

		mIconSizeSteps = mIsResponsiveGrid ? new IconSizeSteps(res) : null;
		mIconSizeSteps = new IconSizeSteps(res);

		// Determine sizes.
		widthPx = windowBounds.bounds.width();
		@@ -1486,6 +1486,17 @@ public class DeviceProfile {
		folderCellWidthPx = roundPxValueFromFloat(folderCellWidthPx * scale);
		folderCellHeightPx = roundPxValueFromFloat(folderCellHeightPx * scale);
		}
		// Recalculating padding and cell height
		folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);

		CellContentDimensions cellContentDimensions = new CellContentDimensions(
		folderChildIconSizePx,
		folderChildDrawablePaddingPx,
		folderChildTextSizePx);
		cellContentDimensions.resizeToFitCellHeight(folderCellHeightPx, mIconSizeSteps);
		folderChildIconSizePx = cellContentDimensions.getIconSizePx();
		folderChildDrawablePaddingPx = cellContentDimensions.getIconDrawablePaddingPx();
		folderChildTextSizePx = cellContentDimensions.getIconTextSizePx();

		folderContentPaddingTop = roundPxValueFromFloat(folderContentPaddingTop * scale);
		folderCellLayoutBorderSpacePx = new Point(
		@@ -1493,10 +1504,7 @@ public class DeviceProfile {
		roundPxValueFromFloat(folderCellLayoutBorderSpacePx.y * scale)
		);
		folderFooterHeightPx = roundPxValueFromFloat(folderFooterHeightPx * scale);

		folderContentPaddingLeftRight = folderCellLayoutBorderSpacePx.x;

		folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);
		} else {
		int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding)
		* scale);

src/com/android/launcher3/widget/LauncherAppWidgetHostView.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.launcher3.widget;
		import android.annotation.TargetApi;
		import android.appwidget.AppWidgetProviderInfo;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.os.Build;
		import android.os.Handler;
		@@ -32,7 +31,6 @@ import android.util.SparseBooleanArray;
		import android.util.SparseIntArray;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewDebug;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.widget.AdapterView;
		@@ -79,9 +77,6 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView
		private final CheckLongPressHelper mLongPressHelper;
		protected final Launcher mLauncher;

		@ViewDebug.ExportedProperty(category = "launcher")
		private boolean mReinflateOnConfigChange;

		// Maintain the color manager.
		private final LocalColorExtractor mColorExtractor;

		@@ -176,17 +171,6 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView

		// The provider info or the views might have changed.
		checkIfAutoAdvance();

		// It is possible that widgets can receive updates while launcher is not in the foreground.
		// Consequently, the widgets will be inflated for the orientation of the foreground activity
		// (framework issue). On resuming, we ensure that any widgets are inflated for the current
		// orientation.
		mReinflateOnConfigChange = !isSameOrientation();
		}

		private boolean isSameOrientation() {
		return mLauncher.getResources().getConfiguration().orientation ==
		mLauncher.getOrientation();
		}

		private boolean checkScrollableRecursively(ViewGroup viewGroup) {
		@@ -450,17 +434,6 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView
		scheduleNextAdvance();
		}

		@Override
		protected void onConfigurationChanged(Configuration newConfig) {
		super.onConfigurationChanged(newConfig);

		// Only reinflate when the final configuration is same as the required configuration
		if (mReinflateOnConfigChange && isSameOrientation()) {
		mReinflateOnConfigChange = false;
		reInflate();
		}
		}

		public void reInflate() {
		if (!isAttachedToWindow()) {
		return;