summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-20 22:48:35 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-20 22:48:35 -0800
commit1c43f2ffc4f6e3b67f57a92395a7b34a4ed4f3ae (patch)
tree9ebccef8f41f5ac22ef6dbdecddf4c1fc68c0a83
parented393b9d617d38b3b2581006ebd37321c7c81b41 (diff)
parentb47c57abca8a95afc20b96f43f9dc6ba7a89d45a (diff)
downloadandroid_packages_apps_Gallery2-1c43f2ffc4f6e3b67f57a92395a7b34a4ed4f3ae.tar.gz
android_packages_apps_Gallery2-1c43f2ffc4f6e3b67f57a92395a7b34a4ed4f3ae.tar.bz2
android_packages_apps_Gallery2-1c43f2ffc4f6e3b67f57a92395a7b34a4ed4f3ae.zip
Merge "Gallery2: Displayed titles in ActionBar during video playback"
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index e42314025..ff874fbe0 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -253,8 +253,8 @@ public class MovieActivity extends Activity {
}
setActionBarLogoFromIntent(intent);
actionBar.setDisplayOptions(
- ActionBar.DISPLAY_HOME_AS_UP,
- ActionBar.DISPLAY_HOME_AS_UP);
+ ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE,
+ ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE);
String title = intent.getStringExtra(Intent.EXTRA_TITLE);
if (title != null) {