Pause the playback of video if the activity is resumed after 3 mins.

fix: 5260232

Also keep the current playback position when the activity is resumed.
Originally, we use the bookmark to keep the position. However, the bookmark
will be ignored if

1.) The video duration is less than 2 mins, 2.) The video
is just started (with 30sec), or 3.) The video is approching the end.

I think resume should not limited by the above rules. And we did get some
reports on this. (We mark them as WORK AS INTENTDED).

Change-Id: Ib9ac359d7ccb6a0278777b0892f0821e16bbb745

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 4c9be7ef0..d0383aa35 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -52,7 +52,7 @@ public class MovieActivity extends Activity {
         View rootView = findViewById(R.id.root);
         Intent intent = getIntent();
         setVideoTitle(intent);
-        mPlayer = new MoviePlayer(rootView, this, intent.getData()) {
+        mPlayer = new MoviePlayer(rootView, this, intent.getData(), savedInstanceState) {
             @Override
             public void onCompletion() {
                 if (mFinishOnCompletion) {
@@ -73,7 +73,6 @@ public class MovieActivity extends Activity {
         WindowManager.LayoutParams winParams = win.getAttributes();
         winParams.buttonBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_OFF;
         win.setAttributes(winParams);
-
     }
 
     private void setVideoTitle(Intent intent) {
@@ -124,6 +123,12 @@ public class MovieActivity extends Activity {
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mPlayer.onSaveInstanceState(outState);
+    }
+
+    @Override
     public void onDestroy() {
         mPlayer.onDestroy();
         super.onDestroy();