diff options
| -rw-r--r-- | src/com/android/gallery3d/actionbar/ActionBarUtils.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/actionbar/ActionBarUtils.java b/src/com/android/gallery3d/actionbar/ActionBarUtils.java index 25ccb92b3..4df8d5c10 100644 --- a/src/com/android/gallery3d/actionbar/ActionBarUtils.java +++ b/src/com/android/gallery3d/actionbar/ActionBarUtils.java @@ -23,9 +23,12 @@ import com.android.gallery3d.common.ApiHelper; public class ActionBarUtils { public static ActionBarInterface getActionBar(Activity activity) { - return ApiHelper.HAS_ACTION_BAR - ? new SystemActionBarWrapper(activity) - : new SimpleActionBar(activity); + if (ApiHelper.HAS_ACTION_BAR) { + if (activity.getActionBar() == null) return null; + return new SystemActionBarWrapper(activity); + } else { + return new SimpleActionBar(activity); + } } public static ActionModeInterface startActionMode( |