Changes resulting from QA:

  * The auth method picker screen looks really bad in landscape,
    put everything in a ScrollView as a temporary measure until
    we can think of some better UX

  * TestUtils did not compile, had to change some code
    and move the package

Change-Id: I84d3d974390774a7ea3c7cf5deb444b022bb7fd8

Author: samtstern

auth/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     testCompile 'junit:junit:4.12'
     //noinspection NewerVersionAvailable, GradleDynamicVersion
     testCompile 'org.mockito:mockito-core:2.5.+'
-    testCompile 'org.robolectric:robolectric:3.2.1'
+    testCompile 'org.robolectric:robolectric:3.2.2'
     // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
     testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 }

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -21,8 +21,8 @@
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
@@ -111,7 +111,7 @@ private void populateIdpList(List<IdpConfig> providers) {
             }
         }
 
-        LinearLayout btnHolder = (LinearLayout) findViewById(R.id.btn_holder);
+        ViewGroup btnHolder = (ViewGroup) findViewById(R.id.btn_holder);
         for (final IdpProvider provider : mIdpProviders) {
             View loginButton = null;
             switch (provider.getProviderId()) {

auth/src/main/res/layout/auth_method_picker_layout.xml

@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:gravity="center|bottom"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1.0"
-        android:gravity="center">
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:gravity="center|bottom"
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/logo"
             style="@style/FirebaseUI.AuthMethodPicker.Logo"
-            android:contentDescription="@string/accessibility_logo"/>
+            android:layout_marginBottom="64dp"
+            android:layout_marginTop="48dp"
+            android:contentDescription="@string/accessibility_logo" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/btn_holder"
+            style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder"
+            android:layout_weight="0">
 
-    <LinearLayout
-        android:id="@+id/btn_holder"
-        android:layout_weight="0"
-        style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder">
+            <Button
+                android:id="@+id/email_provider"
+                style="@style/FirebaseUI.Button.AccountChooser.EmailButton"
+                android:text="@string/sign_in_with_email" />
 
-        <Button
-            android:id="@+id/email_provider"
-            style="@style/FirebaseUI.Button.AccountChooser.EmailButton"
-            android:text="@string/sign_in_with_email"/>
+        </LinearLayout>
 
     </LinearLayout>
-
-</LinearLayout>
+</ScrollView>

auth/src/main/res/values/styles.xml

@@ -2,17 +2,17 @@
 <resources>
 
     <style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:textColor">@color/authui_inputTextColorDark</item>
-        <item name="android:textColorPrimary">@color/authui_inputTextColor</item>
         <item name="colorPrimary">@color/authui_colorPrimary</item>
         <item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
         <item name="colorAccent">@color/authui_colorAccent</item>
         <item name="colorButtonNormal">@color/authui_colorPrimary</item>
-        <item name="android:buttonStyle">@style/FirebaseUI.Button</item>
-        <item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
         <item name="colorControlNormal">@color/authui_colorPrimary</item>
         <item name="colorControlActivated">@color/authui_colorAccent</item>
         <item name="colorControlHighlight">@color/authui_colorAccent</item>
+        <item name="android:textColor">@color/authui_inputTextColorDark</item>
+        <item name="android:textColorPrimary">@color/authui_inputTextColor</item>
+        <item name="android:buttonStyle">@style/FirebaseUI.Button</item>
+        <item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
     </style>
 
     <style name="FirebaseUI.Transparent" parent="FirebaseUI">

database/src/androidTest/java/com/firebase/ui/database/utils/TestUtils.java renamed to database/src/androidTest/java/com/firebase/ui/database/TestUtils.java

@@ -38,10 +38,15 @@ public static void runAndWaitUntil(FirebaseArray array,
                                        Callable<Boolean> done) throws InterruptedException {
         final Semaphore semaphore = new Semaphore(0);
         array.setOnChangedListener(new FirebaseArray.OnChangedListener() {
-            public void onChanged(EventType type, int index, int oldIndex) {
+
+            @Override
+            public void onChildChanged(EventType type, int index, int oldIndex) {
                 semaphore.release();
             }
 
+            @Override
+            public void onDataChanged() {}
+
             @Override
             public void onCancelled(DatabaseError databaseError) {
                 throw new IllegalStateException(databaseError.toException());