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/VideoUI.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/VideoUI.java')
-rw-r--r-- | src/com/android/camera/VideoUI.java | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 8362d0590..913a93e2a 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -46,7 +46,6 @@ import android.widget.ListView; import android.widget.PopupWindow; import android.widget.TextView; -import com.android.camera.CameraActivity.UpdatePreviewThumbnail; import com.android.camera.CameraPreference.OnPreferenceChangedListener; import com.android.camera.ui.AbstractSettingPopup; import com.android.camera.ui.CameraControls; @@ -98,7 +97,7 @@ public class VideoUI implements PieRenderer.PieListener, private VideoController mController; private int mZoomMax; private List<Integer> mZoomRatios; - private ImageView mPreviewThumb; + private ImageView mThumbnail; private View mFlashOverlay; private boolean mOrientationResize; private boolean mPrevOrientationResize; @@ -267,23 +266,6 @@ public class VideoUI implements PieRenderer.PieListener, mCameraControls.setMargins(topMargin, l / 4 - topMargin); } - 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 updateWithNewPreviewThumbnail() { - mPreviewThumb.setVisibility(View.VISIBLE); - UpdatePreviewThumbnail task = mActivity.new UpdatePreviewThumbnail(mPreviewThumb); - task.execute(); - } - public void cameraOrientationPreviewResize(boolean orientation){ mPrevOrientationResize = mOrientationResize; mOrientationResize = orientation; @@ -433,8 +415,8 @@ public class VideoUI implements PieRenderer.PieListener, Log.e(TAG, "No valid bitmap for capture animation."); return; } - mPreviewThumb.setImageBitmap(bitmap); - mAnimationManager.startCaptureAnimation(mPreviewThumb); + mActivity.updateThumbnail(bitmap); + mAnimationManager.startCaptureAnimation(mThumbnail); } /** @@ -577,8 +559,8 @@ public class VideoUI implements PieRenderer.PieListener, mGestures.setRenderOverlay(mRenderOverlay); - 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) { // Do not allow navigation to filmstrip during video recording @@ -1031,7 +1013,7 @@ public class VideoUI implements PieRenderer.PieListener, // Re-apply transform matrix for new surface texture setTransformMatrix(mPreviewWidth, mPreviewHeight); } - updatePreviewThumbnail(); + mActivity.updateThumbnail(mThumbnail); } @Override |