am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
* commit 'd80bb5974b0ec43ca1755aff4287fc7815504058':
Show control overlay when earphone is unplugged
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 003ebbf..9c81c79 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -16,11 +16,6 @@
package com.android.gallery3d.app;
-import com.android.gallery3d.R;
-import com.android.gallery3d.common.BlobCache;
-import com.android.gallery3d.util.CacheManager;
-import com.android.gallery3d.util.GalleryUtils;
-
import android.app.ActionBar;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
@@ -35,13 +30,16 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
-import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.MediaController;
import android.widget.VideoView;
+import com.android.gallery3d.R;
+import com.android.gallery3d.common.BlobCache;
+import com.android.gallery3d.util.CacheManager;
+import com.android.gallery3d.util.GalleryUtils;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -349,9 +347,7 @@
@Override
public void onReceive(Context context, Intent intent) {
- if (mVideoView.isPlaying()) {
- mVideoView.pause();
- }
+ if (mVideoView.isPlaying()) pauseVideo();
}
}
}