Snap for 9305793 from 193f8992f1e6c999fc1a1162ad7905621b7730ae to tm-qpr2-release (aa5f6a36) · Commits · e / os / android_packages_apps_Trebuchet

go/src/com/android/launcher3/model/WidgetsModel.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -41,10 +41,8 @@ import java.util.Set;
		*/
		public class WidgetsModel {

		// True if the widget support is disabled.
		// True is the widget support is disabled.
		public static final boolean GO_DISABLE_WIDGETS = true;
		// True if the shortcut support is disabled.
		public static final boolean GO_DISABLE_SHORTCUTS = true;
		public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;

		private static final ArrayList<WidgetsListBaseEntry> EMPTY_WIDGET_LIST = new ArrayList<>();

lint-baseline-launcher3.xml

+16 −0

Original line number	Diff line number	Diff line
		@@ -606,4 +606,20 @@
		column="61"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level 33 (current min is 26): `android.app.Activity#getOnBackInvokedDispatcher`">
		<location
		file="packages/apps/Launcher3/src/com/android/launcher3/BaseActivity.java"
		line="182"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level 33 (current min is 26): `android.window.OnBackInvokedDispatcher#registerOnBackInvokedCallback`">
		<location
		file="packages/apps/Launcher3/src/com/android/launcher3/BaseActivity.java"
		line="182"/>
		</issue>

		</issues>

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		public static final int SPLIT_DIVIDER_ANIM_DURATION = 100;

		public static final int CONTENT_ALPHA_DURATION = 217;
		public static final int TRANSIENT_TASKBAR_TRANSITION_DURATION = 417;
		public static final int TASKBAR_TO_APP_DURATION = 600;
		// TODO(b/236145847): Tune TASKBAR_TO_HOME_DURATION to 383 after conflict with unlock animation
		// is solved.

quickstep/src/com/android/launcher3/model/WellbeingModel.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package com.android.launcher3.model;

		import static android.content.ContentResolver.SCHEME_CONTENT;

		import static com.android.launcher3.Utilities.newContentObserver;

		import android.annotation.TargetApi;
		import android.app.RemoteAction;
		import android.content.ContentProviderClient;

quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java

+52 −6

Original line number	Diff line number	Diff line
		@@ -15,20 +15,29 @@
		*/
		package com.android.launcher3.popup;

		import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE;
		import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition;
		import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT;

		import android.content.Intent;
		import android.graphics.Bitmap;
		import android.graphics.Rect;
		import android.graphics.RectF;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.util.Log;
		import android.view.View;

		import com.android.launcher3.AbstractFloatingView;
		import com.android.launcher3.R;
		import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.logging.StatsLogManager;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.uioverrides.QuickstepLauncher;
		import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
		import com.android.quickstep.util.SplitSelectStateController;
		import com.android.quickstep.views.FloatingTaskView;
		import com.android.quickstep.views.RecentsView;

		public interface QuickstepSystemShortcut {
		@@ -44,6 +53,10 @@ public interface QuickstepSystemShortcut {

		class SplitSelectSystemShortcut extends SystemShortcut<QuickstepLauncher> {

		private final int mSplitPlaceholderSize;
		private final int mSplitPlaceholderInset;

		private final Rect mTempRect = new Rect();
		private final SplitPositionOption mPosition;

		public SplitSelectSystemShortcut(QuickstepLauncher launcher, ItemInfo itemInfo,
		@@ -51,6 +64,11 @@ public interface QuickstepSystemShortcut {
		super(position.iconResId, position.textResId, launcher, itemInfo, originalView);

		mPosition = position;

		mSplitPlaceholderSize = launcher.getResources().getDimensionPixelSize(
		R.dimen.split_placeholder_size);
		mSplitPlaceholderInset = launcher.getResources().getDimensionPixelSize(
		R.dimen.split_placeholder_inset);
		}

		@Override
		@@ -72,11 +90,39 @@ public interface QuickstepSystemShortcut {
		return;
		}

		RecentsView recentsView = mTarget.getOverviewPanel();
		StatsLogManager.EventEnum splitEvent = getLogEventForPosition(mPosition.stagePosition);
		recentsView.initiateSplitSelect(
		new SplitSelectSource(mOriginalView, new BitmapDrawable(bitmap), intent,
		mPosition, mItemInfo, splitEvent));
		SplitSelectSource source = new SplitSelectSource(mOriginalView,
		new BitmapDrawable(bitmap), intent, mPosition, mItemInfo, splitEvent);
		if (ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()) {
		startSplitToHome(source);
		} else {
		RecentsView recentsView = mTarget.getOverviewPanel();
		recentsView.initiateSplitSelect(source);
		}
		}

		private void startSplitToHome(SplitSelectSource source) {
		AbstractFloatingView.closeAllOpenViews(mTarget);

		SplitSelectStateController controller = mTarget.getSplitSelectStateController();
		controller.setInitialTaskSelect(source.intent, source.position.stagePosition,
		source.itemInfo, source.splitEvent);

		RecentsView recentsView = mTarget.getOverviewPanel();
		recentsView.getPagedOrientationHandler().getInitialSplitPlaceholderBounds(
		mSplitPlaceholderSize, mSplitPlaceholderInset, mTarget.getDeviceProfile(),
		controller.getActiveSplitStagePosition(), mTempRect);

		PendingAnimation anim = new PendingAnimation(TABLET_HOME_TO_SPLIT.getDuration());
		RectF startingTaskRect = new RectF();
		FloatingTaskView floatingTaskView = FloatingTaskView.getFloatingTaskView(mTarget,
		source.view, null /* thumbnail */,
		source.drawable, startingTaskRect);
		floatingTaskView.setAlpha(1);
		floatingTaskView.addStagingAnimation(anim, startingTaskRect, mTempRect,
		false /* fadeWithThumbnail /, true / isStagedTask */);
		controller.setFirstFloatingTaskView(floatingTaskView);
		anim.buildAnim().start();
		}
		}

		@@ -86,7 +132,7 @@ public interface QuickstepSystemShortcut {
		public final Drawable drawable;
		public final Intent intent;
		public final SplitPositionOption position;
		public final ItemInfo mItemInfo;
		public final ItemInfo itemInfo;
		public final StatsLogManager.EventEnum splitEvent;

		public SplitSelectSource(View view, Drawable drawable, Intent intent,
		@@ -96,7 +142,7 @@ public interface QuickstepSystemShortcut {
		this.drawable = drawable;
		this.intent = intent;
		this.position = position;
		this.mItemInfo = itemInfo;
		this.itemInfo = itemInfo;
		this.splitEvent = splitEvent;
		}
		}