From c07d6bee10c8d50c41d1513e6b8c8e9f85d3107e Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Tue, 9 Jan 2018 10:38:37 -0800
Subject: Implemented Bottom Nav in Dialer NUI.

Bug: 64655802
Test: existing
PiperOrigin-RevId: 181339724
Change-Id: I05c48d0a046010baf6b6593de3b934fdaf3e9f08
---
 .../dialer/main/impl/res/layout/main_activity.xml  | 73 +++++++++-------------
 1 file changed, 31 insertions(+), 42 deletions(-)

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

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 73b2eae33..969bbe413 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
@@ -14,55 +14,44 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
+    android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-  <TextView
+  <android.support.v7.widget.Toolbar
+      android:id="@+id/toolbar"
+      android:layout_height="wrap_content"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:textColor="@android:color/secondary_text_dark_nodisable"/>
+      android:minHeight="?attr/actionBarSize"
+      android:background="@color/dialer_theme_color"
+      app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+      app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-  <android.support.design.widget.CoordinatorLayout
+  <FrameLayout
+      android:id="@+id/fragment_container"
       android:layout_width="match_parent"
-      android:layout_height="match_parent">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppBarTheme">
-
-      <android.support.v7.widget.Toolbar
-          android:id="@+id/toolbar"
-          android:layout_height="wrap_content"
-          android:layout_width="match_parent"
-          android:background="?android:attr/colorPrimary"/>
-
-      <android.support.design.widget.TabLayout
-          android:id="@+id/tab_layout"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="?android:attr/colorPrimary"
-          app:tabIndicatorColor="?android:attr/colorAccent"
-          app:layout_scrollFlags="enterAlwaysCollapsed"/>
-    </android.support.design.widget.AppBarLayout>
+      android:layout_height="match_parent"
+      android:layout_below="@+id/toolbar"
+      android:layout_above="@+id/bottom_nav_bar"/>
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+  <include
+      android:id="@+id/bottom_nav_bar"
+      layout="@layout/bottom_nav_bar_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom"
+      android:layout_alignParentBottom="true"/>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:src="@drawable/quantum_ic_dialpad_white_24"
-        app:backgroundTint="?android:attr/colorAccent"/>
-  </android.support.design.widget.CoordinatorLayout>
-</FrameLayout>
\ No newline at end of file
+  <android.support.design.widget.FloatingActionButton
+      android:id="@+id/fab"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_above="@+id/bottom_nav_bar"
+      android:layout_alignParentEnd="true"
+      android:layout_margin="16dp"
+      android:src="@drawable/quantum_ic_dialpad_white_24"
+      app:backgroundTint="?android:attr/colorAccent"/>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3