firebase · samtstern · Jul 25, 2017 · May 13, 2017 · May 13, 2017 · Jun 2, 2017
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -45,6 +45,7 @@ android {
 dependencies {
     compile "com.android.support:design:$supportLibraryVersion"
     compile "com.android.support:customtabs:$supportLibraryVersion"
+    compile 'com.android.support.constraint:constraint-layout:1.1.0-beta1'
 
     compile "com.google.firebase:firebase-auth:$firebaseVersion"
     compile "com.google.android.gms:play-services-auth:$firebaseVersion"

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -19,6 +19,8 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
+import android.support.constraint.ConstraintLayout;
+import android.support.constraint.ConstraintSet;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -79,7 +81,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         int logoId = getFlowParams().logoId;
         if (logoId == AuthUI.NO_LOGO) {
-            findViewById(R.id.logo_layout).setVisibility(View.GONE);
+            findViewById(R.id.logo).setVisibility(View.GONE);
+
+            ConstraintLayout layout = (ConstraintLayout) findViewById(R.id.root);
+            ConstraintSet constraints = new ConstraintSet();
+            constraints.clone(layout);
+            constraints.setHorizontalBias(R.id.container, 0.5f);
+            constraints.setVerticalBias(R.id.container, 0.5f);
+            constraints.applyTo(layout);
         } else {
             ImageView logo = (ImageView) findViewById(R.id.logo);
             logo.setImageResource(logoId);

diff --git a/auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml b/auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml
@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:baselineAligned="false"
     android:clipChildren="false"
-    android:clipToPadding="false"
-    android:gravity="center|bottom"
-    android:orientation="horizontal">
+    android:clipToPadding="false">
 
-    <include
-        layout="@layout/fui_include_auth_method_picker_logo"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.0" />
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.0">
+    <ImageView
+        android:id="@+id/logo"
+        style="@style/FirebaseUI.AuthMethodPicker.Logo"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/container"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:ignore="ContentDescription" />  <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->
 
+    <ScrollView
+        android:id="@+id/container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.9">
 
         <LinearLayout
             android:id="@+id/btn_holder"
-            style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingTop="@dimen/fui_auth_method_button_marginBottom" />
+            style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder" />
 
-    </FrameLayout>
+    </ScrollView>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/auth/src/main/res/layout/fui_auth_method_picker_layout.xml b/auth/src/main/res/layout/fui_auth_method_picker_layout.xml
@@ -1,18 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="false"
-    android:clipToPadding="false"
-    android:gravity="center|bottom"
-    android:orientation="vertical">
+    android:clipToPadding="false">
 
-    <include layout="@layout/fui_include_auth_method_picker_logo" />
+    <ImageView
+        android:id="@+id/logo"
+        style="@style/FirebaseUI.AuthMethodPicker.Logo"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/container"
+        tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->
 
-    <LinearLayout
-        android:id="@+id/btn_holder"
-        style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder.Portrait"
-        android:layout_height="wrap_content" />
+    <ScrollView
+        android:id="@+id/container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintVertical_bias="0.9">
 
-</LinearLayout>
+        <LinearLayout
+            android:id="@+id/btn_holder"
+            style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder" />
+
+    </ScrollView>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/auth/src/main/res/layout/fui_include_auth_method_picker_logo.xml b/auth/src/main/res/layout/fui_include_auth_method_picker_logo.xml
diff --git a/auth/src/main/res/values-sw360dp/dimens.xml b/auth/src/main/res/values-sw360dp/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="fui_auth_method_button_width">228dp</dimen>
-    <dimen name="fui_auth_method_button_marginBottom">24dp</dimen>
+    <dimen name="fui_auth_method_button_margin">12dp</dimen>
     <dimen name="fui_auth_method_button_drawablePadding">20dp</dimen>
 
     <dimen name="fui_body_padding_bottom">16dp</dimen>

diff --git a/auth/src/main/res/values/dimens.xml b/auth/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="fui_auth_method_button_width">208dp</dimen>
-    <dimen name="fui_auth_method_button_marginBottom">8dp</dimen>
+    <dimen name="fui_auth_method_button_margin">4dp</dimen>
     <dimen name="fui_auth_method_button_drawablePadding">12dp</dimen>
 
     <dimen name="fui_body_padding_bottom">12dp</dimen>

diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
@@ -167,22 +167,20 @@
 
     <style name="FirebaseUI.AuthMethodPicker.Logo">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:contentDescription">@string/fui_accessibility_logo</item>
     </style>
 
     <style name="FirebaseUI.AuthMethodPicker.ButtonHolder">
-        <item name="android:layout_width">@dimen/fui_auth_method_button_width</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minWidth">@dimen/fui_auth_method_button_width</item>
         <item name="android:orientation">vertical</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingRight">4dp</item>
     </style>
 
-    <style name="FirebaseUI.AuthMethodPicker.ButtonHolder.Portrait" parent="FirebaseUI.AuthMethodPicker.ButtonHolder">
-        <item name="android:paddingBottom">56dp</item>
-    </style>
-
     <style name="FirebaseUI.Button.AccountChooser">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -191,8 +189,8 @@
         <item name="android:textStyle">bold</item>
         <item name="android:paddingLeft">12dp</item>
         <item name="android:paddingRight">12dp</item>
-        <item name="android:layout_marginBottom">@dimen/fui_auth_method_button_marginBottom</item>
-        <item name="android:layout_gravity">left</item>
+        <item name="android:layout_marginTop">@dimen/fui_auth_method_button_margin</item>
+        <item name="android:layout_marginBottom">@dimen/fui_auth_method_button_margin</item>
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:typeface">normal</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>