From cb8d0704dcedfe22391d8716bb8b1ba21b95bbf6 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 7 Apr 2021 14:18:20 +0800
Subject: [PATCH] Fix AddNetworkFragment bottom buttons position problem

AddNetworkFragment bottom buttons align parent bottom,
it has display problem because collapsing toolbar changes
its height and squeeze the bottom buttons out of the screen.

This change sets the bottom buttons align the bottom of
other content.

Bug: 179656154
Test: manual visual
Change-Id: I6f0062d10c603e40e3f8c2683d5610418df6522a
---
 res/layout/wifi_add_network_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/layout/wifi_add_network_view.xml b/res/layout/wifi_add_network_view.xml
index 33154f63345..6af46cfc9a7 100644
--- a/res/layout/wifi_add_network_view.xml
+++ b/res/layout/wifi_add_network_view.xml
@@ -15,25 +15,26 @@
      limitations under the License.
 -->
 
-<RelativeLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clipToPadding="true"
-    android:clipChildren="true"
-    android:orientation="vertical">
+    android:clipChildren="true">
 
         <include
+            android:id="@+id/wifi_dialog_frame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_above="@id/add_network_button_bar"
-            android:layout_alignParentTop="true"
+            app:layout_constraintTop_toTopOf="parent"
             layout="@layout/wifi_dialog"/>
 
         <include
             android:id="@+id/add_network_button_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
+            app:layout_constraintTop_toBottomOf="@id/wifi_dialog_frame"
             layout="@*android:layout/alert_dialog_button_bar_material"/>
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file