diff options
author | ztenghui <ztenghui@google.com> | 2013-04-17 14:41:05 -0700 |
---|---|---|
committer | ztenghui <ztenghui@google.com> | 2013-04-17 14:47:02 -0700 |
commit | e8b4b34cb77b179f397641e2f4572e4aa6be1943 (patch) | |
tree | c7d818d6f8ba8d7b95d085e4d286841a743306b7 /src | |
parent | 634248d313c88f14ff851e7b6769b432ce45e15e (diff) | |
download | android_packages_apps_Gallery2-e8b4b34cb77b179f397641e2f4572e4aa6be1943.tar.gz android_packages_apps_Gallery2-e8b4b34cb77b179f397641e2f4572e4aa6be1943.tar.bz2 android_packages_apps_Gallery2-e8b4b34cb77b179f397641e2f4572e4aa6be1943.zip |
When video not seekable, don't show the scrubber
bug:7117365
Change-Id: I133ea68eaebf1d875a27336ac524d785efe71cc2
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/CommonControllerOverlay.java | 4 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 12 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/TimeBar.java | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/CommonControllerOverlay.java b/src/com/android/gallery3d/app/CommonControllerOverlay.java index a4f5807ae..9adb4e7a8 100644 --- a/src/com/android/gallery3d/app/CommonControllerOverlay.java +++ b/src/com/android/gallery3d/app/CommonControllerOverlay.java @@ -66,6 +66,10 @@ public abstract class CommonControllerOverlay extends FrameLayout implements protected boolean mCanReplay = true; + public void setSeekable(boolean canSeek) { + mTimeBar.setSeekable(canSeek); + } + public CommonControllerOverlay(Context context) { super(context); diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 00e4cd63b..ce9183483 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -25,7 +25,6 @@ import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.IntentFilter; -import android.graphics.Color; import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; @@ -135,6 +134,17 @@ public class MoviePlayer implements return true; } }); + mVideoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { + @Override + public void onPrepared(MediaPlayer player) { + if (!mVideoView.canSeekForward() || !mVideoView.canSeekBackward()) { + mController.setSeekable(false); + } else { + mController.setSeekable(true); + } + setProgress(); + } + }); // The SurfaceView is transparent before drawing the first frame. // This makes the UI flashing when open a video. (black -> old screen diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java index 402dfcfab..246346a56 100644 --- a/src/com/android/gallery3d/app/TimeBar.java +++ b/src/com/android/gallery3d/app/TimeBar.java @@ -259,4 +259,8 @@ public class TimeBar extends View { } } + public void setSeekable(boolean canSeek) { + mShowScrubber = canSeek; + } + } |