Merge pull request #217 from android/yrezgui/static-assets

Update static assets URLs

Author: yrezgui

JetStreamCompose/jetstream/src/main/assets/movies.json

@@ -36,7 +36,7 @@
 
     <string name="search_results">Search results for \'%1$s\'</string>
     <string name="no_search_results">No search results found for \'%1$s\'</string>
-    <string name="catalog_url">https://storage.googleapis.com/android-tv/android_tv_videos_new.json</string>
+    <string name="catalog_url">https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/android_tv_videos_new.json</string>
 
     <!-- Error messages -->
 

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

@@ -102,7 +102,7 @@ public void getVideosFromLocalJson() throws JSONException {
 
     @Test
     public void getVideosFromServer() throws IOException, JSONException {
-        String serverUrl = "https://storage.googleapis.com/android-tv/android_tv_videos_new.json";
+        String serverUrl = "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/android_tv_videos_new.json";
         VideoDbBuilder videoDbBuilder = new VideoDbBuilder();
         List<ContentValues> contentValuesList = videoDbBuilder.fetch(serverUrl);
         Assert.assertTrue(contentValuesList.size() > 0);

Leanback/app/src/test/java/com/example/android/tvleanback/VideoDbUnitTest.java

@@ -28,7 +28,7 @@
 
 public class VideoConsumptionExampleFragment extends VideoFragment {
 
-    private static final String URL = "https://storage.googleapis.com/android-tv/Sample videos/"
+    private static final String URL = "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample videos/"
             + "April Fool's 2013/Explore Treasure Mode with Google Maps.mp4";
     public static final String TAG = "VideoConsumption";
     private VideoMediaPlayerGlue<MediaPlayerAdapter> mMediaPlayerGlue;

LeanbackShowcase/app/src/main/java/androidx/leanback/leanbackshowcase/app/media/VideoConsumptionExampleFragment.java

@@ -27,7 +27,7 @@
 
 public class VideoConsumptionExampleWithExoPlayerFragment extends VideoFragment {
 
-    private static final String URL = "https://storage.googleapis.com/android-tv/Sample videos/"
+    private static final String URL = "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample videos/"
             + "April Fool's 2013/Explore Treasure Mode with Google Maps.mp4";
     public static final String TAG = "VideoConsumptionWithExoPlayer";
     private VideoMediaPlayerGlue<ExoPlayerAdapter> mMediaPlayerGlue;

LeanbackShowcase/app/src/main/java/androidx/leanback/leanbackshowcase/app/media/VideoConsumptionExampleWithExoPlayerFragment.java

@@ -166,7 +166,7 @@ private void createAndPopulateDatabase() {
         // insert contents into database
         try {
             String url =
-                    "https://storage.googleapis.com/android-tv/";
+                    "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/";
             initializeDb(mDb, url);
         } catch (IOException e) {
             e.printStackTrace();
@@ -270,7 +270,7 @@ private static void postProcessing(VideosWithGoogleTag.VideosGroupByCategory vid
             each.setVideoUrl(each.getVideoUrls().get(0));
             each.setRented(false);
             each.setStatus("");
-            each.setTrailerVideoUrl("https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20Say%20more%20with%20Hangouts.mp4");
+            each.setTrailerVideoUrl("https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20Say%20more%20with%20Hangouts.mp4");
         }
     }
 }

LeanbackShowcase/app/src/main/java/androidx/leanback/leanbackshowcase/app/room/db/repo/VideosRepository.java

@@ -5,8 +5,8 @@
   "text": "It was nine o’clock one sunny California morning, and Geoffrey Strong stood under the live-oak trees in Las Flores Cañon, with a pot of black paint in one hand and a huge brush in the other.  He could have handled these implements to better purpose and with better grace had not his arms been firmly held by three laughing girls, who pulled not wisely, but too well.  He was further incommoded by the presence of a small urchin who lay on the dusty ground beneath his feet, fastening an upward clutch on the legs of his trousers.\n\nThere were three large canvas tents directly in front of them, yet no one of these seemed to be the object of dissension, but rather a redwood board, some three feet in length, which was nailed on a tree near by. twitch of her cousin’s sleeve.",
   "localImageResource": "movie_poster_01",
   "price": "$9.99",
-  "trailerUrl": "https://storage.googleapis.com/android-tv/Sample videos/Google+/Google+_ Sharing but like real life.mp4",
-  "videoUrl": "https://storage.googleapis.com/android-tv/Sample videos/April Fool's 2013/Explore Treasure Mode with Google Maps.mp4",
+  "trailerUrl": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample videos/Google+/Google+_ Sharing but like real life.mp4",
+  "videoUrl": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample videos/April Fool's 2013/Explore Treasure Mode with Google Maps.mp4",
   "characters": [
     {
       "type": "CHARACTER",

LeanbackShowcase/app/src/main/res/raw/detail_example.json

@@ -3,33 +3,33 @@
     "category": "Google+",
     "videos": [{
       "description": "Jon introduces Instant Upload with a few thoughts on how we remember the things that matter. Check out some ways we've been rethinking real-life sharing for the web at plus.google.com",
-      "sources": ["https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20Instant%20Upload.mp4"],
-      "card": "https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20Instant%20Upload/card.jpg",
-      "background": "https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20Instant%20Upload/bg.jpg",
+      "sources": ["https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20Instant%20Upload.mp4"],
+      "card": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20Instant%20Upload/card.jpg",
+      "background": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20Instant%20Upload/bg.jpg",
       "title": "Instant Upload",
       "studio": "Google+"
     }, {
       "description": "With Google+ Instant Upload, every picture you take on your phone is instantly backed up to a private Google+ album. It's a simple way to make sure you never lose another memory.",
-      "sources": ["https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20New%20Dad.mp4"],
-      "card": "https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20New%20Dad/card.jpg",
-      "background": "https://storage.googleapis.com/android-tv/Sample%20videos/Google%2B/Google%2B_%20New%20Dad/bg.jpg",
+      "sources": ["https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20New%20Dad.mp4"],
+      "card": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20New%20Dad/card.jpg",
+      "background": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Google%2B/Google%2B_%20New%20Dad/bg.jpg",
       "title": "New Dad",
       "studio": "Google+"
     }]
   }, {
     "category": "Demo Slam",
     "videos": [{
       "description": "Fusce id nisi turpis. Praesent viverra bibendum semper. Donec tristique, orci sed semper lacinia, quam erat rhoncus massa, non congue tellus est quis tellus. Sed mollis orci venenatis quam scelerisque accumsan. Curabitur a massa sit amet mi accumsan mollis sed et magna. Vivamus sed aliquam risus. Nulla eget dolor in elit facilisis mattis. Ut aliquet luctus lacus. Phasellus nec commodo erat. Praesent tempus id lectus ac scelerisque. Maecenas pretium cursus lectus id volutpat.",
-      "sources": ["https://storage.googleapis.com/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%2020ft%20Search.mp4"],
-      "card": "https://storage.googleapis.com/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%2020ft%20Search/card.jpg",
-      "background": "https://storage.googleapis.com/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%2020ft%20Search/bg.jpg",
+      "sources": ["https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%2020ft%20Search.mp4"],
+      "card": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%2020ft%20Search/card.jpg",
+      "background": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%2020ft%20Search/bg.jpg",
       "title": "20ft Search",
       "studio": "Google Demo Slam"
     }, {
       "description": "Fusce id nisi turpis. Praesent viverra bibendum semper. Donec tristique, orci sed semper lacinia, quam erat rhoncus massa, non congue tellus est quis tellus. Sed mollis orci venenatis quam scelerisque accumsan. Curabitur a massa sit amet mi accumsan mollis sed et magna. Vivamus sed aliquam risus. Nulla eget dolor in elit facilisis mattis. Ut aliquet luctus lacus. Phasellus nec commodo erat. Praesent tempus id lectus ac scelerisque. Maecenas pretium cursus lectus id volutpat.",
-      "sources": ["https://storage.googleapis.com/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%20Balcony%20Toss.mp4"],
-      "card": "https://storage.googleapis.com/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%20Balcony%20Toss/card.jpg",
-      "background": "https://storage.googleapis.com/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%20Balcony%20Toss/bg.jpg",
+      "sources": ["https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%20Balcony%20Toss.mp4"],
+      "card": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%20Balcony%20Toss/card.jpg",
+      "background": "https://storage.googleapis.com/androiddevelopers/samples_assets/android-tv/Sample%20videos/Demo%20Slam/Google%20Demo%20Slam_%20Balcony%20Toss/bg.jpg",
       "title": "Balcony Toss",
       "studio": "Google Demo Slam"
     }]