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/PickerActivity.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/PickerActivity.java')
-rw-r--r-- | src/com/android/gallery3d/app/PickerActivity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/PickerActivity.java b/src/com/android/gallery3d/app/PickerActivity.java index d5bb218ea..1eb95d0c6 100644 --- a/src/com/android/gallery3d/app/PickerActivity.java +++ b/src/com/android/gallery3d/app/PickerActivity.java @@ -17,13 +17,13 @@ package com.android.gallery3d.app; import android.os.Bundle; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.view.Window; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuInflater; +import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.Window; import com.android.gallery3d.R; import com.android.gallery3d.ui.GLRootView; @@ -62,7 +62,7 @@ public class PickerActivity extends AbstractGalleryActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getMenuInflater(); + MenuInflater inflater = getSupportMenuInflater(); inflater.inflate(R.menu.pickup, menu); return true; } |