diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-30 15:34:19 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-05-01 11:48:02 -0700 |
| commit | 78a5b224eca3c702f4ecf8abd072779e32e26641 (patch) | |
| tree | fe3ad3db10478fb0586cfd4dec4b16e8ed2d527c /src/com/android/camera/PhotoUI.java | |
| parent | 8788079a51a90255dce330e56afcb6674deccbf7 (diff) | |
| download | android_packages_apps_Snap-78a5b224eca3c702f4ecf8abd072779e32e26641.tar.gz android_packages_apps_Snap-78a5b224eca3c702f4ecf8abd072779e32e26641.tar.bz2 android_packages_apps_Snap-78a5b224eca3c702f4ecf8abd072779e32e26641.zip | |
Update capture animation
Bug: 8253060
Update preview thumb margins and size
Add touch target for thumbnail
Change-Id: I2b298de330834c42a55b4cb082148d971727f530
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 094910496..bc43f4763 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -92,6 +92,7 @@ public class PhotoUI implements PieListener, private int mPreviewWidth = 0; private int mPreviewHeight = 0; + private View mPreviewThumb; private OnLayoutChangeListener mLayoutListener = new OnLayoutChangeListener() { @Override @@ -173,6 +174,7 @@ public class PhotoUI implements PieListener, mGestures.setRenderOverlay(mRenderOverlay); mGestures.addTouchReceiver(mMenuButton); mGestures.addUnclickableArea(mBlocker); + enablePreviewThumb(false); // make sure to add touch targets for image capture if (mController.isImageCaptureIntent()) { if (mReviewCancelButton != null) { @@ -201,6 +203,13 @@ public class PhotoUI implements PieListener, public void initializeControlByIntent() { mBlocker = mActivity.findViewById(R.id.blocker); + mPreviewThumb = mActivity.findViewById(R.id.preview_thumb); + mPreviewThumb.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + mActivity.gotoGallery(); + } + }); mMenuButton = mActivity.findViewById(R.id.menu); mMenuButton.setOnClickListener(new OnClickListener() { @Override @@ -367,6 +376,16 @@ public class PhotoUI implements PieListener, if (!full && mCountDownView != null) mCountDownView.cancelCountDown(); } + public void enablePreviewThumb(boolean enabled) { + if (enabled) { + mGestures.addTouchReceiver(mPreviewThumb); + mPreviewThumb.setVisibility(View.VISIBLE); + } else { + mGestures.removeTouchReceiver(mPreviewThumb); + mPreviewThumb.setVisibility(View.GONE); + } + } + public boolean removeTopLevelPopup() { // Remove the top level popup or dialog box and return true if there's any if (mPopup != null) { |