diff options
| author | huiyan <huiyan@codeaurora.org> | 2016-04-21 16:47:32 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-22 02:03:56 -0700 |
| commit | e16558a99e4bc0c9b78ee0587c4b4ac92c672eb0 (patch) | |
| tree | b1fa62a9a815855837ce33c1dba53bf6e2af375a /res | |
| parent | 317616930e7273b40e8b7a367fee225b1c9e6bea (diff) | |
| download | android_packages_apps_Gallery2-e16558a99e4bc0c9b78ee0587c4b4ac92c672eb0.tar.gz android_packages_apps_Gallery2-e16558a99e4bc0c9b78ee0587c4b4ac92c672eb0.tar.bz2 android_packages_apps_Gallery2-e16558a99e4bc0c9b78ee0587c4b4ac92c672eb0.zip | |
Gallery2: Fix menu icon is missing when change language on Videos page.
If the gallery is in background ,the video page is saved to the stack.
After the language change, the Gallery is destroyed.
If gallery start again, the video page is restored from the stack.
But the action bar is set to don't display the home as up in onResume,
which set the navigation icon to null, so the menu icon can't display.
If albumpage is started by Video option, the action bar set to display home
option. If albumpage is start by others(albumnsetpage), the action bar set
to display home as up option,to display menu icon or up icon rightly
in action bar.
Besides, fix to display the right title with the different language.
Change-Id: Ieec0bd47400f6c0b698f5c2e842dc1038d9addcf
CRs-Fixed: 1002171
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 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> |