summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWangyi Gu <wangyi.gu@intel.com>2012-07-30 10:46:05 +0800
committerShuo Gao <shuo.gao@intel.com>2012-12-04 16:29:05 +0800
commit9b04db4b58007c3d4f7965fd4523e86170a9595d (patch)
tree50a1df640e64e8a3dad65ab727b1c5fff7a280e7
parente7c4f8ca0660298604b0081a80591b39aefda661 (diff)
downloadVideoEditor-9b04db4b58007c3d4f7965fd4523e86170a9595d.tar.gz
Save the export progress when rotating the phone
When rotating the phone which is exporting movies, the export progress will be lost. The progress bar will appear to be 0 for a few seconds. In this patch, The export progress is saved when the video editor activity is destroyed. Change-Id: I9f4aa56a43f90b6250cac953a579f1230bdb7ccc Author: Wangyi Gu <wangyi.gu@intel.com> Signed-off-by: Wangyi Gu <wangyi.gu@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 37621
-rwxr-xr-xsrc/com/android/videoeditor/VideoEditorActivity.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/videoeditor/VideoEditorActivity.java b/src/com/android/videoeditor/VideoEditorActivity.java
index ca0b770..2cbfbb5 100755
--- a/src/com/android/videoeditor/VideoEditorActivity.java
+++ b/src/com/android/videoeditor/VideoEditorActivity.java
@@ -137,6 +137,10 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
// Threshold in width dip for showing title in action bar.
private static final int SHOW_TITLE_THRESHOLD_WIDTH_DIP = 1000;
+ // To store the export progress when the activity is destroyed
+ private static final String EXPORT_PROGRESS = "export_progress";
+ private int mExportProgress;
+
private final TimelineRelativeLayout.LayoutCallback mLayoutCallback =
new TimelineRelativeLayout.LayoutCallback() {
@@ -392,9 +396,11 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
mRestartPreview = savedInstanceState.getBoolean(STATE_PLAYING);
mCaptureMediaUri = savedInstanceState.getParcelable(STATE_CAPTURE_URI);
mMediaLayoutSelectedPos = savedInstanceState.getInt(STATE_SELECTED_POS_ID, -1);
+ mExportProgress = savedInstanceState.getInt(EXPORT_PROGRESS);
} else {
mRestartPreview = false;
mMediaLayoutSelectedPos = -1;
+ mExportProgress = 0;
}
// Compute the activity width
@@ -492,6 +498,7 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
outState.putBoolean(STATE_PLAYING, isPreviewPlaying() || mRestartPreview);
outState.putParcelable(STATE_CAPTURE_URI, mCaptureMediaUri);
outState.putInt(STATE_SELECTED_POS_ID, mMediaLayout.getSelectedViewPos());
+ outState.putInt(EXPORT_PROGRESS,mExportProgress);
}
@Override
@@ -637,6 +644,7 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
case R.id.menu_item_export_movie: {
// Present the user with a dialog to choose export options
+ mExportProgress = 0;
showDialog(DIALOG_EXPORT_OPTIONS_ID);
return true;
}
@@ -1444,6 +1452,7 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
@Override
protected void onExportProgress(int progress) {
if (mExportProgressDialog != null) {
+ mExportProgress = progress;
mExportProgressDialog.setProgress(progress);
}
}
@@ -1453,6 +1462,7 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
if (mExportProgressDialog != null) {
mExportProgressDialog.dismiss();
mExportProgressDialog = null;
+ mExportProgress = 0;
}
}
@@ -1660,11 +1670,15 @@ public class VideoEditorActivity extends VideoEditorBaseActivity
mExportProgressDialog.setCanceledOnTouchOutside(false);
mExportProgressDialog.show();
mExportProgressDialog.setProgressNumberFormat("");
+ if (mExportProgress >= 0 && mExportProgress <= 100) {
+ mExportProgressDialog.setProgress(mExportProgress);
+ }
}
private void cancelExport() {
ApiService.cancelExportVideoEditor(VideoEditorActivity.this, mProjectPath,
mPendingExportFilename);
+ mExportProgress = 0;
mPendingExportFilename = null;
mExportProgressDialog = null;
}