From d8d04a85419c75b91348d3baeba416a14c5132f7 Mon Sep 17 00:00:00 2001 From: Ray Chen Date: Fri, 16 Mar 2012 14:38:04 +0800 Subject: Revert "bug #6176711: guard against null GalleryActionBar." and fix DialogPicker's NPE issue while setting wallpaper. Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00 --- src/com/android/gallery3d/app/PhotoPage.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/com/android/gallery3d/app/PhotoPage.java') diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index a8c69b567..8040a2fc6 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -630,10 +630,8 @@ public class PhotoPage extends ActivityState if (mMenuVisibilityListener == null) { mMenuVisibilityListener = new MyMenuVisibilityListener(); } - GalleryActionBar galleryActionBar = mActivity.getGalleryActionBar(); - if (galleryActionBar != null) { - galleryActionBar.setDisplayOptions(mSetPathString != null, true); - } + mActivity.getGalleryActionBar().setDisplayOptions(mSetPathString != null, true); + mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); onUserInteraction(); } -- cgit v1.2.3