Merge "Make RotationTouchHelper singleton to report single rotation state" into sc-dev am: 91b83064e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14142324

Change-Id: I64597be4131e69e319885f52c6d7903029113f6a
This commit is contained in:
Vinit Nayak
2021-04-13 23:23:57 +00:00
committed by Automerger Merge Worker
2 changed files with 8 additions and 3 deletions
@@ -138,7 +138,7 @@ public class RecentsAnimationDeviceState implements
mDisplayId = mDisplayHolder.getInfo().id;
mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
runOnDestroy(() -> mDisplayHolder.removeChangeListener(this));
mRotationTouchHelper = new RotationTouchHelper(context, mDisplayHolder);
mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
runOnDestroy(mRotationTouchHelper::destroy);
// Register for user unlocked if necessary
@@ -28,9 +28,11 @@ import android.view.MotionEvent;
import android.view.OrientationEventListener;
import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.DisplayController.DisplayHolder;
import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
import com.android.launcher3.util.DisplayController.Info;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.quickstep.util.RecentsOrientedState;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.QuickStepContract;
@@ -43,6 +45,9 @@ public class RotationTouchHelper implements
SysUINavigationMode.NavigationModeChangeListener,
DisplayInfoChangeListener {
public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
new MainThreadInitializedObject<>(RotationTouchHelper::new);
private final OrientationTouchTransformer mOrientationTouchTransformer;
private final DisplayHolder mDisplayHolder;
private final SysUINavigationMode mSysUiNavMode;
@@ -121,9 +126,9 @@ public class RotationTouchHelper implements
private final Context mContext;
public RotationTouchHelper(Context context, DisplayHolder displayHolder) {
private RotationTouchHelper(Context context) {
mContext = context;
mDisplayHolder = displayHolder;
mDisplayHolder = DisplayController.getDefaultDisplay(context);
Resources resources = mContext.getResources();
mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
mDisplayId = mDisplayHolder.getInfo().id;