diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-25 00:27:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-25 00:27:57 -0700 |
| commit | d2e30f629da3cfa37787bd64facdc1b104a62e14 (patch) | |
| tree | 1a34d825e0c25c78b7fd311cb1be9d9b6b3213c8 /src | |
| parent | c5b144a4bace689d571f5cf0fa1640ec10df25b6 (diff) | |
| parent | e16558a99e4bc0c9b78ee0587c4b4ac92c672eb0 (diff) | |
| download | android_packages_apps_Gallery2-d2e30f629da3cfa37787bd64facdc1b104a62e14.tar.gz android_packages_apps_Gallery2-d2e30f629da3cfa37787bd64facdc1b104a62e14.tar.bz2 android_packages_apps_Gallery2-d2e30f629da3cfa37787bd64facdc1b104a62e14.zip | |
Merge "Gallery2: Fix menu icon is missing when change language on Videos page." into android_ui.lnx.1.2-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 8 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 44fe2a650..4d2e291c1 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -498,8 +498,12 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster boolean enableHomeButton = (mActivity.getStateManager().getStateCount() > 1) | mParentMediaSetString != null; //GalleryActionBar actionBar = mActivity.getGalleryActionBar(); - mActionBar.setDisplayOptions(enableHomeButton, true); - + if (mIsVideoScreen) { + //if from video screen, show display navigation icon as home and title + mActionBar.setDisplayHome(true, true); + } else { + mActionBar.setDisplayOptions(enableHomeButton, true); + } Toolbar toolBar = mActivity.getToolbar(); if (enableHomeButton && toolBar != null) { toolBar.setNavigationContentDescription("back"); diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index 1e8458738..71bb6381a 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -329,6 +329,17 @@ public class GalleryActionBar { mActionBar.setHomeButtonEnabled(displayHomeAsUp); } + public void setDisplayHome(boolean displayHome, boolean showTitle) { + if (mActionBar == null) return; + int options = 0; + if (displayHome) options |= ActionBar.DISPLAY_SHOW_HOME; + if (showTitle) options |= ActionBar.DISPLAY_SHOW_TITLE; + + mActionBar.setDisplayOptions(options, + ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE); + mActionBar.setHomeButtonEnabled(displayHome); + } + public void setTitle(String title) { if (mActionBar != null) mActionBar.setTitle(title); } |