summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PickerActivity.java
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-10-02 15:27:00 +0800
committerOwen Lin <owenlin@google.com>2012-10-02 17:07:20 +0800
commit1336062985c9824d7fd796b1cebd5eaa8e4163ca (patch)
tree1503785db6382465bf9e9f8ff0c9977b907bcbeb /src/com/android/gallery3d/app/PickerActivity.java
parent935b9cfe991c3afe119720c487dc24cc02c55584 (diff)
downloadandroid_packages_apps_Gallery2-1336062985c9824d7fd796b1cebd5eaa8e4163ca.tar.gz
android_packages_apps_Gallery2-1336062985c9824d7fd796b1cebd5eaa8e4163ca.tar.bz2
android_packages_apps_Gallery2-1336062985c9824d7fd796b1cebd5eaa8e4163ca.zip
Remove ActionBarSherlock
bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
Diffstat (limited to 'src/com/android/gallery3d/app/PickerActivity.java')
-rw-r--r--src/com/android/gallery3d/app/PickerActivity.java10
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 1eb95d0c6..d5bb218ea 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 = getSupportMenuInflater();
+ MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.pickup, menu);
return true;
}