From 7b08318208aa555a13afef74c493bacf74b97438 Mon Sep 17 00:00:00 2001
From: Alex Newcomer <newcomer@chromium.org>
Date: Thu, 7 Sep 2017 17:41:31 +0000
Subject: [PATCH] cros: Fix UMA bug for launcher transitions

Non-fling PEEKING->FULLSCREEN_ALL_APPS was not being
recorded in UMA.

Also, at the request of PMs, I modified the histogram description for
Apps.AppListAppLaunched.

TBR=newcomer@chromium.org

(cherry picked from commit 1c980861cc5cd2aa454cc343a7ea54fc5f2b13e5)

Bug: 761188
Change-Id: Ia658cac79326678b5e011aca2b1670b6b868e977
Reviewed-on: https://chromium-review.googlesource.com/646762
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499349}
Reviewed-on: https://chromium-review.googlesource.com/655621
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#66}
Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098}
---
 tools/metrics/histograms/enums.xml      |  5 +++++
 tools/metrics/histograms/histograms.xml | 15 ++++++++++++---
 ui/app_list/app_list_constants.cc       |  2 +-
 ui/app_list/views/app_list_view.cc      |  8 +++++++-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index c2546622347f..3f62ee648908 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -36770,6 +36770,11 @@ from previous Chrome versions.
   <int value="2" label="Load failed"/>
 </enum>
 
+<enum name="SuggestedAppListAppLaunched">
+  <int value="0" label="Not a suggested app"/>
+  <int value="1" label="Suggested app"/>
+</enum>
+
 <!--
 These values are based on the server-side type AnswerTriggererKey. Note that not
 all of the types are launched in Chrome but if they're sent erroneously, it
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 6142921444e2..7d2f5c29300d 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -1642,15 +1642,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <summary>Interactions with the App Launcher promo dialog.</summary>
 </histogram>
 
-<histogram name="Apps.AppListAppLaunched" enum="BooleanEnabled">
+<histogram name="Apps.AppListAppLaunched" enum="SuggestedAppListAppLaunched">
   <owner>newcomer@chromium.org</owner>
   <summary>
     The number of apps launched from the launcher. This is logged each time an
-    app is launched. The bucket denotes whether the app is suggested.
+    app is launched.
   </summary>
 </histogram>
 
-<histogram name="Apps.AppListAppLaunchedFullscreen" enum="BooleanEnabled">
+<histogram name="Apps.AppListAppLaunchedFullscreen"
+    enum="SuggestedAppListAppLaunched">
   <owner>newcomer@chromium.org</owner>
   <summary>
     The number of apps launched from the fullscreen launcher. This is logged
@@ -1710,6 +1711,14 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Apps.AppListPeekingToFullscreen"
+    enum="AppListPeekingToFullscreenSource">
+  <owner/>
+  <summary>
+    Replaced with Apps.AppListPeekingToFullscreenSource on 9/2017.
+  </summary>
+</histogram>
+
 <histogram name="Apps.AppListPeekingToFullscreenSource"
     enum="AppListPeekingToFullscreenSource">
   <owner>newcomer@chromium.org</owner>
diff --git a/ui/app_list/app_list_constants.cc b/ui/app_list/app_list_constants.cc
index 6e0b28ce3fb4..44d53f4e810d 100644
--- a/ui/app_list/app_list_constants.cc
+++ b/ui/app_list/app_list_constants.cc
@@ -206,7 +206,7 @@ const char kAppListFolderOpenedHistogram[] = "Apps.AppListFolderOpened";
 // The UMA histogram that logs how the app list transitions from peeking to
 // fullscreen.
 const char kAppListPeekingToFullscreenHistogram[] =
-    "Apps.AppListPeekingToFullscreen";
+    "Apps.AppListPeekingToFullscreenSource";
 
 // The UMA histogram that logs how the app list is shown.
 const char kAppListToggleMethodHistogram[] = "Apps.AppListShowSource";
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index 3a1313af988a..035e20def04d 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -714,7 +714,13 @@ void AppListView::EndDrag(const gfx::Point& location) {
         break;
       case PEEKING:
         if (std::abs(drag_delta) > app_list_threshold) {
-          SetState(drag_delta > 0 ? FULLSCREEN_ALL_APPS : CLOSED);
+          if (drag_delta > 0) {
+            SetState(FULLSCREEN_ALL_APPS);
+            UMA_HISTOGRAM_ENUMERATION(kAppListPeekingToFullscreenHistogram,
+                                      kSwipe, kMaxPeekingToFullscreen);
+          } else {
+            SetState(CLOSED);
+          }
         } else {
           SetState(app_list_state_);
         }