Move panorama stitch progress outside the image.
Bug 7302513
Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml
new file mode 100644
index 0000000..778feb3
--- /dev/null
+++ b/res/layout/photopage_progress_bar.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/photopage_progress_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:padding="25dp"
+ android:visibility="invisible">
+ <View
+ android:id="@+id/photopage_progress_background"
+ android:background="#ff000000"
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:layout_alignParentBottom="true"
+ android:visibility="visible"/>
+ <View
+ android:id="@+id/photopage_progress_foreground"
+ android:background="#ff33b5e5"
+ android:layout_width="10dp"
+ android:layout_height="8dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentBottom="true"
+ android:visibility="visible"/>
+ <TextView
+ android:id="@+id/photopage_progress_bar_text"
+ android:text="@string/pano_progress_text"
+ android:textColor="#ffffffff"
+ android:textSize="14dp"
+ android:shadowColor="#ff000000"
+ android:shadowDx="0"
+ android:shadowDy="0"
+ android:shadowRadius="2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_above="@id/photopage_progress_background"
+ android:paddingBottom="8dp"
+ android:visibility="visible"/>
+</RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c6ef704..92d4308 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -496,4 +496,8 @@
<!-- Toast if the trimmed video is the same as the original one. [CHAR LIMIT=80] -->
<string name="trim_too_long">Did not trim : the same length as origin</string>
+
+ <!-- Text to show with progress bar while stitching in Gallery -->
+ <string name="pano_progress_text">Rendering panorama</string>
+
</resources>
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 7f8414c..6f2a1e0 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -91,6 +91,7 @@
private static final int MSG_REFRESH_BOTTOM_CONTROLS = 8;
private static final int MSG_ON_CAMERA_CENTER = 9;
private static final int MSG_ON_PICTURE_CENTER = 10;
+ private static final int MSG_REFRESH_IMAGE = 11;
private static final int HIDE_BARS_TIMEOUT = 3500;
private static final int UNFREEZE_GLROOT_TIMEOUT = 250;
@@ -144,6 +145,7 @@
private boolean mIsMenuVisible;
private boolean mHaveImageEditor;
private PhotoPageBottomControls mBottomControls;
+ private PhotoPageProgressBar mProgressBar;
private MediaItem mCurrentPhoto = null;
private MenuExecutor mMenuExecutor;
private boolean mIsActive;
@@ -178,6 +180,7 @@
private final MyMenuVisibilityListener mMenuVisibilityListener =
new MyMenuVisibilityListener();
+ private UpdateProgressListener mProgressListener;
public static interface Model extends PhotoView.Model {
public void resume();
@@ -201,6 +204,33 @@
}
}
+ private class UpdateProgressListener implements StitchingChangeListener {
+
+ @Override
+ public void onStitchingResult(Path path, Uri uri) {
+ sendUpdate(path);
+ }
+
+ @Override
+ public void onStitchingQueued(Path path) {
+ sendUpdate(path);
+ }
+
+ @Override
+ public void onStitchingProgress(Path path, final int progress) {
+ sendUpdate(path);
+ }
+
+ private void sendUpdate(Path path) {
+ boolean isCurrentPhoto = mCurrentPhoto != null
+ && mCurrentPhoto.getPath().toString().equals(path.toString());
+ if (isCurrentPhoto) {
+ mHandler.sendEmptyMessage(MSG_REFRESH_IMAGE);
+
+ }
+ }
+ };
+
private final FloatAnimation mBackgroundFade = new BackgroundFadeOut();
@Override
@@ -310,6 +340,12 @@
}
break;
}
+ case MSG_REFRESH_IMAGE: {
+ MediaItem currentPhoto = mCurrentPhoto;
+ mCurrentPhoto = null;
+ updateCurrentPhoto(currentPhoto);
+ break;
+ }
default: throw new AssertionError(message.what);
}
}
@@ -481,12 +517,18 @@
}
mPhotoView.setFilmMode(mStartInFilmstrip && mMediaSet.getMediaItemCount() > 1);
- if (mSecureAlbum == null) {
- RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity)
- .findViewById(mAppBridge != null ? R.id.content : R.id.gallery_root);
- if (galleryRoot != null) {
+ RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity)
+ .findViewById(mAppBridge != null ? R.id.content : R.id.gallery_root);
+ if (galleryRoot != null) {
+ if (mSecureAlbum == null) {
mBottomControls = new PhotoPageBottomControls(this, mActivity, galleryRoot);
}
+ StitchingProgressManager progressManager = mApplication.getStitchingProgressManager();
+ if (progressManager != null) {
+ mProgressBar = new PhotoPageProgressBar(mActivity, galleryRoot);
+ mProgressListener = new UpdateProgressListener();
+ progressManager.addChangeListener(mProgressListener);
+ }
}
}
@@ -626,6 +668,18 @@
&& (photo.getSupportedOperations() & MediaItem.SUPPORT_SHARE) != 0) {
updateShareURI(photo.getPath());
}
+ StitchingProgressManager progressManager = mApplication.getStitchingProgressManager();
+ if (progressManager != null) {
+ int itemCount = progressManager.getItemCount();
+ mProgressBar.hideProgress();
+ for (int i = 0; i < itemCount; i++) {
+ MediaItem item = progressManager.getItem(i);
+ if (item.getPath().equals(photo.getPath())) {
+ mProgressBar.setProgress(progressManager.getProgress(item.getFilePath()));
+ break;
+ }
+ }
+ }
}
private void updateMenuOperations() {
@@ -1209,6 +1263,7 @@
mActivity.getGLRoot().unfreeze();
}
+ @Override
public void onFilmModeChanged(boolean enabled) {
mHandler.sendEmptyMessage(MSG_REFRESH_BOTTOM_CONTROLS);
if (enabled) {
diff --git a/src/com/android/gallery3d/app/PhotoPageProgressBar.java b/src/com/android/gallery3d/app/PhotoPageProgressBar.java
new file mode 100644
index 0000000..141fea6
--- /dev/null
+++ b/src/com/android/gallery3d/app/PhotoPageProgressBar.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.gallery3d.app;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.RelativeLayout;
+
+import com.android.gallery3d.R;
+
+public class PhotoPageProgressBar {
+ private ViewGroup mContainer;
+ private View mProgress;
+
+ public PhotoPageProgressBar(Context context, RelativeLayout parentLayout) {
+ LayoutInflater inflater = (LayoutInflater) context
+ .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ mContainer = (ViewGroup) inflater.inflate(R.layout.photopage_progress_bar, parentLayout,
+ false);
+ parentLayout.addView(mContainer);
+ mProgress = mContainer.findViewById(R.id.photopage_progress_foreground);
+ }
+
+ public void setProgress(int progressPercent) {
+ mContainer.setVisibility(View.VISIBLE);
+ LayoutParams layoutParams = mProgress.getLayoutParams();
+ layoutParams.width = mContainer.getWidth() * progressPercent / 100;
+ mProgress.setLayoutParams(layoutParams);
+ }
+
+ public void hideProgress() {
+ mContainer.setVisibility(View.INVISIBLE);
+ }
+}