diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:30:05 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:30:05 -0800 |
| commit | 7e8ae158f4a73ee580c468d71ca9a1df6f90a8cd (patch) | |
| tree | bd40604eb4b00a1a0e63edfe28cb0ebe33f23029 /quickstep/src/com/android/quickstep/GestureState.java | |
| parent | ded14cc2110e39408f74abac8a83e0a0f16608d2 (diff) | |
| parent | 962f362912c24802026be9fe38aa0bb8e7dfa5c6 (diff) | |
| download | Launcher3-7e8ae158f4a73ee580c468d71ca9a1df6f90a8cd.tar.gz | |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Ic9b3be62af2271286292cfaf30bda03351c1aaf6
Change-Id: I2af35abec8a5f2c046192cac6006d9cc759d93c9
Diffstat (limited to 'quickstep/src/com/android/quickstep/GestureState.java')
| -rw-r--r-- | quickstep/src/com/android/quickstep/GestureState.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java index c2d8c6214e..575be5f8df 100644 --- a/quickstep/src/com/android/quickstep/GestureState.java +++ b/quickstep/src/com/android/quickstep/GestureState.java @@ -29,13 +29,15 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET_HOME; import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET_NEW_TASK; -import android.annotation.Nullable; import android.annotation.TargetApi; import android.content.Intent; import android.os.Build; import android.view.MotionEvent; import android.view.RemoteAnimationTarget; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; import com.android.quickstep.TopTaskTracker.CachedTaskInfo; @@ -303,6 +305,7 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL /** * @return the running task for this gesture. */ + @Nullable public CachedTaskInfo getRunningTask() { return mRunningTask; } @@ -336,7 +339,7 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL /** * Updates the running task for the gesture to be the given {@param runningTask}. */ - public void updateRunningTask(CachedTaskInfo runningTask) { + public void updateRunningTask(@NonNull CachedTaskInfo runningTask) { mRunningTask = runningTask; } @@ -410,7 +413,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL mEndTarget = target; mStateCallback.setState(STATE_END_TARGET_SET); ActiveGestureLog.INSTANCE.addLog( - /* event= */ "setEndTarget " + mEndTarget, + new ActiveGestureLog.CompoundString("setEndTarget ") + .append(mEndTarget.name()), /* gestureEvent= */ SET_END_TARGET); switch (mEndTarget) { case HOME: |