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

Commit 74e9cc8b authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-fff7b12b-b33c-4ba0-a243-d8305e6f32d2" into ub-launcher3-master 

* changes:
  [automerger] Add user event logging for clear all button Bug: 72222505 am: 63311a2d
  Add user event logging for clear all button Bug: 72222505
parents c288948b 1a628e0f

protos/launcher_log.proto

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ enum ControlType { 
  BACK_BUTTON = 11; // Deprecated, use enum Command instead

  // GO_TO_PLAYSTORE

  QUICK_SCRUB_BUTTON = 12;

  CLEAR_ALL_BUTTON = 13;

}



// Used to define the action component of the LauncherEvent.

quickstep/src/com/android/quickstep/views/RecentsViewContainer.java

+9 −0
Original line number Diff line number Diff line 
package com.android.quickstep.views;



import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;

import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;



import android.content.Context;

import android.graphics.Rect;

import android.util.AttributeSet;
@@ -9,6 +12,7 @@ import android.view.MotionEvent; 
import android.view.View;



import com.android.launcher3.InsettableFrameLayout;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;



public class RecentsViewContainer extends InsettableFrameLayout {
@@ -29,9 +33,12 @@ public class RecentsViewContainer extends InsettableFrameLayout { 


    private RecentsView mRecentsView;

    private View mClearAllButton;

    private final Context mContext;





    public RecentsViewContainer(Context context, AttributeSet attrs) {

        super(context, attrs);

        mContext = context;

    }



    @Override
@@ -40,6 +47,8 @@ public class RecentsViewContainer extends InsettableFrameLayout { 


        mClearAllButton = findViewById(R.id.clear_all_button);

        mClearAllButton.setOnClickListener((v) -> {

            Launcher.getLauncher(mContext).getUserEventDispatcher()

                    .logActionOnControl(TAP, CLEAR_ALL_BUTTON);

            mRecentsView.dismissAllTasks();

        });