From dcb8259286e23536a6ef554ecb03041fef8a935c Mon Sep 17 00:00:00 2001
From: Peter Schiller <peterschiller@google.com>
Date: Fri, 8 Jul 2016 10:15:12 -0700
Subject: [PATCH] Simplified search focus logic

Change-Id: I3f47e73c4a3d34f10e947fda2c7cae09211cc26d
---
 .../android/launcher3/allapps/AllAppsContainerView.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 79a15b94c6..b4ec8c2be9 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -32,7 +32,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
@@ -335,12 +334,8 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
         final OnClickListener searchFocusListener = new OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (!mSearchInput.isFocused()) {
-                    mSearchInput.requestFocus();
-                    final InputMethodManager imm =
-                            (InputMethodManager)getContext().getSystemService(
-                                    Context.INPUT_METHOD_SERVICE);
-                    imm.showSoftInput(mSearchInput, 0);
+                if (!mSearchBarController.isSearchFieldFocused()) {
+                    mSearchBarController.focusSearchField();
                 }
             }
         };