Merge branch 'master' into version-4.2.0-dev

Change-Id: I6a0472070838a4cfd3a4f57ed67c7673142d21c8

Author: samtstern

.opensource/project.json

@@ -8,12 +8,7 @@
     ],
 
     "content": "README.md",
-  
-    // These are relative paths in the same repo,
-    // each of these paths must have a .opensource/project.json
-    "subprojects": [],
 
-    // Other markdown pages that should be rendered nicely
     "pages" : [
         "auth/README.md",
         "database/README.md",
@@ -24,18 +19,10 @@
         "docs/upgrade-to-4.0.md"
     ],
 
-    // Related projects on Github, in the format $owner/$repo[/$subproject]
-    // where subproject is optional.
     "related": [
       "firebase/firebaseui-ios",
       "firebase/firebaseui-web"
-    ],
-  
-    "tags": [
-      "firebase-auth",
-      "firebase-database",
-      "firebase-firestore",
-      "firebase-storage"
     ]
-  }
+    
+}
 

README.md

@@ -1,5 +1,8 @@
 # FirebaseUI for Android — UI Bindings for Firebase
 
+[![FirebaseOpensource.com](https://img.shields.io/badge/Docs-firebaseopensource.com-orange.svg)](
+https://firebaseopensource.com/projects/firebase/firebaseui-android
+)
 [![Build Status](https://travis-ci.org/firebase/FirebaseUI-Android.svg?branch=master)](https://travis-ci.org/firebase/FirebaseUI-Android)
 
 FirebaseUI is an open-source library for Android that allows you to
@@ -192,6 +195,14 @@ and Gradle while trying to run the sample app, try disabling the Instant
 Run feature of Android Studio. Alternatively, update Android Studio and
 Gradle to their latest versions.
 
+A note on importing the project using Android Studio: Using 'Project from 
+Version Control' will not automatically link the project with Gradle 
+(issue [#1349](https://github.com/firebase/FirebaseUI-Android/issues/1349)). 
+When doing so and opening any `build.gradle.kts` file, an error shows up: 
+`Project 'FirebaseUI-Android' isn't linked with Gradle`. To resolve this 
+issue, please `git checkout` the project manually and import with `Import 
+from external model`.
+
 ## Snapshot builds
 
 Like to live on the cutting edge?  Want to try the next release of FirebaseUI before anyone else? As of version `3.2.2`

auth/README.md

@@ -672,7 +672,7 @@ For example:
 startActivityForResult(
     AuthUI.getInstance()
         .createSignInIntentBuilder()
-        enableAnonymousUsersAutoUpgrade()
+        .enableAnonymousUsersAutoUpgrade()
         ...
         .build(),
     RC_SIGN_IN);
@@ -717,8 +717,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 ...
                 // Get the non-anoymous credential from the response
                 AuthCredential nonAnonymousCredential = response.getCredentialForLinking();
-                // Sign in with credential
-                FirebaseAuth.getInstance().signInWithCredential(nonAnonymousCredential);
+                // Sign in with credential 
+                FirebaseAuth.getInstance().signInWithCredential(nonAnonymousCredential)
                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                         @Override
                         public void onSuccess(AuthResult result) {

auth/src/main/res/values-tr/strings.xml

@@ -23,7 +23,7 @@
     <string name="fui_missing_email_address">Devam etmek için e-posta adresinizi girin</string>
     <string name="fui_progress_dialog_checking_accounts">Mevcut hesaplar kontrol ediliyor…</string>
     <string name="fui_title_register_email">Kaydol</string>
-    <string name="fui_name_hint">Ad ve Soyadı</string>
+    <string name="fui_name_hint">Ad ve Soyad</string>
     <string name="fui_button_text_save">Kaydet</string>
     <string name="fui_progress_dialog_signing_up">Kaydolunuyor…</string>
     <plurals name="fui_error_weak_password"> <item quantity="one">Şifre yeterince güçlü değil. En az %1$d karakter kullanın ve hem harf hem de rakam ekleyin</item> <item quantity="other">Şifre yeterince güçlü değil. En az %1$d karakter kullanın ve hem harf hem de rakam ekleyin</item> </plurals>