diff options
19 files changed, 103 insertions, 51 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; diff --git a/src/org/codeaurora/gallery3d/ext/MovieItem.java b/src/org/codeaurora/gallery3d/ext/MovieItem.java index c6d53d031..56afdda4b 100644 --- a/src/org/codeaurora/gallery3d/ext/MovieItem.java +++ b/src/org/codeaurora/gallery3d/ext/MovieItem.java @@ -5,7 +5,7 @@ import android.provider.MediaStore; public class MovieItem implements IMovieItem { private static final String TAG = "MovieItem"; - private static final boolean LOG = true; + private static final boolean LOG = false; private Uri mUri; private String mMimeType; diff --git a/src/org/codeaurora/gallery3d/ext/MovieList.java b/src/org/codeaurora/gallery3d/ext/MovieList.java index 585e288ef..ecb7f0db3 100644 --- a/src/org/codeaurora/gallery3d/ext/MovieList.java +++ b/src/org/codeaurora/gallery3d/ext/MovieList.java @@ -6,7 +6,7 @@ import java.util.ArrayList; public class MovieList implements IMovieList { private static final String TAG = "MovieList"; - private static final boolean LOG = true; + private static final boolean LOG = false; private final ArrayList<IMovieItem> mItems = new ArrayList<IMovieItem>(); private static final int UNKNOWN = -1; diff --git a/src/org/codeaurora/gallery3d/ext/MovieListLoader.java b/src/org/codeaurora/gallery3d/ext/MovieListLoader.java index 94e6afd86..60f0392de 100644 --- a/src/org/codeaurora/gallery3d/ext/MovieListLoader.java +++ b/src/org/codeaurora/gallery3d/ext/MovieListLoader.java @@ -23,7 +23,7 @@ import java.util.ArrayList; */ public class MovieListLoader implements IMovieListLoader { private static final String TAG = "MovieListLoader"; - private static final boolean LOG = true; + private static final boolean LOG = false; private MovieListFetcherTask mListTask; @@ -101,7 +101,7 @@ public class MovieListLoader implements IMovieListLoader { private class MovieListFetcherTask extends AsyncTask<IMovieItem, Void, IMovieList> { private static final String TAG = "MovieListFetcherTask"; - private static final boolean LOG = true; + private static final boolean LOG = false; // TODO comments by sunlei // public static final String COLUMN_STEREO_TYPE = MediaStore.Video.Media.STEREO_TYPE; diff --git a/src/org/codeaurora/gallery3d/ext/MovieUtils.java b/src/org/codeaurora/gallery3d/ext/MovieUtils.java index 2846ab584..4bc70a39f 100644 --- a/src/org/codeaurora/gallery3d/ext/MovieUtils.java +++ b/src/org/codeaurora/gallery3d/ext/MovieUtils.java @@ -10,7 +10,7 @@ import java.util.Locale; */ public class MovieUtils { private static final String TAG = "MovieUtils"; - private static final boolean LOG = true; + private static final boolean LOG = false; private MovieUtils() { } diff --git a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java index ed653f63a..e4662b4eb 100644 --- a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java +++ b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java @@ -33,7 +33,7 @@ import com.android.gallery3d.app.MovieActivity; public class BookmarkActivity extends Activity implements OnItemClickListener { private static final String TAG = "BookmarkActivity"; - private static final boolean LOG = true; + private static final boolean LOG = false; private BookmarkEnhance mBookmark; private BookmarkAdapter mAdapter; diff --git a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java b/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java index fc3ed9b0f..cf607ecc4 100644 --- a/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java +++ b/src/org/codeaurora/gallery3d/video/BookmarkEnhance.java @@ -12,7 +12,7 @@ import com.android.gallery3d.R; public class BookmarkEnhance { private static final String TAG = "BookmarkEnhance"; - private static final boolean LOG = true; + private static final boolean LOG = false; private static final Uri BOOKMARK_URI = Uri.parse("content://media/internal/bookmark"); diff --git a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java b/src/org/codeaurora/gallery3d/video/BookmarkHooker.java index 9d7697d7a..015fc3c41 100644 --- a/src/org/codeaurora/gallery3d/video/BookmarkHooker.java +++ b/src/org/codeaurora/gallery3d/video/BookmarkHooker.java @@ -9,7 +9,7 @@ import org.codeaurora.gallery3d.ext.MovieUtils; public class BookmarkHooker extends MovieHooker { private static final String TAG = "BookmarkHooker"; - private static final boolean LOG = true; + private static final boolean LOG = false; private static final String ACTION_BOOKMARK = "org.codeaurora.bookmark.VIEW"; private static final int MENU_BOOKMARK_ADD = 1; diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java index 41fd09c53..c637c295a 100755 --- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java +++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java @@ -41,7 +41,7 @@ import java.util.Map; * such as scaling and tinting. */ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerControl, ScreenModeListener{ - private static final boolean LOG = true; + private static final boolean LOG = false; private String TAG = "CodeauroraVideoView"; // settable by the client private Uri mUri; diff --git a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java b/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java index 468e8a878..004254856 100644 --- a/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java +++ b/src/org/codeaurora/gallery3d/video/LoopVideoHooker.java @@ -9,7 +9,7 @@ import org.codeaurora.gallery3d.ext.MovieUtils; public class LoopVideoHooker extends MovieHooker { private static final String TAG = "LoopVideoHooker"; - private static final boolean LOG = true; + private static final boolean LOG = false; private static final int MENU_LOOP = 1; private MenuItem mMenuLoopButton; diff --git a/src/org/codeaurora/gallery3d/video/MovieHooker.java b/src/org/codeaurora/gallery3d/video/MovieHooker.java index 47e4bcee8..a859d44a3 100644 --- a/src/org/codeaurora/gallery3d/video/MovieHooker.java +++ b/src/org/codeaurora/gallery3d/video/MovieHooker.java @@ -9,7 +9,7 @@ import org.codeaurora.gallery3d.ext.IMoviePlayer; public class MovieHooker extends ActivityHooker { private static final String TAG = "MovieHooker"; - private static final boolean LOG = true; + private static final boolean LOG = false; private IMovieItem mMovieItem; private IMoviePlayer mPlayer; diff --git a/src/org/codeaurora/gallery3d/video/MovieListHooker.java b/src/org/codeaurora/gallery3d/video/MovieListHooker.java index 3da15b1dd..ee360ac78 100644 --- a/src/org/codeaurora/gallery3d/video/MovieListHooker.java +++ b/src/org/codeaurora/gallery3d/video/MovieListHooker.java @@ -14,7 +14,7 @@ import org.codeaurora.gallery3d.ext.MovieListLoader; public class MovieListHooker extends MovieHooker implements LoaderListener { private static final String TAG = "MovieListHooker"; - private static final boolean LOG = true; + private static final boolean LOG = false; private static final int MENU_NEXT = 1; private static final int MENU_PREVIOUS = 2; diff --git a/src/org/codeaurora/gallery3d/video/MovieTitleHelper.java b/src/org/codeaurora/gallery3d/video/MovieTitleHelper.java index 5f2229d5e..4f23e81b8 100644 --- a/src/org/codeaurora/gallery3d/video/MovieTitleHelper.java +++ b/src/org/codeaurora/gallery3d/video/MovieTitleHelper.java @@ -13,7 +13,7 @@ import java.io.File; public class MovieTitleHelper { private static final String TAG = "MovieTitleHelper"; - private static final boolean LOG = true; + private static final boolean LOG = false; public static String getTitleFromMediaData(final Context context, final Uri uri) { String title = null; diff --git a/src/org/codeaurora/gallery3d/video/ScreenModeManager.java b/src/org/codeaurora/gallery3d/video/ScreenModeManager.java index 3dbba68d8..a1c04c69f 100644 --- a/src/org/codeaurora/gallery3d/video/ScreenModeManager.java +++ b/src/org/codeaurora/gallery3d/video/ScreenModeManager.java @@ -6,7 +6,7 @@ import java.util.ArrayList; public class ScreenModeManager { private static final String TAG = "ScreenModeManager"; - private static final boolean LOG = true; + private static final boolean LOG = false; //support screen mode. public static final int SCREENMODE_BIGSCREEN = 1; public static final int SCREENMODE_FULLSCREEN = 2; diff --git a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java b/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java index 88012fa7d..cbf2f357a 100755 --- a/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java +++ b/src/org/codeaurora/gallery3d/video/StereoAudioHooker.java @@ -10,7 +10,7 @@ import com.android.gallery3d.R; public class StereoAudioHooker extends MovieHooker { private static final String TAG = "StereoAudioHooker"; - private static final boolean LOG = true; + private static final boolean LOG = false; private static final int MENU_STEREO_AUDIO = 1; private MenuItem mMenuStereoAudio; diff --git a/src/org/codeaurora/gallery3d/video/StreamingHooker.java b/src/org/codeaurora/gallery3d/video/StreamingHooker.java index 7def5d8a0..55735f44c 100755 --- a/src/org/codeaurora/gallery3d/video/StreamingHooker.java +++ b/src/org/codeaurora/gallery3d/video/StreamingHooker.java @@ -14,7 +14,7 @@ import org.codeaurora.gallery3d.ext.MovieUtils; public class StreamingHooker extends MovieHooker { private static final String TAG = "StreamingHooker"; - private static final boolean LOG = true; + private static final boolean LOG = false; private static final String ACTION_STREAMING = "org.codeaurora.settings.streaming"; private static final int MENU_INPUT_URL = 1; |