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

Commit 8b6e1c88 authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

Merge "add all those great comments from the other file" into nyc-dev 

am: e83cd614

* commit 'e83cd614':
  add all those great comments from the other file
parents c79d8b34 e83cd614

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
            // Focus the next task

            EventBus.getDefault().send(new FocusNextTaskViewEvent(timerIndicatorDuration));



            MetricsLogger.action(this, MetricsEvent.OVERVIEW_PAGE);

            MetricsLogger.action(this, MetricsEvent.ACTION_OVERVIEW_PAGE);

        }

    }

packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAd 
            ssp.startActivityFromRecents(v.getContext(), task.key.id, task.title,

                    ActivityOptions.makeBasic());



            MetricsLogger.action(v.getContext(), MetricsEvent.OVERVIEW_SELECT,

            MetricsLogger.action(v.getContext(), MetricsEvent.ACTION_OVERVIEW_SELECT,

                    task.key.getComponent().toString());

        }

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks 
        EventBus.getDefault().send(new LaunchTaskEvent(this, mTask, null, INVALID_STACK_ID,

                screenPinningRequested));



        MetricsLogger.action(v.getContext(), MetricsEvent.OVERVIEW_SELECT,

        MetricsLogger.action(v.getContext(), MetricsEvent.ACTION_OVERVIEW_SELECT,

                mTask.key.getComponent().toString());

    }

proto/src/metrics_constants.proto

+1459 −36

File changed.

Preview size limit exceeded, changes collapsed.