Merge "Pass WindowContext to DisplayInfoChangeListener" into sc-dev (cc98cebc) · Commits · e / os / BlissLauncher3

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

+4 −6

Original line number	Diff line number	Diff line
		@@ -27,12 +27,11 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
		import android.animation.AnimatorSet;
		import android.animation.ValueAnimator;
		import android.app.ActivityOptions;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentSender;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.CancellationSignal;
		import android.os.IBinder;
		import android.view.View;

		import androidx.annotation.Nullable;
		@@ -41,7 +40,6 @@ import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.dragndrop.DragOptions;
		import com.android.launcher3.model.WellbeingModel;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.popup.SystemShortcut;
		import com.android.launcher3.proxy.ProxyActivityStarter;
		import com.android.launcher3.proxy.StartActivityParams;
		@@ -73,7 +71,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.ActivityOptionsCompat;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		import java.util.HashMap;
		import java.util.List;
		import java.util.stream.Stream;

		@@ -240,8 +237,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
		}

		@Override
		public void onDisplayInfoChanged(DisplayController.Info info, int flags) {
		super.onDisplayInfoChanged(info, flags);
		public void onDisplayInfoChanged(Context context, DisplayController.Info info,
		int flags) {
		super.onDisplayInfoChanged(context, info, flags);
		if ((flags & CHANGE_SIZE) != 0) {
		addTaskbarIfNecessary();
		}

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ public class RecentsAnimationDeviceState implements
		public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
		mDisplayController.removeChangeListener(this);
		mDisplayController.addChangeListener(this);
		onDisplayInfoChanged(mDisplayController.getInfo(), CHANGE_ALL);
		onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);

		if (newMode == NO_BUTTON) {
		mExclusionListener.register();
		@@ -254,7 +254,7 @@ public class RecentsAnimationDeviceState implements
		}

		@Override
		public void onDisplayInfoChanged(Info info, int flags) {
		public void onDisplayInfoChanged(Context context, Info info, int flags) {
		if (info.id != getDisplayId() \|\| flags == CHANGE_FRAME_DELAY) {
		// ignore displays that aren't running launcher and frame refresh rate changes
		return;

quickstep/src/com/android/quickstep/RotationTouchHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -225,7 +225,7 @@ public class RotationTouchHelper implements
		public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
		mDisplayController.removeChangeListener(this);
		mDisplayController.addChangeListener(this);
		onDisplayInfoChanged(mDisplayController.getInfo(), CHANGE_ALL);
		onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);

		mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfo(),
		mContext.getResources());
		@@ -243,7 +243,7 @@ public class RotationTouchHelper implements
		}

		@Override
		public void onDisplayInfoChanged(Info info, int flags) {
		public void onDisplayInfoChanged(Context context, Info info, int flags) {
		if (info.id != mDisplayId\|\| flags == CHANGE_FRAME_DELAY) {
		// ignore displays that aren't running launcher and frame refresh rate changes
		return;

src/com/android/launcher3/BaseDraggingActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;

		import android.app.ActivityOptions;
		import android.content.ActivityNotFoundException;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.LauncherApps;
		import android.content.res.Configuration;
		@@ -296,7 +297,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
		}

		@Override
		public void onDisplayInfoChanged(Info info, int flags) {
		public void onDisplayInfoChanged(Context context, Info info, int flags) {
		if ((flags & CHANGE_ROTATION) != 0 && mDeviceProfile.updateIsSeascape(this)) {
		reapplyUi();
		}

src/com/android/launcher3/InvariantDeviceProfile.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -203,9 +203,9 @@ public class InvariantDeviceProfile {
		.apply();

		DisplayController.INSTANCE.get(context).addChangeListener(
		(info, flags) -> {
		(displayContext, info, flags) -> {
		if ((flags & (CHANGE_SIZE \| CHANGE_DENSITY)) != 0) {
		onConfigChanged(context);
		onConfigChanged(displayContext);
		}
		});
		mOverlayMonitor = new OverlayMonitor(context);
		@@ -226,7 +226,7 @@ public class InvariantDeviceProfile {
		*/
		public InvariantDeviceProfile(Context context, Display display) {
		// Ensure that the main device profile is initialized
		InvariantDeviceProfile originalProfile = INSTANCE.get(context);
		INSTANCE.get(context);
		String gridName = getCurrentGridName(context);

		// Get the display info based on default display and interpolate it to existing display