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

Commit efe84750 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Add important dump logging Bug: 130851537 Bug: 119992316" into ub-launcher3-qt-dev

parents 03f27013 a310a80c

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; 
import com.android.launcher3.util.TouchController;

import com.android.quickstep.views.RecentsView;



import java.io.PrintWriter;



/**

 * Handles swiping up on the nav bar to go home from launcher, e.g. overview or all apps.

 */
@@ -222,4 +224,7 @@ public class NavBarToHomeTouchController implements TouchController, SwipeDetect 
                mEndState.containerType,

                mLauncher.getWorkspace().getCurrentPage());

    }



    @Override

    public void dump(String prefix, PrintWriter writer) { }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ import com.android.quickstep.SysUINavigationMode; 
import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;



import java.io.PrintWriter;



/**

 * Touch controller for handling task view card swipes

 */
@@ -305,4 +307,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            mPendingAnimation = null;

        }

    }



    @Override

    public void dump(String prefix, PrintWriter writer) { }

}

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import com.android.launcher3.util.TouchController; 
import com.android.quickstep.RecentsModel;

import com.android.systemui.shared.recents.ISystemUiProxy;



import java.io.PrintWriter;



/**

 * TouchController for handling touch events that get sent to the StatusBar. Once the

 * Once the event delta y passes the touch slop, the events start getting forwarded.
@@ -45,6 +47,7 @@ public class StatusBarTouchController implements TouchController { 
    protected final TouchEventTranslator mTranslator;

    private final float mTouchSlop;

    private ISystemUiProxy mSysUiProxy;

    private int mLastAction;



    /* If {@code false}, this controller should not handle the input {@link MotionEvent}.*/

    private boolean mCanIntercept;
@@ -56,9 +59,18 @@ public class StatusBarTouchController implements TouchController { 
        mTranslator = new TouchEventTranslator((MotionEvent ev)-> dispatchTouchEvent(ev));

    }



    @Override

    public void dump(String prefix, PrintWriter writer) {

        writer.println(prefix + "mCanIntercept:" + mCanIntercept);

        writer.println(prefix + "mLastAction:" + MotionEvent.actionToString(mLastAction));

        writer.println(prefix + "mSysUiProxy available:" + (mSysUiProxy != null));



    }



    private void dispatchTouchEvent(MotionEvent ev) {

        try {

            if (mSysUiProxy != null) {

                mLastAction = ev.getActionMasked();

                mSysUiProxy.onStatusBarMotionEvent(ev);

            }

        } catch (RemoteException e) {

src/com/android/launcher3/AbstractFloatingView.java

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.launcher3.util.TouchController; 
import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.views.BaseDragLayer;



import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -251,4 +252,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch 
            @FloatingViewType int type) {

        return getOpenView(activity, type);

    }



    @Override

    public void dump(String prefix, PrintWriter writer) { }

}

src/com/android/launcher3/Launcher.java

+2 −1
Original line number Diff line number Diff line
@@ -2346,7 +2346,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
        writer.println(" mPendingActivityResult=" + mPendingActivityResult);

        writer.println(" mRotationHelper: " + mRotationHelper);

        // Extra logging for b/116853349

        mDragLayer.dumpAlpha(writer);

        mDragLayer.dump(prefix, writer);

        mStateManager.dump(prefix, writer);

        dumpMisc(writer);



        try {