From af64d6af97ab2be252c32708fe2ca8c2a7d13543 Mon Sep 17 00:00:00 2001
From: Zemiao Zhu <zemiao@google.com>
Date: Wed, 8 Apr 2020 16:02:09 -0700
Subject: Refactor SearchFragment to fix keyboard focus issue.

Bug: 148623802
Test: atest DocumentsUIGoogleTests
Change-Id: I4676bdffc16c5b0cbc40623e461dd397d54de610
---
 res/layout/directory_header.xml |  1 +
 res/layout/drawer_layout.xml    |  6 ++++++
 res/layout/fixed_layout.xml     | 18 +++++++++++++++---
 res/layout/fragment_search.xml  | 15 ---------------
 4 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
index 4c4d84573..94c52e978 100644
--- a/res/layout/directory_header.xml
+++ b/res/layout/directory_header.xml
@@ -15,6 +15,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/directory_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/action_bar_space_margin"
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index a5331d520..0b2a81d72 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -52,6 +52,12 @@
 
                 </LinearLayout>
 
+                <FrameLayout
+                    android:id="@+id/container_search_fragment"
+                    android:clipToPadding="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
                 <!-- Drawer edge is a dummy view used to capture hovering event
                      on view edge to open the drawer. (b/28345294) -->
                 <View
diff --git a/res/layout/fixed_layout.xml b/res/layout/fixed_layout.xml
index 10a569d54..fb2cb2452 100644
--- a/res/layout/fixed_layout.xml
+++ b/res/layout/fixed_layout.xml
@@ -77,11 +77,23 @@
                 <include layout="@layout/directory_header" />
 
                 <FrameLayout
-                    android:id="@+id/container_directory"
-                    android:clipToPadding="false"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1" />
+                    android:layout_weight="1">
+
+                    <FrameLayout
+                        android:id="@+id/container_directory"
+                        android:clipToPadding="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                    <FrameLayout
+                        android:id="@+id/container_search_fragment"
+                        android:clipToPadding="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                </FrameLayout>
 
                 <androidx.coordinatorlayout.widget.CoordinatorLayout
                     android:id="@+id/container_save"
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index ca6895fe5..02baffdd3 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -22,21 +22,6 @@
     android:layout_height="match_parent"
     android:background="?android:attr/colorBackground">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_margin="@dimen/search_bar_margin"
-        android:theme="?actionBarTheme"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        app:navigationContentDescription="@string/button_back">
-
-        <androidx.appcompat.widget.SearchView
-            android:id="@+id/search_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-    </androidx.appcompat.widget.Toolbar>
-
     <!-- used for search chip. -->
     <include layout="@layout/search_chip_row"/>
 
-- 
cgit v1.2.3-59-g8ed1b