Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove logs since PipPinchInTest is fixed

Browse Source 
Remove the logs that were added to help debug PipPinchInTest
since it passes now.

Bug: 270984004
Test: atest WMShellFlickerTests:PipPinchInTest
Change-Id: I11cc57f2af1ef4330dcfa89497214ebeac1ca463
This commit is contained in:
Ikram Gabiyev
2023-05-03 19:47:57 +00:00
parent e1e4129f4f
commit 898db46c58
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java
View File

@@ -32,7 +32,6 @@ import android.graphics.Region;
import android.hardware.input.InputManager; import android.hardware.input.InputManager;
import android.os.Looper; import android.os.Looper;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
import android.util.Log;
import android.view.BatchedInputEventReceiver; import android.view.BatchedInputEventReceiver;
import android.view.Choreographer; import android.view.Choreographer;
import android.view.InputChannel; import android.view.InputChannel;
@@ -401,7 +400,6 @@ public class PipResizeGestureHandler {
@VisibleForTesting @VisibleForTesting
void onPinchResize(MotionEvent ev) { void onPinchResize(MotionEvent ev) {
Log.d(TAG, "onPinchResize: " + ev);
int action = ev.getActionMasked(); int action = ev.getActionMasked();
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
@@ -445,10 +443,6 @@ public class PipResizeGestureHandler {
mLastPoint.set(x0, y0); mLastPoint.set(x0, y0);
mLastSecondPoint.set(x1, y1); mLastSecondPoint.set(x1, y1);
// TODO: remove logging once b/269505548 is resolved
Log.d(TAG, "at onPinchResize (" + x0 + ", " + y0 + ")");
Log.d(TAG, "at onPinchResize (" + x1 + ", " + y1 + ")");
// Capture inputs // Capture inputs
if (!mThresholdCrossed if (!mThresholdCrossed
&& (distanceBetween(mDownSecondPoint, mLastSecondPoint) > mTouchSlop && (distanceBetween(mDownSecondPoint, mLastSecondPoint) > mTouchSlop

5
tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java
View File

@@ -20,7 +20,6 @@ import android.annotation.NonNull;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.app.UiAutomation; import android.app.UiAutomation;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Log;
import android.view.InputDevice; import android.view.InputDevice;
import android.view.InputEvent; import android.view.InputEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -33,7 +32,6 @@ import androidx.annotation.Nullable;
* Injects gestures given an {@link Instrumentation} object. * Injects gestures given an {@link Instrumentation} object.
*/ */
public class GestureHelper { public class GestureHelper {
private static final String TAG = GestureHelper.class.getSimpleName();
// Inserted after each motion event injection. // Inserted after each motion event injection.
private static final int MOTION_EVENT_INJECTION_DELAY_MILLIS = 5; private static final int MOTION_EVENT_INJECTION_DELAY_MILLIS = 5;
@@ -210,9 +208,6 @@ public class GestureHelper {
for (int j = 0; j < coords.length; j++) { for (int j = 0; j < coords.length; j++) {
coords[j].x += (endPoints[j].x - startPoints[j].x) / steps; coords[j].x += (endPoints[j].x - startPoints[j].x) / steps;
coords[j].y += (endPoints[j].y - startPoints[j].y) / steps; coords[j].y += (endPoints[j].y - startPoints[j].y) / steps;
// TODO: remove logging once b/269505548 is resolved
Log.d(TAG, "(" + coords[j].x + ", " + coords[j].y + ")");
} }
eventTime = SystemClock.uptimeMillis(); eventTime = SystemClock.uptimeMillis();