Merge branch 'master' into version-1.0.0-dev

Author: samtstern

.travis.yml

@@ -14,8 +14,8 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-24.0.3
-    - android-24
+    - build-tools-25.0.0
+    - android-25
 
     # Extras
     - extra-google-google_play_services

app/proguard-rules.pro

@@ -17,7 +17,7 @@
 #}
 
 # See:
-# https://firebase-dot-devsite.googleplex.com/docs/auth/android/start/#proguard
+# https://firebase.google.com/docs/auth/android/start/#proguard
 -keepattributes Signature
 -keepattributes *Annotation*
 

app/src/main/AndroidManifest.xml

@@ -13,9 +13,10 @@
         <activity android:name=".ChooserActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts"
+                       android:resource="@xml/shortcuts" />
         </activity>
 
         <!-- Chat demo -->
@@ -30,7 +31,11 @@
         <activity
             android:name=".auth.SignedInActivity"
             android:label="@string/name_auth_ui" />
-        <activity android:name=".storage.ImageActivity"></activity>
+
+        <!-- Storage UI demo-->
+        <activity
+            android:name=".storage.ImageActivity"
+            android:label="@string/name_image" />
     </application>
 
 </manifest>

app/src/main/res/fabric.properties

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="storage"
+        android:enabled="true"
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutShortLabel="@string/name_image">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="com.firebase.uidemo"
+            android:targetClass="com.firebase.uidemo.storage.ImageActivity" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="auth"
+        android:enabled="true"
+        android:icon="@drawable/firebase_auth_120dp"
+        android:shortcutShortLabel="@string/name_auth_ui">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="com.firebase.uidemo"
+            android:targetClass="com.firebase.uidemo.auth.AuthUiActivity" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="database"
+        android:enabled="true"
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutShortLabel="@string/name_chat">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="com.firebase.uidemo"
+            android:targetClass="com.firebase.uidemo.database.ChatActivity" />
+    </shortcut>
+</shortcuts>

app/src/main/res/xml-v25/shortcuts.xml

@@ -1,10 +1,10 @@
 project.ext.firebase_version = '9.6.1'
-project.ext.support_library_version = '24.2.1'
+project.ext.support_library_version = '25.0.0'
 
 project.ext.submodules = ['database', 'auth', 'storage']
 project.ext.group = 'com.firebaseui'
 project.ext.version = '1.0.0-SNAPSHOT'
 project.ext.pomdesc = 'Firebase UI Android'
-project.ext.buildtools = '24.0.3'
-project.ext.compileSdk = 24
-project.ext.targetSdk = 24
+project.ext.buildtools = '25.0.0'
+project.ext.compileSdk = 25
+project.ext.targetSdk = 25