diff options
| author | John Reck <jreck@google.com> | 2012-10-30 17:34:20 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-10-31 15:01:13 -0700 |
| commit | ce6b27fde7c95477fd6d24ea427280a5d6431bcf (patch) | |
| tree | 3b3495d24c349d733d874da84bde9c531a19c2ae /src/com/android/gallery3d/app/ActivityState.java | |
| parent | e4084d2752689f01f38ad0b929acfb8a30625afb (diff) | |
| download | android_packages_apps_Snap-ce6b27fde7c95477fd6d24ea427280a5d6431bcf.tar.gz android_packages_apps_Snap-ce6b27fde7c95477fd6d24ea427280a5d6431bcf.tar.bz2 android_packages_apps_Snap-ce6b27fde7c95477fd6d24ea427280a5d6431bcf.zip | |
Gingerbread support-ish
This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.
Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
| -rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index cdd91ff4d..2e440df25 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -16,7 +16,6 @@ package com.android.gallery3d.app; -import android.app.ActionBar; import android.app.Activity; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -28,12 +27,14 @@ import android.os.BatteryManager; import android.os.Bundle; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.Window; import android.view.WindowManager; +import com.actionbarsherlock.app.ActionBar; +import com.actionbarsherlock.app.SherlockActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuInflater; +import com.actionbarsherlock.view.MenuItem; import com.android.gallery3d.R; import com.android.gallery3d.anim.StateTransitionAnimation; import com.android.gallery3d.ui.GLView; @@ -198,7 +199,7 @@ abstract public class ActivityState { // should only be called by StateManager void resume() { AbstractGalleryActivity activity = mActivity; - ActionBar actionBar = activity.getActionBar(); + ActionBar actionBar = ((SherlockActivity) activity).getSupportActionBar(); if (actionBar != null) { if ((mFlags & FLAG_HIDE_ACTION_BAR) != 0) { actionBar.hide(); @@ -279,6 +280,6 @@ abstract public class ActivityState { } protected MenuInflater getSupportMenuInflater() { - return mActivity.getMenuInflater(); + return ((SherlockActivity) mActivity).getSupportMenuInflater(); } } |