From 9b1ab3613c9e22f45c7404d5a5acd6b24df4dce6 Mon Sep 17 00:00:00 2001
From: mqi <mqi@codeaurora.org>
Date: Wed, 11 Feb 2015 17:42:50 +0800
Subject: Gallery2: Enable Suspend/Resume

Enable "Suspend/Resume" in Gallery which was commented out
while porting due to framework not ready at that time.

Change-Id: I74533b676f259d01c90d81aaeff72f8e8d8fbea0
CRs-fixed: 761691
---
 .../gallery3d/video/CodeauroraVideoView.java       | 41 +++++-----------------
 1 file changed, 8 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
index e3f80f7b6..20d14f900 100755
--- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
+++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
@@ -370,7 +370,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
                 if (LOG) {
                     Log.v(TAG, "surfaceCreated(" + holder + ")");
                 }
-                /*
                 if (mCurrentState == STATE_SUSPENDED) {
                     mSurfaceHolder = holder;
                     mMediaPlayer.setDisplay(mSurfaceHolder);
@@ -387,12 +386,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
                         release(false);
                     }
                 }
-                */
-                if (mCurrentState == STATE_SUSPENDED) {
-                    mSurfaceHolder = holder;
-                    mMediaPlayer.setDisplay(mSurfaceHolder);
-                    release(false);
-                }
                 mSurfaceHolder = holder;
                 openVideo();
             }
@@ -629,7 +622,9 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
         }
 
         public void surfaceCreated(SurfaceHolder holder) {
-            /*
+            if (LOG) {
+                Log.v(TAG, "surfaceCreated(" + holder + ")");
+            }
             if (mCurrentState == STATE_SUSPENDED) {
                 mSurfaceHolder = holder;
                 mMediaPlayer.setDisplay(mSurfaceHolder);
@@ -648,17 +643,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
             }
             mSurfaceHolder = holder;
             openVideo();
-            */
-            if (LOG) {
-                Log.v(TAG, "surfaceCreated(" + holder + ")");
-            }
-            if (mCurrentState == STATE_SUSPENDED) {
-                mSurfaceHolder = holder;
-                mMediaPlayer.setDisplay(mSurfaceHolder);
-                release(false);
-            }
-            mSurfaceHolder = holder;
-            openVideo();
         }
 
         public void surfaceDestroyed(SurfaceHolder holder) {
@@ -783,7 +767,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
     }
 
     public void suspend() {
-        /*
         // HTTP streaming will call mMediaPlayer->suspend(), others will call release()
         if (isHTTPStreaming(mUri) && mCurrentState != STATE_PREPARING) {
             if (mMediaPlayer != null) {
@@ -793,13 +776,13 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
                     return;
                 }
             }
-        }*/
+        }
         release(false);
     }
 
     public void resume() {
-        /*
-        // HTTP streaming (with suspended status) will call mMediaPlayer->resume(), others will call openVideo()
+        // HTTP streaming (with suspended status) will call mMediaPlayer->resume(), 
+        // others will call openVideo()
         if (mCurrentState == STATE_SUSPENDED) {
             if (mSurfaceHolder != null) {
                 // The surface hasn't been destroyed
@@ -817,16 +800,8 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
                      release(false);
                 }
             } else {
-                // The surface has been destroyed, resume operation will be done after surface created
-                return;
-            }
-        }*/
-        // HTTP streaming (with suspended status) will call mMediaPlayer->resume(), others will call openVideo()
-        if (mCurrentState == STATE_SUSPENDED) {
-            if (mSurfaceHolder != null) {
-                 release(false);
-            } else {
-                // The surface has been destroyed, resume operation will be done after surface created
+                // The surface has been destroyed, resume operation will be done 
+                // after surface created
                 return;
             }
         }
-- 
cgit v1.2.3