aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Dump mExclusionRegion bounds" into tm-qpr-dev am: 6e59888a89

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

Change-Id: Id7f1e132d3b5cc90d6423677762dd5745e5f802c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham
2022-08-01 15:43:42 +00:00
committed by Automerger Merge Worker
parent 8409354878 6e59888a89
commit a6bbd643cd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
View File

@@ -61,6 +61,7 @@ import android.provider.Settings;
import android.view.MotionEvent;
import androidx.annotation.BinderThread;
import androidx.annotation.NonNull;
import com.android.launcher3.Utilities;
import com.android.launcher3.util.DisplayController;
@@ -124,7 +125,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
};
private int mGestureBlockingTaskId = -1;
private Region mExclusionRegion;
private @NonNull Region mExclusionRegion = new Region();
private SystemGestureExclusionListenerCompat mExclusionListener;
public RecentsAnimationDeviceState(Context context) {
@@ -162,6 +163,10 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
@Override
@BinderThread
public void onExclusionChanged(Region region) {
if (region == null) {
// Don't think this is possible but just in case, don't let it be null.
region = new Region();
}
// Assignments are atomic, it should be safe on binder thread
mExclusionRegion = region;
}
@@ -498,7 +503,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
public boolean isInExclusionRegion(MotionEvent event) {
// mExclusionRegion can change on binder thread, use a local instance here.
Region exclusionRegion = mExclusionRegion;
return mMode == NO_BUTTON && exclusionRegion != null
return mMode == NO_BUTTON
&& exclusionRegion.contains((int) event.getX(), (int) event.getY());
}
@@ -587,7 +592,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
pw.println(" isUserUnlocked=" + mIsUserUnlocked);
pw.println(" isOneHandedModeEnabled=" + mIsOneHandedModeEnabled);
pw.println(" isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled);
pw.println(" deferredGestureRegion=" + mDeferredGestureRegion);
pw.println(" deferredGestureRegion=" + mDeferredGestureRegion.getBounds());
pw.println(" exclusionRegion=" + mExclusionRegion.getBounds());
pw.println(" pipIsActive=" + mPipIsActive);
mRotationTouchHelper.dump(pw);
}