From 4dd9dc8204105a25e37dacbc392ea3c7212a8063 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Thu, 10 May 2012 17:20:19 -0700
Subject: [PATCH] Keep the controller when video ended.

Use the media controller as a reminder to the user when the video ended.
We don't quit the video here b/c user may want to replay the video.

bug:5340224
Change-Id: I6d5fdb54bb614277b75e1a18ebe0a7dadd47017e
---
 core/java/android/webkit/HTML5VideoFullScreen.java | 6 ++++++
 core/java/android/webkit/HTML5VideoView.java       | 3 +++
 core/java/android/webkit/HTML5VideoViewProxy.java  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 730ad08db3487..eb91d68c2e15a 100644
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -198,6 +198,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
         // after reading the MetaData
         if (mMediaController != null) {
             mMediaController.setEnabled(true);
+            mMediaController.show();
         }
 
         if (mProgressView != null) {
@@ -320,6 +321,11 @@ public class HTML5VideoFullScreen extends HTML5VideoView
     return 0;
     }
 
+    @Override
+    public void showControllerInFullScreen() {
+        mMediaController.show(0);
+    }
+
     // Other listeners functions:
     private MediaPlayer.OnBufferingUpdateListener mBufferingUpdateListener =
         new MediaPlayer.OnBufferingUpdateListener() {
diff --git a/core/java/android/webkit/HTML5VideoView.java b/core/java/android/webkit/HTML5VideoView.java
index 0d3b755ec7019..5781840c23e65 100644
--- a/core/java/android/webkit/HTML5VideoView.java
+++ b/core/java/android/webkit/HTML5VideoView.java
@@ -342,4 +342,7 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener {
         return m_startWhenPrepared;
     }
 
+    public void showControllerInFullScreen() {
+    }
+
 }
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index 5fa4badda334e..89b86300a089a 100644
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -273,6 +273,7 @@ class HTML5VideoViewProxy extends Handler
         }
 
         public static void end() {
+            mHTML5VideoView.showControllerInFullScreen();
             if (mCurrentProxy != null) {
                 if (isVideoSelfEnded)
                     mCurrentProxy.dispatchOnEnded();