diff options
author | Likai Ding <likaid@codeaurora.org> | 2015-02-04 09:38:16 +0800 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2015-02-17 02:55:12 -0700 |
commit | 77f75003277262bd4b3c9983f4c99ec260b92a59 (patch) | |
tree | b0a55849236d2b94bfd97e8b5324441d17ba3d31 /src/com/android/camera/WideAnglePanoramaUI.java | |
parent | 12379846e84e949e5f96fb32ecf5ddd6f28d1a51 (diff) | |
download | android_packages_apps_Snap-77f75003277262bd4b3c9983f4c99ec260b92a59.tar.gz android_packages_apps_Snap-77f75003277262bd4b3c9983f4c99ec260b92a59.tar.bz2 android_packages_apps_Snap-77f75003277262bd4b3c9983f4c99ec260b92a59.zip |
SnapdragonCamera: circular thumbnail icon
1. change thumbnail icon to circular and its background to transparent
2. speed up loading with optimal sample size and region decoder
3. fix orientation bug regarding panorama photos
4. don't fire load task on fake onDataLoaded() call
Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b
(cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaUI.java')
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 7941ea88c..e270165c1 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -46,7 +46,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.camera.CameraActivity.UpdatePreviewThumbnail; import com.android.camera.ui.CameraControls; import com.android.camera.ui.CameraRootView; import com.android.camera.ui.ModuleSwitcher; @@ -86,7 +85,7 @@ public class WideAnglePanoramaUI implements private TextureView mTextureView; private ShutterButton mShutterButton; private CameraControls mCameraControls; - private ImageView mPreviewThumb; + private ImageView mThumbnail; private Matrix mProgressDirectionMatrix = new Matrix(); private float[] mProgressAngle = new float[2]; @@ -116,8 +115,8 @@ public class WideAnglePanoramaUI implements mSwitcher = (ModuleSwitcher) mRootView.findViewById(R.id.camera_switcher); mSwitcher.setCurrentIndex(ModuleSwitcher.WIDE_ANGLE_PANO_MODULE_INDEX); mSwitcher.setSwitchListener(mActivity); - mPreviewThumb = (ImageView) mRootView.findViewById(R.id.preview_thumb); - mPreviewThumb.setOnClickListener(new OnClickListener() { + mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb); + mThumbnail.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (!CameraControls.isAnimating()) @@ -230,23 +229,6 @@ public class WideAnglePanoramaUI implements mProgressDirectionMatrix.postRotate(orientation); } - public void updatePreviewThumbnail(Bitmap bitmap) { - mPreviewThumb.setVisibility(View.VISIBLE); - mPreviewThumb.setImageBitmap(bitmap); - mActivity.setPreviewThumbnailBitmap(bitmap); - } - - public void updatePreviewThumbnail() { - mPreviewThumb.setVisibility(View.VISIBLE); - Bitmap bitmap = mActivity.getPreviewThumbBitmap(); - if (bitmap != null) - mPreviewThumb.setImageBitmap(bitmap); - else { - UpdatePreviewThumbnail task = mActivity.new UpdatePreviewThumbnail(mPreviewThumb); - task.execute(); - } - } - public void showDirectionIndicators(int direction) { switch (direction) { case PanoProgressBar.DIRECTION_NONE: @@ -272,7 +254,7 @@ public class WideAnglePanoramaUI implements public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int i, int i2) { mSurfaceTexture = surfaceTexture; mController.onPreviewUIReady(); - updatePreviewThumbnail(); + mActivity.updateThumbnail(mThumbnail); } @Override @@ -329,8 +311,7 @@ public class WideAnglePanoramaUI implements // a framework bug. Call requestLayout() as a workaround. mSavingProgressBar.requestLayout(); - updatePreviewThumbnail(Bitmap.createScaledBitmap(bitmap, - bitmap.getWidth() / 2, bitmap.getHeight() / 2, false)); + mActivity.updateThumbnail(bitmap); } public void onConfigurationChanged( |