summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java2
-rw-r--r--src/com/android/gallery3d/app/MovieControllerOverlay.java70
-rwxr-xr-xsrc/com/android/gallery3d/app/MoviePlayer.java42
-rwxr-xr-xsrc/com/android/gallery3d/app/TimeBar.java8
4 files changed, 87 insertions, 35 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 1afbc5fae..cf8785cd1 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -91,7 +91,7 @@ import android.bluetooth.BluetoothProfile;
public class MovieActivity extends Activity {
@SuppressWarnings("unused")
private static final String TAG = "MovieActivity";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
public static final String KEY_LOGO_BITMAP = "logo-bitmap";
public static final String KEY_TREAT_UP_AS_BACK = "treat-up-as-back";
private static final String VIDEO_SDP_MIME_TYPE = "application/sdp";
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index bb25882c8..c26b12655 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -58,7 +58,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
AnimationListener {
private static final String TAG = "Gallery3D/MovieControllerOverlay";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
private ScreenModeManager mScreenModeManager;
private ScreenModeExt mScreenModeExt = new ScreenModeExt();
@@ -88,7 +88,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
hideAnimation.setAnimationListener(this);
enableRewindAndForward = true;
- Log.v(TAG, "enableRewindAndForward is " + enableRewindAndForward);
+ if (LOG) {
+ Log.v(TAG, "enableRewindAndForward is " + enableRewindAndForward);
+ }
mControllerRewindAndForwardExt.init(context);
mScreenModeExt.init(context, mTimeBar);
mBackground.setClickable(true);
@@ -281,7 +283,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
@Override
public void setViewEnabled(boolean isEnabled) {
if (mListener.onIsRTSP()) {
- Log.v(TAG, "setViewEnabled is " + isEnabled);
+ if (LOG) {
+ Log.v(TAG, "setViewEnabled is " + isEnabled);
+ }
mOverlayExt.setCanScrubbing(isEnabled);
mPlayPauseReplayView.setEnabled(isEnabled);
if (enableRewindAndForward) {
@@ -299,7 +303,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
@Override
public void setPlayPauseReplayResume() {
if (mListener.onIsRTSP()) {
- Log.v(TAG, "setPlayPauseReplayResume is enabled is true");
+ if (LOG) {
+ Log.v(TAG, "setPlayPauseReplayResume is enabled is true");
+ }
mPlayPauseReplayView.setEnabled(true);
}
}
@@ -685,7 +691,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
addView(mScreenView, wrapContent);
if (enableRewindAndForward) {
- Log.v(TAG, "ScreenModeExt enableRewindAndForward");
+ if (LOG) {
+ Log.v(TAG, "ScreenModeExt enableRewindAndForward");
+ }
mSeprator = new ImageView(context);
// default next screen mode
mSeprator.setImageResource(R.drawable.ic_separator_line);
@@ -696,7 +704,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
addView(mSeprator, wrapContent);
} else {
- Log.v(TAG, "ScreenModeExt unenableRewindAndForward");
+ if (LOG) {
+ Log.v(TAG, "ScreenModeExt unenableRewindAndForward");
+ }
}
// for screen layout
@@ -784,7 +794,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
private int mTimeBarHeight = 0;
void init(Context context) {
- Log.v(TAG, "ControllerRewindAndForwardExt init");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt init");
+ }
mTimeBarHeight = mTimeBar.getPreferredHeight();
Bitmap button = BitmapFactory.decodeResource(context.getResources(),
R.drawable.ic_menu_forward);
@@ -836,39 +848,55 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
@Override
public void onClick(View v) {
if (v == mStop) {
- Log.v(TAG, "ControllerRewindAndForwardExt onClick mStop");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onClick mStop");
+ }
mListenerForRewind.onStopVideo();
} else if (v == mRewind) {
- Log.v(TAG, "ControllerRewindAndForwardExt onClick mRewind");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onClick mRewind");
+ }
mListenerForRewind.onRewind();
} else if (v == mForward) {
- Log.v(TAG, "ControllerRewindAndForwardExt onClick mForward");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onClick mForward");
+ }
mListenerForRewind.onForward();
}
}
public void onStartHiding() {
- Log.v(TAG, "ControllerRewindAndForwardExt onStartHiding");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onStartHiding");
+ }
startHideAnimation(mContollerButtons);
}
public void onCancelHiding() {
- Log.v(TAG, "ControllerRewindAndForwardExt onCancelHiding");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onCancelHiding");
+ }
mContollerButtons.setAnimation(null);
}
public void onHide() {
- Log.v(TAG, "ControllerRewindAndForwardExt onHide");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onHide");
+ }
mContollerButtons.setVisibility(View.INVISIBLE);
}
public void onShow() {
- Log.v(TAG, "ControllerRewindAndForwardExt onShow");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onShow");
+ }
mContollerButtons.setVisibility(View.VISIBLE);
}
public void onLayout(int l, int r, int b) {
- Log.v(TAG, "ControllerRewindAndForwardExt onLayout");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onLayout");
+ }
int cl = (r - l - getAddedRightPadding()) / 2;
int cr = cl + getAddedRightPadding();
mContollerButtons.layout(cl, b - mTimeBar.getPreferredHeight(), cr, b);
@@ -880,14 +908,18 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
@Override
public void setIListener(IRewindAndForwardListener listener) {
- Log.v(TAG, "ControllerRewindAndForwardExt setIListener " + listener);
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt setIListener " + listener);
+ }
mListenerForRewind = listener;
}
@Override
public void showControllerButtonsView(boolean canStop, boolean canRewind, boolean canForward) {
- Log.v(TAG, "ControllerRewindAndForwardExt showControllerButtonsView " + canStop
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt showControllerButtonsView " + canStop
+ canRewind + canForward);
+ }
// show ui
mStop.setEnabled(canStop);
mRewind.setEnabled(canRewind);
@@ -958,7 +990,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
public void setViewEnabled(boolean isEnabled) {
// TODO Auto-generated method stub
- Log.v(TAG, "ControllerRewindAndForwardExt setViewEnabled is " + isEnabled);
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt setViewEnabled is " + isEnabled);
+ }
mRewind.setEnabled(isEnabled);
mForward.setEnabled(isEnabled);
}
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index c52c4b0f9..2ef7c2e85 100755
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -80,7 +80,7 @@ public class MoviePlayer implements
MediaPlayer.OnBufferingUpdateListener {
@SuppressWarnings("unused")
private static final String TAG = "MoviePlayer";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
private static final String KEY_VIDEO_POSITION = "video-position";
private static final String KEY_RESUMEABLE_TIME = "resumeable-timeout";
@@ -213,7 +213,9 @@ public class MoviePlayer implements
mKeyguardLocked = false;
mCanResumed = false;
} else if (Intent.ACTION_SHUTDOWN.equals(intent.getAction())) {
- Log.v(TAG, "Intent.ACTION_SHUTDOWN received");
+ if (LOG) {
+ Log.v(TAG, "Intent.ACTION_SHUTDOWN received");
+ }
mActivityContext.finish();
}
}
@@ -797,10 +799,14 @@ public class MoviePlayer implements
public boolean onIsRTSP() {
if (MovieUtils.isRtspStreaming(mMovieItem.getUri(), mMovieItem
.getMimeType())) {
- Log.v(TAG, "onIsRTSP() is RTSP");
+ if (LOG) {
+ Log.v(TAG, "onIsRTSP() is RTSP");
+ }
return true;
}
- Log.v(TAG, "onIsRTSP() is not RTSP");
+ if (LOG) {
+ Log.v(TAG, "onIsRTSP() is not RTSP");
+ }
return false;
}
@@ -858,9 +864,11 @@ public class MoviePlayer implements
}
public void updateRewindAndForwardUI() {
- Log.v(TAG, "updateRewindAndForwardUI");
- Log.v(TAG, "updateRewindAndForwardUI== getCurrentPosition = " + mVideoView.getCurrentPosition());
- Log.v(TAG, "updateRewindAndForwardUI==getDuration =" + mVideoView.getDuration());
+ if (LOG) {
+ Log.v(TAG, "updateRewindAndForwardUI");
+ Log.v(TAG, "updateRewindAndForwardUI== getCurrentPosition = " + mVideoView.getCurrentPosition());
+ Log.v(TAG, "updateRewindAndForwardUI==getDuration =" + mVideoView.getDuration());
+ }
if (mControllerRewindAndForwardExt != null) {
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
.canStop(), mVideoView.canSeekBackward()
@@ -1523,7 +1531,9 @@ public class MoviePlayer implements
@Override
public void onStopVideo() {
- Log.v(TAG, "ControllerRewindAndForwardExt onStopVideo()");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onStopVideo()");
+ }
if (mPlayerExt.canStop()) {
mPlayerExt.stopVideo();
mControllerRewindAndForwardExt.showControllerButtonsView(false,
@@ -1533,7 +1543,9 @@ public class MoviePlayer implements
@Override
public void onRewind() {
- Log.v(TAG, "ControllerRewindAndForwardExt onRewind()");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onRewind()");
+ }
if (mVideoView != null && mVideoView.canSeekBackward()) {
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
.canStop(),
@@ -1542,7 +1554,9 @@ public class MoviePlayer implements
int targetDuration = mVideoView.getCurrentPosition()
- stepValue < 0 ? 0 : mVideoView.getCurrentPosition()
- stepValue;
- Log.v(TAG, "onRewind targetDuration " + targetDuration);
+ if (LOG) {
+ Log.v(TAG, "onRewind targetDuration " + targetDuration);
+ }
mVideoView.seekTo(targetDuration);
} else {
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
@@ -1553,7 +1567,9 @@ public class MoviePlayer implements
@Override
public void onForward() {
- Log.v(TAG, "ControllerRewindAndForwardExt onForward()");
+ if (LOG) {
+ Log.v(TAG, "ControllerRewindAndForwardExt onForward()");
+ }
if (mVideoView != null && mVideoView.canSeekForward()) {
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
.canStop(),
@@ -1563,7 +1579,9 @@ public class MoviePlayer implements
+ stepValue > mVideoView.getDuration() ? mVideoView
.getDuration() : mVideoView.getCurrentPosition()
+ stepValue;
- Log.v(TAG, "onForward targetDuration " + targetDuration);
+ if (LOG) {
+ Log.v(TAG, "onForward targetDuration " + targetDuration);
+ }
mVideoView.seekTo(targetDuration);
} else {
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java
index 1d08989aa..2870c489c 100755
--- a/src/com/android/gallery3d/app/TimeBar.java
+++ b/src/com/android/gallery3d/app/TimeBar.java
@@ -56,7 +56,7 @@ public class TimeBar extends View {
private static final int TEXT_SIZE_IN_DP = 14;
private static final String TAG = "Gallery3D/TimeBar";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
public static final int UNKNOWN = -1;
protected final Listener mListener;
@@ -439,7 +439,7 @@ interface ITimeBarLayoutExt {
class TimeBarInfoExtImpl implements ITimeBarInfoExt {
private static final String TAG = "TimeBarInfoExtensionImpl";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
private static final String ELLIPSE = "...";
private Paint mInfoPaint;
@@ -504,7 +504,7 @@ class TimeBarInfoExtImpl implements ITimeBarInfoExt {
class TimeBarSecondaryProgressExtImpl implements ITimeBarSecondaryProgressExt {
private static final String TAG = "TimeBarSecondaryProgressExtensionImpl";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
private int mBufferPercent;
private Rect mSecondaryBar;
@@ -539,7 +539,7 @@ class TimeBarSecondaryProgressExtImpl implements ITimeBarSecondaryProgressExt {
class TimeBarLayoutExtImpl implements ITimeBarLayoutExt {
private static final String TAG = "TimeBarLayoutExtensionImpl";
- private static final boolean LOG = true;
+ private static final boolean LOG = false;
private int mTextPadding;
private int mVPaddingInPx;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:18:30 +0000