diff options
| -rwxr-xr-x | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 8 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 11 |
3 files changed, 20 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 336962488..6cc605496 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1168,9 +1168,9 @@ CHAR LIMIT = NONE] --> <string name="text_makeup_Soften">Soften</string> <string-array name="title_array_nav_items"> - <item>Timeline</item> - <item>Albums</item> - <item>Videos</item> + <item>@string/timeline_title</item> + <item>@string/albums_title</item> + <item>@string/videos_title</item> </string-array> <string name="navigation_drawer_title" translatable="false">@string/app_name</string> 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); } |