Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2d9e15b authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Tweak back gesture logging output" into udc-dev am: dcf36a0d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23352729



Change-Id: I444ddcd62b2ace4fa5e4c722f888484c5f279416
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d8d29f5 dcf36a0d

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+14 −3
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import android.graphics.PointF; 
import android.graphics.Rect;

import android.graphics.Rect;

import android.graphics.Region;

import android.graphics.Region;

import android.hardware.input.InputManager;

import android.hardware.input.InputManager;

import android.icu.text.SimpleDateFormat;

import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemClock;
@@ -99,7 +100,9 @@ import com.android.wm.shell.pip.Pip; 
import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayDeque;

import java.util.ArrayDeque;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Map;

import java.util.Optional;

import java.util.Optional;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;
@@ -281,6 +284,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    private LogArray mPredictionLog = new LogArray(MAX_NUM_LOGGED_PREDICTIONS);

    private LogArray mPredictionLog = new LogArray(MAX_NUM_LOGGED_PREDICTIONS);

    private LogArray mGestureLogInsideInsets = new LogArray(MAX_NUM_LOGGED_GESTURES);

    private LogArray mGestureLogInsideInsets = new LogArray(MAX_NUM_LOGGED_GESTURES);

    private LogArray mGestureLogOutsideInsets = new LogArray(MAX_NUM_LOGGED_GESTURES);

    private LogArray mGestureLogOutsideInsets = new LogArray(MAX_NUM_LOGGED_GESTURES);

    private SimpleDateFormat mLogDateFormat = new SimpleDateFormat("HH:mm:ss.SSS", Locale.US);

    private Date mTmpLogDate = new Date();





    private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;

    private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;
@@ -969,11 +974,17 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
            }

            }





            // For debugging purposes, only log edge points

            // For debugging purposes, only log edge points

            long curTime = System.currentTimeMillis();

            mTmpLogDate.setTime(curTime);

            String curTimeStr = mLogDateFormat.format(mTmpLogDate);

            (isWithinInsets ? mGestureLogInsideInsets : mGestureLogOutsideInsets).log(String.format(

            (isWithinInsets ? mGestureLogInsideInsets : mGestureLogOutsideInsets).log(String.format(

                    "Gesture [%d,alw=%B,%B,%B,%B,%B,%B,disp=%s,wl=%d,il=%d,wr=%d,ir=%d,excl=%s]",

                    "Gesture [%d [%s],alw=%B, mltf=%B, left=%B, defLeft=%B, backAlw=%B, disbld=%B,"

                    System.currentTimeMillis(), isTrackpadMultiFingerSwipe, mAllowGesture,

                            + " qsDisbld=%b, blkdAct=%B, pip=%B,"

                            + " disp=%s, wl=%d, il=%d, wr=%d, ir=%d, excl=%s]",

                    curTime, curTimeStr, mAllowGesture, isTrackpadMultiFingerSwipe,

                    mIsOnLeftEdge, mDeferSetIsOnLeftEdge, mIsBackGestureAllowed,

                    mIsOnLeftEdge, mDeferSetIsOnLeftEdge, mIsBackGestureAllowed,

                    QuickStepContract.isBackGestureDisabled(mSysUiFlags), mDisplaySize,

                    QuickStepContract.isBackGestureDisabled(mSysUiFlags), mDisabledForQuickstep,

                    mGestureBlockingActivityRunning, mIsInPip, mDisplaySize,

                    mEdgeWidthLeft, mLeftInset, mEdgeWidthRight, mRightInset, mExcludeRegion));

                    mEdgeWidthLeft, mLeftInset, mEdgeWidthRight, mRightInset, mExcludeRegion));

        } else if (mAllowGesture || mLogGesture) {

        } else if (mAllowGesture || mLogGesture) {

            if (!mThresholdCrossed) {

            if (!mThresholdCrossed) {