diff options
| author | Ray Chen <raychen@google.com> | 2012-03-06 17:24:28 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2012-03-15 08:50:35 +0800 |
| commit | f3f7f56af19f3f04a7daefd16981e5f55e39053d (patch) | |
| tree | f932b44f1959b36ab2a5cdd62a5bb4453ac05512 /src/com/android/gallery3d/app/ActivityState.java | |
| parent | 762f8e20f608bc805d9e9f01fa2c4925f4735cf0 (diff) | |
| download | android_packages_apps_Snap-f3f7f56af19f3f04a7daefd16981e5f55e39053d.tar.gz android_packages_apps_Snap-f3f7f56af19f3f04a7daefd16981e5f55e39053d.tar.bz2 android_packages_apps_Snap-f3f7f56af19f3f04a7daefd16981e5f55e39053d.zip | |
Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up.
Some changes in this CL:
1. ActivityState can decide whether to enable home button and show up arrow
2. ActivityState can handle home_up event on its own
3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll)
4. Gallery supports view action for AlbumPage (Camera Roll)
Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
| -rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index 8cff1326e..443e2bd29 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -141,12 +141,7 @@ abstract public class ActivityState { actionBar.show(); } int stateCount = mActivity.getStateManager().getStateCount(); - actionBar.setDisplayOptions( - stateCount == 1 ? 0 : ActionBar.DISPLAY_HOME_AS_UP, - ActionBar.DISPLAY_HOME_AS_UP); - actionBar.setHomeButtonEnabled( - (actionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0); - actionBar.setDisplayShowTitleEnabled(true); + mActivity.getGalleryActionBar().setDisplayOptions(stateCount > 1, true); // Default behavior, this can be overridden in ActivityState's onResume. actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); } |