diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-06 15:22:03 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-06 18:25:33 -0700 |
commit | d2724f69edf39cf2019eac1b49f316d22ab70d0a (patch) | |
tree | 4cb6eaa00b7505df9037ef4341c1edc16b172ae3 | |
parent | 3711d3ea870acba8ad83d0c51b0d03b0082ef0f0 (diff) | |
download | android_packages_apps_Gallery2-d2724f69edf39cf2019eac1b49f316d22ab70d0a.tar.gz android_packages_apps_Gallery2-d2724f69edf39cf2019eac1b49f316d22ab70d0a.tar.bz2 android_packages_apps_Gallery2-d2724f69edf39cf2019eac1b49f316d22ab70d0a.zip |
Change display of 360 panorama button
Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
-rw-r--r-- | res/layout/photopage_bottom_controls.xml | 15 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 15 |
2 files changed, 19 insertions, 11 deletions
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml index 5b80cf2da..434c59824 100644 --- a/res/layout/photopage_bottom_controls.xml +++ b/res/layout/photopage_bottom_controls.xml @@ -15,21 +15,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" + android:layout_alignParentBottom="true" android:paddingTop="5dp" android:paddingBottom="5dp" android:paddingLeft="15dp" android:paddingRight="15dp" android:visibility="gone"/> - <ImageButton + <ImageView android:id="@+id/photopage_bottom_control_panorama" android:src="@drawable/ic_menu_photosphere" - android:background="@drawable/photopage_bottom_button_background" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:paddingTop="5dp" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" + android:layout_width="70dp" + android:layout_height="70dp" + android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" android:visibility="gone"/> </RelativeLayout> diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index a219f51e4..cd8b80259 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -507,14 +507,18 @@ public class PhotoPage extends ActivityState implements } public boolean canDisplayBottomControls() { - return mShowBars && !mPhotoView.getFilmMode(); + return mIsActive && !mPhotoView.getFilmMode(); } public boolean canDisplayBottomControl(int control) { if (mCurrentPhoto == null) return false; switch(control) { case R.id.photopage_bottom_control_edit: - return mCurrentPhoto.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE; + return mHaveImageEditor && mShowBars + && (mCurrentPhoto.getSupportedOperations() + & MediaItem.SUPPORT_EDIT) != 0 + && mCurrentPhoto.getMediaType() + == MediaObject.MEDIA_TYPE_IMAGE; case R.id.photopage_bottom_control_panorama: return (mCurrentPhoto.getSupportedOperations() & MediaItem.SUPPORT_PANORAMA) != 0; @@ -1189,6 +1193,10 @@ public class PhotoPage extends ActivityState implements } mPhotoView.pause(); mHandler.removeMessages(MSG_HIDE_BARS); + mHandler.removeMessages(MSG_REFRESH_BOTTOM_CONTROLS); + if (mBottomControls != null) { + mBottomControls.refresh(); + } mActionBar.removeOnMenuVisibilityListener(mMenuVisibilityListener); if (mShowSpinner) { mActionBar.disableAlbumModeMenu(true); @@ -1275,6 +1283,9 @@ public class PhotoPage extends ActivityState implements mActionBar.setDisplayOptions( ((mSecureAlbum == null) && (mSetPathString != null)), false); mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); + if (mBottomControls != null) { + mBottomControls.refresh(); + } if (mShowSpinner) { mActionBar.enableAlbumModeMenu( GalleryActionBar.ALBUM_FILMSTRIP_MODE_SELECTED, this); |