summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2014-10-13 18:34:37 -0700
committerByunghun Jeon <bjeon@codeaurora.org>2014-11-19 17:53:26 -0800
commita19529b701c6d74b91657441cdb7c3463fa7e8c6 (patch)
treeec2840164d498e39fec70b4735e1523ab3cc601d /src/com/android/camera/PhotoUI.java
parenta41a7928433d60533548c115f3741a980159e656 (diff)
downloadandroid_packages_apps_Snap-a19529b701c6d74b91657441cdb7c3463fa7e8c6.tar.gz
android_packages_apps_Snap-a19529b701c6d74b91657441cdb7c3463fa7e8c6.tar.bz2
android_packages_apps_Snap-a19529b701c6d74b91657441cdb7c3463fa7e8c6.zip
SnapdragonCamera: Add preview thumbnail button
Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r--src/com/android/camera/PhotoUI.java24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 803c2b19b..40672547a 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -53,6 +53,7 @@ import android.widget.PopupWindow;
import android.widget.Toast;
import android.graphics.drawable.AnimationDrawable;
+import com.android.camera.CameraActivity.UpdatePreviewThumbnail;
import com.android.camera.CameraPreference.OnPreferenceChangedListener;
import com.android.camera.FocusOverlayManager.FocusUI;
import com.android.camera.ui.AbstractSettingPopup;
@@ -229,7 +230,7 @@ public class PhotoUI implements PieListener,
@Override
protected void onPostExecute(Bitmap bitmap) {
mPreviewThumb.setImageBitmap(bitmap);
- mAnimationManager.startCaptureAnimation(mPreviewThumb);
+ updatePreviewThumbnail(bitmap);
}
}
@@ -286,6 +287,24 @@ public class PhotoUI implements PieListener,
mPrevOrientationResize = false;
}
+ 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 updatePreviewThumbnail(Bitmap bitmap) {
+ mPreviewThumb.setVisibility(View.VISIBLE);
+ mPreviewThumb.setImageBitmap(bitmap);
+ mActivity.setPreviewThumbnailBitmap(bitmap);
+ }
+
public void setDownFactor(int factor) {
mDownSampleFactor = factor;
}
@@ -382,6 +401,7 @@ public class PhotoUI implements PieListener,
// Re-apply transform matrix for new surface texture
setTransformMatrix(mPreviewWidth, mPreviewHeight);
}
+ updatePreviewThumbnail();
}
@Override
@@ -537,7 +557,7 @@ public class PhotoUI implements PieListener,
mSwitcher.setVisibility(View.VISIBLE);
}
// called from onResume but only the first time
- public void initializeFirstTime() {
+ public void initializeFirstTime() {
// Initialize shutter button.
mShutterButton.setImageBitmap(null);
mShutterButton.setBackgroundResource(R.drawable.shutter_button_anim);