Merge remote-tracking branch 'github/master' into gob-master

Change-Id: I6523cbcf8dfe90308310471a98eea82ef645cb3e
semenoh · Jun 7, 2017 · 1e32ec4 · 1e32ec4
2 parents 61e4f75 + 5d7953d
commit 1e32ec4
Show file tree

Hide file tree

Showing 28 changed files with 759 additions and 193 deletions.
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
 
     // [START gradle_play_config]
-    compile 'com.google.firebase:firebase-ads:10.2.6'
+    compile 'com.google.firebase:firebase-ads:11.0.0'
     // [END gradle_play_config]
 
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:support-v4:25.3.1'
 
-    compile 'com.google.firebase:firebase-analytics:10.2.6'
+    compile 'com.google.firebase:firebase-analytics:11.0.0'
 
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.android.support.test:runner:0.5'

diff --git a/app-indexing/app/build.gradle b/app-indexing/app/build.gradle
@@ -27,8 +27,9 @@ configurations.all {
 
 dependencies {
     // [START app_indexing_gradle_dep]
-    compile 'com.google.firebase:firebase-appindexing:10.2.6'
+    compile 'com.google.firebase:firebase-appindexing:11.0.0'
     // [END app_indexing_gradle_dep]
+
     compile 'com.android.support:support-v4:25.3.1'
     compile 'com.android.support:appcompat-v7:25.3.1'
 

diff --git a/auth/README.md b/auth/README.md
@@ -71,6 +71,14 @@ Getting Started
     - Select **EmailPasswordActivity** from the main screen.
     - Fill in your desired email and password and click **Create Account** to begin.
 
+### Phone Authentication Setup
+
+- Go to the [Firebase Console](https://console.firebase.google.com) and navigate to your project:
+  - Select the **Auth** panel and then click the **Sign In Method** tab.
+  - Click **Phone** and turn on the **Enable** switch, then click **Save**.
+- Run the app on your device or emulator.
+    - Select **PhoneAuthActivity** from the main screen.
+    - Enter your phone numeber and click **Verify** to begin.
 
 ### Custom Authentication Setup
 

diff --git a/auth/app/build.gradle b/auth/app/build.gradle
@@ -45,12 +45,16 @@ configurations.all {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:animated-vector-drawable:25.3.1'
+    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:customtabs:25.3.1'
+    compile 'com.android.support:design:25.3.1'
 
     // Firebase Authentication
-    compile 'com.google.firebase:firebase-auth:10.2.6'
+    compile 'com.google.firebase:firebase-auth:11.0.0'
 
     // Google Sign In SDK (only required for Google Sign In)
-    compile 'com.google.android.gms:play-services-auth:10.2.6'
+    compile 'com.google.android.gms:play-services-auth:11.0.0'
 
     // Firebase UI
     // Used in FirebaseUIActivity. The FirebaseUI-Android library has a minSdk level of 16

diff --git a/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java b/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java
@@ -61,7 +61,7 @@ public void anonymousSignInTest() {
 
         // Make sure userID and email look right
         String idString = mActivityTestRule.getActivity().getString(R.string.id_fmt, "");
-        String emailString = mActivityTestRule.getActivity().getString(R.string.email_fmt, null);
+        String emailString = mActivityTestRule.getActivity().getString(R.string.email_fmt, "");
 
         onView(withText(startsWith(idString)))
                 .check(matches(isDisplayed()));

diff --git a/auth/app/src/main/AndroidManifest.xml b/auth/app/src/main/AndroidManifest.xml
@@ -30,6 +30,9 @@
             android:name=".EmailPasswordActivity"
             android:label="@string/label_emailpassword"
             android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".PhoneAuthActivity"
+            android:label="@string/label_phone_auth"></activity>
         <activity
             android:name=".AnonymousAuthActivity"
             android:label="@string/label_anonymous_auth" />
@@ -38,7 +41,7 @@
             android:label="@string/label_twitter_login" />
         <activity
             android:name=".FirebaseUIActivity"
-            android:label="@string/label_firebase_ui"/>
+            android:label="@string/label_firebase_ui" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/ChooserActivity.java b/auth/app/src/main/java/com/google/firebase/quickstart/auth/ChooserActivity.java
@@ -36,6 +36,7 @@
  *     {@link FacebookLoginActivity}
  *     {@link TwitterLoginActivity}
  *     {@link EmailPasswordActivity}
+ *     {@link PhoneAuthActivity}
  *     {@link AnonymousAuthActivity}
  *     {@link CustomAuthActivity}
  */
@@ -46,6 +47,7 @@ public class ChooserActivity extends AppCompatActivity implements AdapterView.On
             FacebookLoginActivity.class,
             TwitterLoginActivity.class,
             EmailPasswordActivity.class,
+            PhoneAuthActivity.class,
             AnonymousAuthActivity.class,
             FirebaseUIActivity.class,
             CustomAuthActivity.class
@@ -56,6 +58,7 @@ public class ChooserActivity extends AppCompatActivity implements AdapterView.On
             R.string.desc_facebook_login,
             R.string.desc_twitter_login,
             R.string.desc_emailpassword,
+            R.string.desc_phone_auth,
             R.string.desc_anonymous_auth,
             R.string.desc_firebase_ui,
             R.string.desc_custom_auth,