commit d2e30f629da3cfa37787bd64facdc1b104a62e14
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 25 00:27:57 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 25 00:27:57 2016 -0700
tree 1a34d825e0c25c78b7fd311cb1be9d9b6b3213c8
parent c5b144a4bace689d571f5cf0fa1640ec10df25b6
parent e16558a99e4bc0c9b78ee0587c4b4ac92c672eb0

Merge "Gallery2: Fix menu icon is missing when change language on Videos page." into android_ui.lnx.1.2-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3369624..6cc6054 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1168,9 +1168,9 @@
     <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>

src/com/android/gallery3d/app/AlbumPage.java

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 44fe2a6..4d2e291 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -498,8 +498,12 @@
         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");

src/com/android/gallery3d/app/GalleryActionBar.java

diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 1e84587..71bb638 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -329,6 +329,17 @@
         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);
     }