diff options
author | emancebo <emancebo@cyngn.com> | 2014-09-16 18:18:27 -0700 |
---|---|---|
committer | Bruno Martins <bgcngm@gmail.com> | 2018-11-20 09:39:49 +0000 |
commit | d02d907bbb8c65ba263e0a0799535b164bad4e43 (patch) | |
tree | 8b5c41a3ce0ab7861d5e27fffa3684e40e8ada5a /src/com/android/gallery3d/app | |
parent | 89b472f023a247b6a6fe12bcbeb60e0868c99ef5 (diff) | |
download | android_packages_apps_Gallery2-d02d907bbb8c65ba263e0a0799535b164bad4e43.tar.gz android_packages_apps_Gallery2-d02d907bbb8c65ba263e0a0799535b164bad4e43.tar.bz2 android_packages_apps_Gallery2-d02d907bbb8c65ba263e0a0799535b164bad4e43.zip |
Gallery2: Reduce logspam in video player
Change-Id: I71b1356f7e326174378c99b4b0e5e60764a7c139
Diffstat (limited to 'src/com/android/gallery3d/app')
-rwxr-xr-x | src/com/android/gallery3d/app/MovieActivity.java | 2 | ||||
-rwxr-xr-x | src/com/android/gallery3d/app/MovieControllerOverlay.java | 66 | ||||
-rwxr-xr-x | src/com/android/gallery3d/app/MoviePlayer.java | 42 | ||||
-rwxr-xr-x | src/com/android/gallery3d/app/TimeBar.java | 8 |
4 files changed, 84 insertions, 34 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 376338863..02ff5de80 100755 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -89,7 +89,7 @@ import android.bluetooth.BluetoothProfile; public class MovieActivity extends AbstractPermissionActivity { @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 fd2b6311c..251c3a26b 100755 --- a/src/com/android/gallery3d/app/MovieControllerOverlay.java +++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java @@ -53,7 +53,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; protected ScreenModeExt mScreenModeExt = new ScreenModeExt(); @@ -274,7 +274,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) { @@ -292,7 +294,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); } } @@ -680,7 +684,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); @@ -691,7 +697,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 +792,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements } void init(Context context) { - Log.v(TAG, "ControllerRewindAndForwardExt init"); + if (LOG) { + Log.v(TAG, "ControllerRewindAndForwardExt init"); + } mTimeBarHeight = mTimeBar.getPreferredHeight(); Drawable forwardMenu = context.getResources(). @@ -837,10 +847,14 @@ 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"); + } if (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL) { mListenerForRewind.onForward(); @@ -848,7 +862,9 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements mListenerForRewind.onRewind(); } } else if (v == mForward) { - Log.v(TAG, "ControllerRewindAndForwardExt onClick mForward"); + if (LOG) { + Log.v(TAG, "ControllerRewindAndForwardExt onClick mForward"); + } if (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL) { mListenerForRewind.onRewind(); @@ -859,28 +875,38 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements } 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: "+mState); + if (LOG) { + Log.v(TAG, "ControllerRewindAndForwardExt onShow: " + mState); + } mContollerButtons.setVisibility(View.VISIBLE); updateBackgroundColor(); } 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); @@ -892,14 +918,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); @@ -970,7 +1000,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 c79c44f93..4fea7f156 100755 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -79,7 +79,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"; @@ -219,7 +219,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(); } } @@ -821,10 +823,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; } @@ -882,9 +888,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: " + + "getCurrentPosition = " + mVideoView.getCurrentPosition() + ", " + + "getDuration = " + mVideoView.getDuration()); + } if (mControllerRewindAndForwardExt != null) { mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt .canStop(), mVideoView.canSeekBackward() @@ -1529,7 +1537,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, @@ -1539,7 +1549,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(), @@ -1548,7 +1560,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 @@ -1559,7 +1573,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(), @@ -1569,7 +1585,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 91d46b2fa..976335a1a 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; |