commit d98610937f8eeed236805ffa9c7dab8c084e23be
author Colin Cross <ccross@android.com> Thu Dec 16 20:43:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 16 20:43:51 2021 +0000
tree 86f2cefb6f6f6b1ab2137f063c0cb950944fa7aa
parent 74713bf7fe3fcdba3a1865b5b35a0c859b709a1b
parent 0bd628d967a4b54946a08673fb8ffd6be00cbd34

[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours am: 0bd628d967 -s ours

am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history

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

Change-Id: I1344fd107d54b7eef3f773d63cf5691939e1887f

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