Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start

Change-Id: I88a67e3e9437124001be836239736a8275c1abf4

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7218442..0ef23f9 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,6 +27,7 @@
         <item name="android:windowBackground">@android:color/black</item>
     </style>
     <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
+        <item name="android:displayOptions">useLogo|showHome</item>
         <item name="android:background">@drawable/actionbar_translucent</item>
         <item name="android:backgroundStacked">@null</item>
     </style>

diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index e49c502..1094836 100644 (file)
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -16,15 +16,12 @@
 
 package com.android.gallery3d.app;
 
-import com.android.gallery3d.ui.GLView;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.BatteryManager;
 import android.os.Bundle;
@@ -34,6 +31,8 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
+import com.android.gallery3d.ui.GLView;
+
 abstract public class ActivityState {
     public static final int FLAG_HIDE_ACTION_BAR = 1;
     public static final int FLAG_HIDE_STATUS_BAR = 2;
@@ -147,6 +146,7 @@ abstract public class ActivityState {
                     ActionBar.DISPLAY_HOME_AS_UP);
             actionBar.setHomeButtonEnabled(
                     (actionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0);
+            actionBar.setDisplayShowTitleEnabled(true);
         }
 
         activity.invalidateOptionsMenu();