commit 7a24bea23dcc2c2bacc5898b0244014ad27c1056
author Xin Li <delphij@google.com> Tue Dec 14 21:24:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 14 21:24:04 2021 +0000
tree ca0159a35848abb1bbbcddbb45e9facb6a04664f
parent 82122082364ee808d495ca53a26e85a05c3cf4c7
parent 18c3599e0eb0124a2c3573c24ffb478b418beaed

[automerger skipped] Merge "Merge Android 12 QPR1" am: 3afd8cbc24 -s ours am: 18c3599e0e -s ours

am skip reason: Merged-In Iae5e73b18d8885df51c1fca1ef27e277721a8237 with SHA-1 c4a6b5cc40 is already in history

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

Change-Id: I39d97b168e3cf0095fba940af737ddf76e66a15f

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

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 444d77a..fde6902 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -58,8 +58,6 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.Surface;
 
@@ -67,7 +65,6 @@
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
@@ -591,8 +588,7 @@
             final Info displayInfo = mDisplayController.getInfo();
             return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90
-                && displayInfo.rotation != Surface.ROTATION_270
-                && displayInfo.densityDpi < DisplayMetrics.DENSITY_600);
+                && displayInfo.rotation != Surface.ROTATION_270);
         }
         return false;
     }