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

Commit 555d71f7 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Taskbar Pinning Analytics Event" into main

parents 3a57263a 4439af41

quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupController.kt

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ package com.android.launcher3.taskbar 
import android.view.View

import com.android.launcher3.LauncherPrefs

import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING

import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE

import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN

import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_PINNED

import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_UNPINNED

import com.android.launcher3.taskbar.TaskbarDividerPopupView.Companion.createAndPopulate

import java.io.PrintWriter
@@ -27,6 +31,7 @@ class TaskbarDividerPopupController(private val context: TaskbarActivityContext) 


    private lateinit var controllers: TaskbarControllers

    private val launcherPrefs = LauncherPrefs.get(context)

    private val statsLogManager = context.statsLogManager



    fun init(taskbarControllers: TaskbarControllers) {

        controllers = taskbarControllers
@@ -41,6 +46,7 @@ class TaskbarDividerPopupController(private val context: TaskbarActivityContext) 


            popupView.onCloseCallback =

                callback@{ didPreferenceChange ->

                    statsLogManager.logger().log(LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE)

                    context.dragLayer.post { context.onPopupVisibilityChanged(false) }



                    if (!didPreferenceChange) {
@@ -49,8 +55,10 @@ class TaskbarDividerPopupController(private val context: TaskbarActivityContext) 


                    if (launcherPrefs.get(TASKBAR_PINNING)) {

                        animateTransientToPersistentTaskbar()

                        statsLogManager.logger().log(LAUNCHER_TASKBAR_PINNED)

                    } else {

                        animatePersistentToTransientTaskbar()

                        statsLogManager.logger().log(LAUNCHER_TASKBAR_UNPINNED)

                    }

                }

            popupView.changePreference = {
@@ -58,6 +66,7 @@ class TaskbarDividerPopupController(private val context: TaskbarActivityContext) 
            }

            context.onPopupVisibilityChanged(true)

            popupView.show()

            statsLogManager.logger().log(LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN)

        }

    }

src/com/android/launcher3/logging/StatsLogManager.java

+13 −1
Original line number Diff line number Diff line
@@ -654,7 +654,19 @@ public class StatsLogManager implements ResourceBasedOverride { 
        LAUNCHER_APP_PAIR_SAVE(1456),



        @UiEvent(doc = "App launched through pending intent")

        LAUNCHER_APP_LAUNCH_PENDING_INTENT(1394)

        LAUNCHER_APP_LAUNCH_PENDING_INTENT(1394),



        @UiEvent(doc = "User long pressed on taskbar divider icon to open popup menu")

        LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN(1488),



        @UiEvent(doc = "User long pressed on taskbar divider icon to close popup menu")

        LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE(1489),



        @UiEvent(doc = "User has pinned taskbar using taskbar divider menu")

        LAUNCHER_TASKBAR_PINNED(1490),



        @UiEvent(doc = "User has unpinned taskbar using taskbar divider menu")

        LAUNCHER_TASKBAR_UNPINNED(1491)



        // ADD MORE

        ;