diff options
| author | Ray Chen <raychen@google.com> | 2012-03-16 14:38:04 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2012-03-19 15:31:39 +0800 |
| commit | d8d04a85419c75b91348d3baeba416a14c5132f7 (patch) | |
| tree | 5e332a152fe98dda169ac8b4c581090f83858ba6 /src/com/android/gallery3d/app/ActivityState.java | |
| parent | 01449be9b1b89e72bcbcce9901421fc9c9cf713a (diff) | |
| download | android_packages_apps_Snap-d8d04a85419c75b91348d3baeba416a14c5132f7.tar.gz android_packages_apps_Snap-d8d04a85419c75b91348d3baeba416a14c5132f7.tar.bz2 android_packages_apps_Snap-d8d04a85419c75b91348d3baeba416a14c5132f7.zip | |
Revert "bug #6176711: guard against null GalleryActionBar." and
fix DialogPicker's NPE issue while setting wallpaper.
Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
| -rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index 384ae734b..443e2bd29 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -141,10 +141,7 @@ abstract public class ActivityState { actionBar.show(); } int stateCount = mActivity.getStateManager().getStateCount(); - GalleryActionBar galleryActionbar = mActivity.getGalleryActionBar(); - if (galleryActionbar != null) { - galleryActionbar.setDisplayOptions(stateCount > 1, true); - } + mActivity.getGalleryActionBar().setDisplayOptions(stateCount > 1, true); // Default behavior, this can be overridden in ActivityState's onResume. actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); } |