Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0. (a92abfea) · Commits · e / os / android_packages_apps_Gallery2

AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		<manifest android:versionCode="40030"
		android:versionName="1.1.40030"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:sharedUserId="android.uid.system"
		package="com.android.gallery3d">

		<original-package android:name="com.android.gallery3d" />

+9 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,15 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
		return mGLRootView;
		}

		public void GLRootResume(boolean isResume) {
		if (isResume) {
		mGLRootView.onResume();
		mGLRootView.lockRenderThread();
		} else {
		mGLRootView.unlockRenderThread();
		}
		}

		public OrientationManager getOrientationManager() {
		return mOrientationManager;
		}

100644 → 100755

+13 −3

Original line number	Diff line number	Diff line
		@@ -87,9 +87,19 @@ public class MuteVideo {
		VideoUtils.startMute(mFilePath, mDstFileInfo);
		SaveVideoFileUtils.insertContent(
		mDstFileInfo, mActivity.getContentResolver(), mUri);
		} catch (IOException e) {
		} catch (Exception e) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		Toast.makeText(mActivity, mActivity.getString(R.string.video_mute_err),
		Toast.LENGTH_SHORT).show();
		if (mMuteProgress != null) {
		mMuteProgress.dismiss();
		mMuteProgress = null;
		}
		}
		});
		return;
		}
		// After muting is done, trigger the UI changed.
		mHandler.post(new Runnable() {

+9 −0

Original line number	Diff line number	Diff line
		@@ -1630,6 +1630,15 @@ public abstract class PhotoPage extends ActivityState implements
		}
		}

		@Override
		public void onConfigurationChanged(Configuration config) {
		super.onConfigurationChanged(config);
		if(mIsActive) return;
		mActivity.GLRootResume(true);
		mModel.resume();
		mActivity.GLRootResume(false);
		}

		@Override
		protected void onResume() {
		super.onResume();

+4 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ public class TrimVideo extends Activity implements

		private int mTrimStartTime = 0;
		private int mTrimEndTime = 0;
		private boolean mCheckTrimStartTime;
		private int mVideoPosition = 0;
		public static final String KEY_TRIM_START = "trim_start";
		public static final String KEY_TRIM_END = "trim_end";
		@@ -177,10 +178,11 @@ public class TrimVideo extends Activity implements
		mVideoPosition = mVideoView.getCurrentPosition();
		// If the video position is smaller than the starting point of trimming,
		// correct it.
		if (mVideoPosition < mTrimStartTime) {
		if (mCheckTrimStartTime && (mVideoPosition < mTrimStartTime)) {
		mVideoView.seekTo(mTrimStartTime);
		mVideoPosition = mTrimStartTime;
		}
		mCheckTrimStartTime = false;
		// If the position is bigger than the end point of trimming, show the
		// replay button and pause.
		if (mVideoPosition >= mTrimEndTime && mTrimEndTime > 0) {
		@@ -204,6 +206,7 @@ public class TrimVideo extends Activity implements

		private void playVideo() {
		mVideoView.start();
		mCheckTrimStartTime = true;
		mController.showPlaying();
		setProgress();
		}