Merge commit '6568e69c27747a6e1d4fff6181efdd0ed19250c4' into HEAD

Author: Google Automerger

AUTHORS

@@ -7,3 +7,4 @@
 # The email address is not required for organizations.
 
 Google Inc.
+Marios Harrane <[email protected]>

CONTRIBUTORS

@@ -13,3 +13,4 @@ Frank van Puffelen <[email protected]>
 Abraham Haskins <[email protected]>
 David East <[email protected]>
 Mike McDonald <[email protected]>
+Marios Harrane <[email protected]>

README.md

@@ -81,10 +81,10 @@ Please fill out either the individual or corporate Contributor License Agreement
 (CLA).
 
   * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an 
+    own the intellectual property, then you'll need to sign an
     [individual CLA](https://developers.google.com/open-source/cla/individual).
   * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a 
+    then you'll need to sign a
     [corporate CLA](https://developers.google.com/open-source/cla/corporate).
 
 Follow either of the two links above to access the appropriate CLA and
@@ -101,4 +101,4 @@ accept your pull requests.
 1. Ensure that your code adheres to the existing style of the library to which
    you are contributing.
 1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request and cc @puf or @mcdonamp
+1. Submit a pull request and cc @puf or @mcdonamp

auth/README.md

@@ -211,12 +211,12 @@ public void onClick(View v) {
   if (v.getId() == R.id.sign_out) {
       AuthUI.getInstance(this)
           .signOut(this)
-          .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
-            public void onComplete(@NonNull Task<AuthResult> task) {
+          .addOnCompleteListener(new OnCompleteListener<Void>() {
+            public void onComplete(@NonNull Task<Void> task) {
               // user is now signed out
               startActivity(new Intent(MyActivity.this, SignInActivity.class));
               finish();
-            });
+            }
           });
   }
 }

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

@@ -104,7 +104,7 @@
     </style>
 
     <!-- Common styles -->
-    <style name="FirebaseUI.Text.TextInputLayout" >
+    <style name="FirebaseUI.Text.TextInputLayout">
         <item name="android:paddingTop">8dp</item>
     </style>
 
@@ -200,6 +200,7 @@
     <style name="FirebaseUI.AuthMethodPicker.ButtonHolder">
         <item name="android:orientation">vertical</item>
         <item name="android:paddingBottom">56dp</item>
+        <item name="android:clipToPadding">false</item>
         <item name="android:layout_width">220dp</item>
         <item name="android:layout_height">wrap_content</item>
     </style>