commit 82122082364ee808d495ca53a26e85a05c3cf4c7
author Xin Li <delphij@google.com> Thu Nov 18 22:00:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 18 22:00:56 2021 +0000
tree ca0159a35848abb1bbbcddbb45e9facb6a04664f
parent ebfdc30b46568409bcbb439a621cdc12ba4f5f12
parent c4a6b5cc403b6b534cbe30bc84dcd4ef69c331d8

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: c4a6b5cc40 -s ours

am skip reason: Merged-In I40bef9eb41bfedf73ac4bd0ff0050833d2a9623c with SHA-1 447bd19ff4 is already in history

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

Change-Id: I972c43a577d6ce277f6701f240bd3d366dc85512

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;
     }