From 026ed57ba679b63d165743a4162f54435449281d Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Tue, 20 Mar 2018 13:49:26 -0700
Subject: Mitigate some of the jank in opening/closeing search.

There is still some jank on first open, but it's much less janky
on close and consecutive open calls.

Test: existing tests confirm no regressions
PiperOrigin-RevId: 189802733
Change-Id: I49d6c2def7c33be0fdbb79c89772a5e4513cde3b
---
 .../dialer/main/impl/res/layout/main_activity.xml  | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'java/com/android/dialer/main/impl/res/layout')

diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
index 0883acebc..a1d6e5372 100644
--- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml
+++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
@@ -21,6 +21,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+  <!-- MainToolbar -->
+  <include
+      android:id="@+id/toolbar"
+      layout="@layout/toolbar_layout"/>
+
   <android.support.design.widget.CoordinatorLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -34,8 +39,20 @@
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_nav_bar"/>
+        android:layout_height="match_parent"/>
+
+    <FrameLayout
+        android:id="@+id/search_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ImageView
+        android:id="@+id/toolbar_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/search_shadow"
+        android:visibility="gone"/>
 
     <com.android.dialer.widget.DialerFloatingActionButton
         android:id="@+id/fab"
@@ -63,20 +80,6 @@
       android:layout_height="match_parent"
       android:elevation="10dp"/>
 
-  <!-- MainToolbar -->
-  <include
-      android:id="@+id/toolbar"
-      layout="@layout/toolbar_layout"/>
-
-  <ImageView
-      android:id="@+id/toolbar_shadow"
-      android:layout_width="match_parent"
-      android:layout_height="2dp"
-      android:scaleType="fitXY"
-      android:src="@drawable/search_shadow"
-      android:layout_below="@+id/toolbar"
-      android:visibility="gone"/>
-
   <!-- TODO(calderwoodra): investigate what this is for and why we want it. -->
   <!-- Host container for the contact tile drag shadow -->
   <FrameLayout
-- 
cgit v1.2.3