Merge "Firebase Storage update"

Author: samtstern

app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

@@ -59,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_image);
         ButterKnife.bind(this);
 
-        // By default, Firebase Storage files require authentication to read or write.
+        // By default, Cloud Storage files require authentication to read or write.
         // For this sample to function correctly, enable Anonymous Auth in the Firebase console:
         // https://console.firebase.google.com/project/_/authentication/providers
         FirebaseAuth.getInstance()
@@ -102,7 +102,7 @@ private void uploadPhoto(Uri uri) {
         hideDownloadUI();
         Toast.makeText(this, "Uploading...", Toast.LENGTH_SHORT).show();
 
-        // Upload to Firebase Storage
+        // Upload to Cloud Storage
         String uuid = UUID.randomUUID().toString();
         mImageRef = FirebaseStorage.getInstance().getReference(uuid);
         mImageRef.putFile(uri)

app/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
 
     <string name="desc_chat">Demonstrates using a FirebaseRecyclerAdapter to load data from Firebase Database into a RecyclerView for a basic chat app.</string>
     <string name="desc_auth_ui">Demonstrates the Firebase Auth UI flow, with customization options.</string>
-    <string name="desc_image">Demonstrates displaying an image from Firebase Storage using Glide.</string>
+    <string name="desc_image">Demonstrates displaying an image from Cloud Storage using Glide.</string>
 
     <!-- strings for Auth UI demo activities -->
     <eat-comment/>
@@ -47,7 +47,7 @@
     <string name="configuration_required">Configuration is required - see README.md</string>
     <string name="other_options_header">Other Options:</string>
     <string name="enable_smartlock">Enable SmartLock for Passwords</string>
-    <string name="rational_image_perm">This sample will read an image from local storage to upload to Firebase Storage.</string>
+    <string name="rational_image_perm">This sample will read an image from local storage to upload to Cloud Storage.</string>
     <string name="anonymous_auth_failed_msg">Anonymous authentication failed, various components of the demo will not work. Make sure your device is online and that Anonymous Auth is configured in your Firebase project(https://console.firebase.google.com/project/_/authentication/providers)</string>
     <string name="extra_google_scopes">Example extra Google scopes</string>
     <string name="games">Games</string>

storage/README.md

@@ -2,20 +2,20 @@
 
 ## Using FirebaseUI to download and display images
 
-[Firebase Storage][firebase-storage] provides secure file uploads and downloads for your Firebase apps,
+[Cloud Storage for Firebase][firebase-storage] provides secure file uploads and downloads for your Firebase apps,
 regardless of network quality. You can use it to store images, audio, video, or other
-user-generated content. Firebase Storage is backed by Google Cloud Storage, a powerful, simple,
+user-generated content. Cloud Storage is a powerful, simple,
 and cost-effective object storage service.
 
-FirebaseUI provides bindings to download an image file stored in Firebase Storage
+FirebaseUI provides bindings to download an image file stored in Cloud Storage
 from a [`StorageReference`][storage-reference] and display it using the popular
 [Glide][glide] library. This technique allows you to get all of Glide's performance
-benefits while leveraging Firebase Storage's authenticated storage capabilities.
+benefits while leveraging Cloud Storage's authenticated storage capabilities.
 
 To load an image from a `StorageReference`, simply use the `FirebaseImageLoader` class:
 
 ```java
-// Reference to an image file in Firebase Storage
+// Reference to an image file in Cloud Storage
 StorageReference storageReference = ...;
 
 // ImageView in your Activity
@@ -28,7 +28,7 @@ Glide.with(this /* context */)
         .into(imageView);
 ```
 
-Images displayed using `FirebaseImageLoader` are cached by their path in Firebase Storage, so
+Images displayed using `FirebaseImageLoader` are cached by their path in Cloud Storage, so
 repeated loads will be fast and conserve bandwidth. For more information on caching in Glide,
 see [this guide][glide-caching].