Merge "Update Launcher for removed shared wrappers" into tm-qpr-dev (d2db9167) · Commits · e / os / android_packages_apps_Trebuchet

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

+12 −10

Original line number	Diff line number	Diff line
		@@ -57,6 +57,8 @@ import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.app.ActivityOptions;
		import android.app.WindowConfiguration;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.pm.PackageManager;
		@@ -83,6 +85,7 @@ import android.view.SurfaceControl;
		import android.view.View;
		import android.view.ViewRootImpl;
		import android.view.ViewTreeObserver;
		import android.view.WindowManager;
		import android.view.animation.AnimationUtils;
		import android.view.animation.Interpolator;
		import android.view.animation.PathInterpolator;
		@@ -125,8 +128,6 @@ import com.android.quickstep.util.SurfaceTransactionApplier;
		import com.android.quickstep.util.WorkspaceRevealAnim;
		import com.android.quickstep.views.FloatingWidgetView;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.ActivityCompat;
		import com.android.systemui.shared.system.ActivityOptionsCompat;
		import com.android.systemui.shared.system.BlurUtils;
		import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
		import com.android.systemui.shared.system.QuickStepContract;
		@@ -135,7 +136,6 @@ import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
		import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.RemoteTransitionCompat;
		import com.android.systemui.shared.system.WindowManagerWrapper;
		import com.android.wm.shell.startingsurface.IStartingWindowListener;

		import java.util.ArrayList;
		@@ -294,8 +294,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		RemoteAnimationAdapterCompat adapterCompat =
		new RemoteAnimationAdapterCompat(runner, duration, statusBarTransitionDelay,
		mLauncher.getIApplicationThread());
		return new ActivityOptionsWrapper(
		ActivityOptionsCompat.makeRemoteAnimation(adapterCompat), onEndCallback);
		ActivityOptions options = ActivityOptions.makeRemoteAnimation(
		adapterCompat.getWrapped(),
		adapterCompat.getRemoteTransition().getTransition());
		return new ActivityOptionsWrapper(options, onEndCallback);
		}

		/**
		@@ -1087,8 +1089,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		mWallpaperOpenRunner = createWallpaperOpenRunner(false /* fromUnlock */);

		RemoteAnimationDefinitionCompat definition = new RemoteAnimationDefinitionCompat();
		definition.addRemoteAnimation(WindowManagerWrapper.TRANSIT_WALLPAPER_OPEN,
		WindowManagerWrapper.ACTIVITY_TYPE_STANDARD,
		definition.addRemoteAnimation(WindowManager.TRANSIT_OLD_WALLPAPER_OPEN,
		WindowConfiguration.ACTIVITY_TYPE_STANDARD,
		new RemoteAnimationAdapterCompat(
		new LauncherAnimationRunner(mHandler, mWallpaperOpenRunner,
		false /* startAtFrontOfQueue */),
		@@ -1098,7 +1100,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		if (KEYGUARD_ANIMATION.get()) {
		mKeyguardGoingAwayRunner = createWallpaperOpenRunner(true /* fromUnlock */);
		definition.addRemoteAnimation(
		WindowManagerWrapper.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
		WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
		new RemoteAnimationAdapterCompat(
		new LauncherAnimationRunner(
		mHandler, mKeyguardGoingAwayRunner,
		@@ -1107,7 +1109,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		mLauncher.getIApplicationThread()));
		}

		new ActivityCompat(mLauncher).registerRemoteAnimations(definition);
		mLauncher.registerRemoteAnimations(definition.getWrapped());
		}
		}

		@@ -1143,7 +1145,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		return;
		}
		if (hasControlRemoteAppTransitionPermission()) {
		new ActivityCompat(mLauncher).unregisterRemoteAnimations();
		mLauncher.unregisterRemoteAnimations();

		// Also clear strong references to the runners registered with the remote animation
		// definition so we don't have to wait for the system gc

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,9 +15,10 @@
		*/
		package com.android.launcher3.taskbar;

		import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;

		import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_RESUMED;
		import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
		import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;

		import android.animation.Animator;
		import android.animation.AnimatorSet;

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package com.android.launcher3.taskbar;

		import static android.view.View.AccessibilityDelegate;
		import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
		import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION;

		import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
		import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
		@@ -42,7 +43,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING;
		import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;

		import android.animation.ArgbEvaluator;
		import android.animation.ObjectAnimator;
		@@ -69,6 +69,7 @@ import android.view.View.OnAttachStateChangeListener;
		import android.view.View.OnClickListener;
		import android.view.View.OnHoverListener;
		import android.view.ViewGroup;
		import android.view.ViewTreeObserver;
		import android.view.WindowManager;
		import android.widget.FrameLayout;
		import android.widget.ImageView;
		@@ -88,7 +89,6 @@ import com.android.systemui.shared.rotation.FloatingRotationButton;
		import com.android.systemui.shared.rotation.RotationButton;
		import com.android.systemui.shared.rotation.RotationButtonController;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.systemui.shared.system.ViewTreeObserverWrapper;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -167,7 +167,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		// Variables for moving nav buttons to a separate window above IME
		private boolean mAreNavButtonsInSeparateWindow = false;
		private BaseDragLayer<TaskbarActivityContext> mSeparateWindowParent; // Initialized in init.
		private final ViewTreeObserverWrapper.OnComputeInsetsListener mSeparateWindowInsetsComputer =
		private final ViewTreeObserver.OnComputeInternalInsetsListener mSeparateWindowInsetsComputer =
		this::onComputeInsetsForSeparateWindow;
		private final RecentsHitboxExtender mHitboxExtender = new RecentsHitboxExtender();

		@@ -827,14 +827,14 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		mSeparateWindowParent.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {
		@Override
		public void onViewAttachedToWindow(View view) {
		ViewTreeObserverWrapper.addOnComputeInsetsListener(
		mSeparateWindowParent.getViewTreeObserver(), mSeparateWindowInsetsComputer);
		mSeparateWindowParent.getViewTreeObserver().addOnComputeInternalInsetsListener(
		mSeparateWindowInsetsComputer);
		}

		@Override
		public void onViewDetachedFromWindow(View view) {
		mSeparateWindowParent.removeOnAttachStateChangeListener(this);
		ViewTreeObserverWrapper.removeOnComputeInsetsListener(
		mSeparateWindowParent.getViewTreeObserver().removeOnComputeInternalInsetsListener(
		mSeparateWindowInsetsComputer);
		}
		});
		@@ -862,7 +862,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		mContext.getDragLayer().addView(mNavButtonsView);
		}

		private void onComputeInsetsForSeparateWindow(ViewTreeObserverWrapper.InsetsInfo insetsInfo) {
		private void onComputeInsetsForSeparateWindow(ViewTreeObserver.InternalInsetsInfo insetsInfo) {
		addVisibleButtonsRegion(mSeparateWindowParent, insetsInfo.touchableRegion);
		insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
		}

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.util.AttributeSet;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewTreeObserver;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		@@ -32,9 +33,6 @@ import com.android.launcher3.AbstractFloatingView;
		import com.android.launcher3.testing.TestLogging;
		import com.android.launcher3.testing.shared.TestProtocol;
		import com.android.launcher3.views.BaseDragLayer;
		import com.android.systemui.shared.system.ViewTreeObserverWrapper;
		import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
		import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInsetsListener;

		/**
		* Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
		@@ -42,7 +40,8 @@ import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInset
		public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> {

		private final TaskbarBackgroundRenderer mBackgroundRenderer;
		private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets;
		private final ViewTreeObserver.OnComputeInternalInsetsListener mTaskbarInsetsComputer =
		this::onComputeTaskbarInsets;

		// Initialized in init.
		private TaskbarDragLayerController.TaskbarDragLayerCallbacks mControllerCallbacks;
		@@ -80,7 +79,7 @@ public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> {
		mControllers = mControllerCallbacks.getTouchControllers();
		}

		private void onComputeTaskbarInsets(InsetsInfo insetsInfo) {
		private void onComputeTaskbarInsets(ViewTreeObserver.InternalInsetsInfo insetsInfo) {
		if (mControllerCallbacks != null) {
		mControllerCallbacks.updateInsetsTouchability(insetsInfo);
		}
		@@ -88,7 +87,7 @@ public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> {

		protected void onDestroy(boolean forceDestroy) {
		if (forceDestroy) {
		ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer);
		getViewTreeObserver().removeOnComputeInternalInsetsListener(mTaskbarInsetsComputer);
		}
		}

		@@ -99,8 +98,7 @@ public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> {
		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(),
		mTaskbarInsetsComputer);
		getViewTreeObserver().addOnComputeInternalInsetsListener(mTaskbarInsetsComputer);
		}

		@Override

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,12 +17,12 @@ package com.android.launcher3.taskbar;

		import android.content.res.Resources;
		import android.graphics.Rect;
		import android.view.ViewTreeObserver;

		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.R;
		import com.android.launcher3.util.TouchController;
		import com.android.quickstep.AnimatedFloat;
		import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;

		import java.io.PrintWriter;

		@@ -157,9 +157,9 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa

		/**
		* Called to update the touchable insets.
		* @see InsetsInfo#setTouchableInsets(int)
		* @see ViewTreeObserver.InternalInsetsInfo#setTouchableInsets(int)
		*/
		public void updateInsetsTouchability(InsetsInfo insetsInfo) {
		public void updateInsetsTouchability(ViewTreeObserver.InternalInsetsInfo insetsInfo) {
		mControllers.taskbarInsetsController.updateInsetsTouchability(insetsInfo);
		}