From 540035dfd1347c78eeec10ec0847e18fcc50ef36 Mon Sep 17 00:00:00 2001
From: Andrei Popescu <andreip@google.com>
Date: Fri, 18 Sep 2009 18:59:20 +0100
Subject: [PATCH] Add progress view and default poster for the <video>
 implementation

---
 res/drawable/default_video_poster.png        | Bin 0 -> 3499 bytes
 res/layout/video_loading_progress.xml        |  36 +++++++++++++++++++++++++
 res/values/strings.xml                       |   2 ++
 src/com/android/browser/BrowserActivity.java |  38 +++++++++++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100755 res/drawable/default_video_poster.png
 create mode 100644 res/layout/video_loading_progress.xml

diff --git a/res/drawable/default_video_poster.png b/res/drawable/default_video_poster.png
new file mode 100755
index 0000000000000000000000000000000000000000..f457f2332d3c8d87f29060126bd6982bd336ed07
GIT binary patch
literal 3499
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
Z3;?JE;&A0<zGnac002ovPDHLkV1mD}{qX<*

literal 0
HcmV?d00001

diff --git a/res/layout/video_loading_progress.xml b/res/layout/video_loading_progress.xml
new file mode 100644
index 0000000..dd818bd
--- /dev/null
+++ b/res/layout/video_loading_progress.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+         android:id="@+id/progress_indicator"
+         android:orientation="vertical"
+         android:layout_centerInParent="true"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content">
+
+       <ProgressBar android:id="@android:id/progress"
+           style="?android:attr/progressBarStyleLarge"
+           android:layout_gravity="center"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content" />
+
+       <TextView android:paddingTop="5dip"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:layout_gravity="center"
+           android:text="@string/loading_video" android:textSize="14sp"
+           android:textColor="?android:attr/textColorPrimary" />
+ </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 407532a..42d5a8c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -721,6 +721,8 @@
     <string name="webstorage_clear_data_dialog_cancel_button">Cancel</string>
     <!-- Strings used in the summary of origins -->
     <string name="webstorage_origin_summary_mb_stored">MB stored on your phone</string>
+        <!-- String shown in a progress view while a video is loading, before it starts playing -->
+    <string name="loading_video">Loading video</string>
 
     <!-- Geolocation -->
     <!-- Permissions prompt -->
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1801b52..1730f9b 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -45,6 +45,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.DrawFilter;
 import android.graphics.Paint;
@@ -3274,6 +3275,38 @@ public class BrowserActivity extends Activity
                 }
             Log.w(LOGTAG, "Console: " + message + " " + sourceID + ":" + lineNumber);
         }
+
+        /**
+         * Ask the browser for an icon to represent a <video> element.
+         * This icon will be used if the Web page did not specify a poster attribute.
+         *
+         * @return Bitmap The icon or null if no such icon is available.
+         * @hide pending API Council approval
+         */
+        @Override
+        public Bitmap getDefaultVideoPoster() {
+            if (mDefaultVideoPoster == null) {
+                mDefaultVideoPoster = BitmapFactory.decodeResource(
+                        getResources(), R.drawable.default_video_poster);
+            }
+            return mDefaultVideoPoster;
+        }
+
+        /**
+         * Ask the host application for a custom progress view to show while
+         * a <video> is loading.
+         *
+         * @return View The progress view.
+         * @hide pending API Council approval
+         */
+        @Override
+        public View getVideoLoadingProgressView() {
+            if (mVideoProgressView == null) {
+                LayoutInflater inflater = LayoutInflater.from(BrowserActivity.this);
+                mVideoProgressView = inflater.inflate(R.layout.video_loading_progress, null);
+            }
+            return mVideoProgressView;
+        }
     };
 
     /**
@@ -4343,6 +4376,11 @@ public class BrowserActivity extends Activity
     final static int DOWNLOAD_PAGE              = 2;
     final static int PREFERENCES_PAGE           = 3;
 
+    // the default <video> poster
+    private Bitmap mDefaultVideoPoster;
+    // the video progress view
+    private View mVideoProgressView;
+
     /**
      * A UrlData class to abstract how the content will be set to WebView.
      * This base class uses loadUrl to show the content.
-- 
2.11.0