From fa317f4420bb40e26a4d0cda7a4e4aebeb397b52 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Thu, 9 Jun 2022 16:34:28 -0700
Subject: [PATCH 1/2] [Toast] Add a new type fields for user visible cold
 status.

Bug: 235249335
Test: manual
Change-Id: I58eee38e740e746e8a3d6065d4ef57cc5569a837
---
 src/com/android/launcher3/logging/StatsLogManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 3d7d23517b..c4ec4e36fd 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -736,7 +736,8 @@ public class StatsLogManager implements ResourceBasedOverride {
             COLD(1),
             HOT(2),
             TIMEOUT(3),
-            FAIL(4);
+            FAIL(4),
+            COLD_USERWAITING(5);
 
             private final int mId;
 

From 24c77a5ff5c56bf720fff9f1c0530c3fce44b83a Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Thu, 9 Jun 2022 12:20:48 -0700
Subject: [PATCH 2/2] Hide keyboard when thumb scroller is visible.

Bug: 235497706
Test: manual
Change-Id: Id3202300650949d079b9209e30b2bfc4f80979cd
---
 src/com/android/launcher3/views/RecyclerViewFastScroller.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index cc2b440ce3..11ca130179 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -285,8 +285,6 @@ public class RecyclerViewFastScroller extends View {
                 }
                 break;
             case MotionEvent.ACTION_UP:
-                hideKeyboardAsync(ActivityContext.lookupContext(getContext()),
-                        getApplicationWindowToken());
             case MotionEvent.ACTION_CANCEL:
                 mRv.onFastScrollCompleted();
                 mTouchOffsetY = 0;
@@ -310,6 +308,7 @@ public class RecyclerViewFastScroller extends View {
     }
 
     private void calcTouchOffsetAndPrepToFastScroll(int downY, int lastY) {
+        hideKeyboardAsync(ActivityContext.lookupContext(getContext()), getWindowToken());
         mIsDragging = true;
         if (mCanThumbDetach) {
             mIsThumbDetached = true;