diff options
| author | Owen Lin <owenlin@google.com> | 2011-11-11 06:36:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 06:36:40 +0000 |
| commit | cd33014879b3b4a7d7c9c9f7699fb82282a860df (patch) | |
| tree | 8a399ff222032ab2aef3af0fede65d5adc00600e /src | |
| parent | 65b1c3d4b5b14012ed9e7952ad35f75a714a2774 (diff) | |
| parent | 7e0d6039f2ca726756277f31bbbce77c8476b911 (diff) | |
| download | android_packages_apps_Snap-cd33014879b3b4a7d7c9c9f7699fb82282a860df.tar.gz android_packages_apps_Snap-cd33014879b3b4a7d7c9c9f7699fb82282a860df.tar.bz2 android_packages_apps_Snap-cd33014879b3b4a7d7c9c9f7699fb82282a860df.zip | |
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
* commit 'd80bb5974b0ec43ca1755aff4287fc7815504058':
Show control overlay when earphone is unplugged
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 003ebbfee..9c81c79c2 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.media.MediaPlayer; 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 @@ public class MoviePlayer implements @Override public void onReceive(Context context, Intent intent) { - if (mVideoView.isPlaying()) { - mVideoView.pause(); - } + if (mVideoView.isPlaying()) pauseVideo(); } } } |