summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/ActivityState.java
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-07-17 16:50:31 +0800
committerOwen Lin <owenlin@google.com>2012-08-15 16:57:18 +0800
commitd84941f0649c751c0cc5fd2f6b233380e878ca26 (patch)
treecada801521d738bff0839994c445eaaf64ce16e2 /src/com/android/gallery3d/app/ActivityState.java
parent2bb717f1ea38e2ce33dd102a23afe6bfacb5675c (diff)
downloadandroid_packages_apps_Gallery2-d84941f0649c751c0cc5fd2f6b233380e878ca26.tar.gz
android_packages_apps_Gallery2-d84941f0649c751c0cc5fd2f6b233380e878ca26.tar.bz2
android_packages_apps_Gallery2-d84941f0649c751c0cc5fd2f6b233380e878ca26.zip
Add SimpleMenuXXX implementation for the Gingerbread platform.
1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files. 2. Add minimal code to show the menu. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready and integrated. The purpose of this change is making Gallery/Camera run on GB. Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r--src/com/android/gallery3d/app/ActivityState.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index ca0816c8d..6335d0575 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -33,6 +33,8 @@ import android.view.MenuItem;
import android.view.Window;
import android.view.WindowManager;
+import com.android.gallery3d.actionbar.ActionBarInterface;
+import com.android.gallery3d.actionbar.ActionBarUtils;
import com.android.gallery3d.ui.GLView;
abstract public class ActivityState {
@@ -142,7 +144,7 @@ abstract public class ActivityState {
// should only be called by StateManager
void resume() {
AbstractGalleryActivity activity = (AbstractGalleryActivity) mActivity;
- ActionBar actionBar = activity.getActionBar();
+ ActionBarInterface actionBar = ActionBarUtils.getActionBar(activity);
if (actionBar != null) {
if ((mFlags & FLAG_HIDE_ACTION_BAR) != 0) {
actionBar.hide();