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

Commit 2801dd2e authored by Becky Qiu's avatar Becky Qiu Committed by Automerger Merge Worker
Browse files

Merge "[Toast] Keep keyboard up for query builder tapping" into tm-dev am:... 

Merge "[Toast] Keep keyboard up for query builder tapping" into tm-dev am: 2c3de6ef am: 319e88a7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185504



Change-Id: I60652d2bf1dedf76f3c743f28c3cca1d3029d7e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a80bc0a5 319e88a7

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

+2 −2
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView { 
                requestFocus();

                mgr.logger().sendToInteractionJankMonitor(

                        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);

                hideKeyboardAsync(ActivityContext.lookupContext(getContext()),

                        getApplicationWindowToken());

                break;

            case SCROLL_STATE_IDLE:

                mgr.logger().sendToInteractionJankMonitor(
@@ -243,8 +245,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView { 
                && mEmptySearchBackground != null && mEmptySearchBackground.getAlpha() > 0) {

            mEmptySearchBackground.setHotspot(e.getX(), e.getY());

        }

        hideKeyboardAsync(ActivityContext.lookupContext(getContext()),

                getApplicationWindowToken());

        return result;

    }

src/com/android/launcher3/allapps/BaseAllAppsContainerView.java

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.allapps; 


import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB;

import static com.android.launcher3.util.UiThreadHelper.hideKeyboardAsync;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -458,6 +459,8 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte 
                            mActivityContext.getStatsLogManager().logger()

                                    .log(LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB);

                        }

                        hideKeyboardAsync(ActivityContext.lookupContext(getContext()),

                                getApplicationWindowToken());

                    });

            findViewById(R.id.tab_work)

                    .setOnClickListener((View view) -> {
@@ -465,6 +468,8 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte 
                            mActivityContext.getStatsLogManager().logger()

                                    .log(LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB);

                        }

                        hideKeyboardAsync(ActivityContext.lookupContext(getContext()),

                                getApplicationWindowToken());

                    });

            setDeviceManagementResources();

            onActivePageChanged(mViewPager.getNextPage());

src/com/android/launcher3/views/RecyclerViewFastScroller.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static android.view.HapticFeedbackConstants.CLOCK_TICK; 


import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;



import static com.android.launcher3.util.UiThreadHelper.hideKeyboardAsync;



import android.animation.ObjectAnimator;

import android.content.Context;

import android.content.res.Resources;
@@ -283,6 +285,9 @@ public class RecyclerViewFastScroller extends View { 
                }

                break;

            case MotionEvent.ACTION_UP:

                hideKeyboardAsync(ActivityContext.lookupContext(getContext()),

                        getApplicationWindowToken());

                break;

            case MotionEvent.ACTION_CANCEL:

                mRv.onFastScrollCompleted();

                mTouchOffsetY = 0;