PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Animate expansion of notification panel before ACTION_UP" into udc-qpr-dev am: 24bbc6a577

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

Change-Id: I7c4e217430d23c79002c15e1d0e56ef8919c8c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2023-05-24 21:26:31 +00:00
committed by Automerger Merge Worker
parent d253054ed1 24bbc6a577
commit ebb2c48f6b
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class StatusBarTouchController implements TouchController {
private void dispatchTouchEvent(MotionEvent ev) {
if (mSystemUiProxy.isActive()) {
mLastAction = ev.getActionMasked();
mSystemUiProxy.onStatusBarMotionEvent(ev);
mSystemUiProxy.onStatusBarTouchEvent(ev);
}
}
quickstep/src/com/android/quickstep/SystemUiProxy.java
+14 -3
View File
@@ -314,13 +314,24 @@ public class SystemUiProxy implements ISystemUiProxy {
@MainThread
@Override
public void onStatusBarMotionEvent(MotionEvent event) {
public void onStatusBarTouchEvent(MotionEvent event) {
Preconditions.assertUIThread();
if (mSystemUiProxy != null) {
try {
mSystemUiProxy.onStatusBarMotionEvent(event);
mSystemUiProxy.onStatusBarTouchEvent(event);
} catch (RemoteException e) {
Log.w(TAG, "Failed call onStatusBarMotionEvent", e);
Log.w(TAG, "Failed call onStatusBarTouchEvent with arg: " + event, e);
}
}
}
@Override
public void onStatusBarTrackpadEvent(MotionEvent event) {
if (mSystemUiProxy != null) {
try {
mSystemUiProxy.onStatusBarTrackpadEvent(event);
} catch (RemoteException e) {
Log.w(TAG, "Failed call onStatusBarTrackpadEvent with arg: " + event, e);
}
}
}
quickstep/src/com/android/quickstep/TouchInteractionService.java
+4 -3
View File
@@ -113,7 +113,7 @@ import com.android.quickstep.inputconsumers.OverviewWithoutFocusInputConsumer;
import com.android.quickstep.inputconsumers.ProgressDelegateInputConsumer;
import com.android.quickstep.inputconsumers.ResetGestureInputConsumer;
import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer;
import com.android.quickstep.inputconsumers.StatusBarInputConsumer;
import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer;
import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer;
import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer;
import com.android.quickstep.util.ActiveGestureLog;
@@ -909,8 +909,9 @@ public class TouchInteractionService extends Service
&& !previousGestureState.isRecentsAnimationRunning()) {
reasonString = newCompoundString(reasonPrefix)
.append(SUBSTRING_PREFIX)
.append("Trackpad 3-finger gesture, using StatusBarInputConsumer");
base = new StatusBarInputConsumer(getBaseContext(), base, mInputMonitorCompat);
.append("Trackpad 3-finger gesture, using TrackpadStatusBarInputConsumer");
base = new TrackpadStatusBarInputConsumer(getBaseContext(), base,
mInputMonitorCompat);
}
if (mDeviceState.isScreenPinningActive()) {
quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java → quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java
+4 -4
View File
@@ -27,15 +27,15 @@ import com.android.quickstep.InputConsumer;
import com.android.quickstep.SystemUiProxy;
import com.android.systemui.shared.system.InputMonitorCompat;
/** Allows the status bar to be pull down for notification shade */
public class StatusBarInputConsumer extends DelegateInputConsumer {
/** Allows the status bar to be pull down for notification shade using the trackpad. */
public class TrackpadStatusBarInputConsumer extends DelegateInputConsumer {
private final SystemUiProxy mSystemUiProxy;
private final float mTouchSlop;
private final PointF mDown = new PointF();
private boolean mHasPassedTouchSlop;
public StatusBarInputConsumer(Context context, InputConsumer delegate,
public TrackpadStatusBarInputConsumer(Context context, InputConsumer delegate,
InputMonitorCompat inputMonitor) {
super(delegate, inputMonitor);
@@ -79,7 +79,7 @@ public class StatusBarInputConsumer extends DelegateInputConsumer {
private void dispatchTouchEvent(MotionEvent ev) {
if (mSystemUiProxy.isActive()) {
mSystemUiProxy.onStatusBarMotionEvent(ev);
mSystemUiProxy.onStatusBarTrackpadEvent(ev);
}
}
}