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

Commit 9722c67b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Verbose touch debugging for the status bar."" into sc-dev am: c2b0bd68 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f543adbbe8b587fe7d3474271207c192c19881c
parents d1239989 c2b0bd68

packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java

+2 −4
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public class GestureRecorder { 
            sb.append(g.toJson());

            count++;

        }

        mLastSaveLen += count;

        mLastSaveLen = count;

        sb.append("]");

        return sb.toString();

    }
@@ -249,9 +249,7 @@ public class GestureRecorder { 
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        save();

        if (mLastSaveLen >= 0) {

            pw.println(String.valueOf(mLastSaveLen)

                    + " gestures since last dump written to " + mLogfile);

            mLastSaveLen = 0;

            pw.println(String.valueOf(mLastSaveLen) + " gestures written to " + mLogfile);

        } else {

            pw.println("error writing gestures");

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+5 −9
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import android.media.AudioAttributes; 
import android.metrics.LogMaker;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;
@@ -277,8 +276,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    public static final boolean DEBUG = false;

    public static final boolean SPEW = false;

    public static final boolean DUMPTRUCK = true; // extra dumpsys info

    public static final boolean DEBUG_GESTURES = Build.IS_DEBUGGABLE; // TODO(b/178277858)

    public static final boolean DEBUG_GESTURES_VERBOSE = true;

    public static final boolean DEBUG_GESTURES = false;

    public static final boolean DEBUG_MEDIA_FAKE_ARTWORK = false;

    public static final boolean DEBUG_CAMERA_LIFT = false;
@@ -458,7 +456,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private final DisplayMetrics mDisplayMetrics;



    // XXX: gesture research

    private GestureRecorder mGestureRec = null;

    private final GestureRecorder mGestureRec = DEBUG_GESTURES

        ? new GestureRecorder("/sdcard/statusbar_gestures.dat")

        : null;



    private final ScreenPinningRequest mScreenPinningRequest;
@@ -856,10 +856,6 @@ public class StatusBar extends SystemUI implements DemoMode, 


        mActivityIntentHelper = new ActivityIntentHelper(mContext);

        DateTimeView.setReceiverHandler(timeTickHandler);



        if (DEBUG_GESTURES) {

            mGestureRec = new GestureRecorder(mContext.getCacheDir() + "/statusbar_gestures.dat");

        }

    }



    @Override
@@ -2271,7 +2267,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


    public boolean interceptTouchEvent(MotionEvent event) {

        if (DEBUG_GESTURES) {

            if (DEBUG_GESTURES_VERBOSE || event.getActionMasked() != MotionEvent.ACTION_MOVE) {

            if (event.getActionMasked() != MotionEvent.ACTION_MOVE) {

                EventLog.writeEvent(EventLogTags.SYSUI_STATUSBAR_TOUCH,

                        event.getActionMasked(), (int) event.getX(), (int) event.getY(),

                        mDisabled1, mDisabled2);