diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-13 12:20:10 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-13 12:20:10 -0800 |
commit | ee168be7e40e15c1921b32f6b863ad3843c91bfd (patch) | |
tree | 7552c19a442a97d3d15d286c8d3063ad3ff02497 /src/com/android | |
parent | b4dd795d604465ed4cf90addf0026fa188ff6bb3 (diff) | |
parent | 71656de68587521161596af5db9c688be3fba40a (diff) | |
download | android_packages_apps_Snap-ee168be7e40e15c1921b32f6b863ad3843c91bfd.tar.gz android_packages_apps_Snap-ee168be7e40e15c1921b32f6b863ad3843c91bfd.tar.bz2 android_packages_apps_Snap-ee168be7e40e15c1921b32f6b863ad3843c91bfd.zip |
Merge "Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot""
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/MosaicPreviewRenderer.java | 9 | ||||
-rw-r--r-- | src/com/android/camera/MosaicRenderer.java | 10 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 8 |
3 files changed, 11 insertions, 16 deletions
diff --git a/src/com/android/camera/MosaicPreviewRenderer.java b/src/com/android/camera/MosaicPreviewRenderer.java index 77c260eb5..42da4d9e7 100644 --- a/src/com/android/camera/MosaicPreviewRenderer.java +++ b/src/com/android/camera/MosaicPreviewRenderer.java @@ -83,13 +83,10 @@ public class MosaicPreviewRenderer { mInputSurfaceTexture.updateTexImage(); mInputSurfaceTexture.getTransformMatrix(mTransformMatrix); - // Call setPreviewBackground to render high-res RGB textures to full screen. - MosaicRenderer.setPreviewBackground(true); - MosaicRenderer.preprocess(mTransformMatrix); - MosaicRenderer.step(); - MosaicRenderer.setPreviewBackground(false); - MosaicRenderer.setWarping(true); + // Call preprocess to render it to low-res and high-res RGB textures. + MosaicRenderer.preprocess(mTransformMatrix); + // Now, transfer the textures from GPU to CPU memory for processing MosaicRenderer.transferGPUtoCPU(); MosaicRenderer.updateMatrix(); MosaicRenderer.step(); diff --git a/src/com/android/camera/MosaicRenderer.java b/src/com/android/camera/MosaicRenderer.java index daf94abe6..92d9cb7b6 100644 --- a/src/com/android/camera/MosaicRenderer.java +++ b/src/com/android/camera/MosaicRenderer.java @@ -86,14 +86,4 @@ public class MosaicRenderer * @param flag boolean flag to set the warping to true or false. */ public static native void setWarping(boolean flag); - /** - * This function allows toggling between drawing the background full - * screen preview image data to screen and drawing the warped smaller - * preview on top of it. To render the full screen background preview, - * we set the falsg to true and to render the warped image on top of this - * we set the flag to false and flag in setWarping to true. - * - * @param flag boolean flag to set the warping to true or false. - */ - public static native void setPreviewBackground(boolean flag); } diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 3b1c4b17f..14cacfb9b 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -441,6 +441,14 @@ public class WideAnglePanoramaUI implements private void setViews(Resources appRes) { int weight = appRes.getInteger(R.integer.SRI_pano_layout_weight); + LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mPreviewLayout.getLayoutParams(); + lp.weight = weight; + mPreviewLayout.setLayoutParams(lp); + + lp = (LinearLayout.LayoutParams) mReview.getLayoutParams(); + lp.weight = weight; + mPreviewLayout.setLayoutParams(lp); + mSavingProgressBar = (PanoProgressBar) mRootView.findViewById(R.id.pano_saving_progress_bar); mSavingProgressBar.setIndicatorWidth(0); mSavingProgressBar.setMaxProgress(100); |