summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/GalleryActionBar.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-12-12 13:43:43 -0800
committerJohn Reck <jreck@google.com>2012-12-12 13:43:43 -0800
commitba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106 (patch)
tree5ee8e298937a49690099c78f561dabbbc9af5549 /src/com/android/gallery3d/app/GalleryActionBar.java
parent8e8cc05541f6c8c34c6c37aa5622e146064a1793 (diff)
downloadandroid_packages_apps_Snap-ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106.tar.gz
android_packages_apps_Snap-ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106.tar.bz2
android_packages_apps_Snap-ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106.zip
remove actionbar sherlock
Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
Diffstat (limited to 'src/com/android/gallery3d/app/GalleryActionBar.java')
-rw-r--r--src/com/android/gallery3d/app/GalleryActionBar.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 49f4186e8..0fb5e51b4 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -17,6 +17,9 @@
package com.android.gallery3d.app;
import android.annotation.TargetApi;
+import android.app.ActionBar;
+import android.app.ActionBar.OnMenuVisibilityListener;
+import android.app.ActionBar.OnNavigationListener;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
@@ -24,18 +27,15 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
+import android.widget.ShareActionProvider;
import android.widget.TextView;
import android.widget.TwoLineListItem;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.ActionBar.OnMenuVisibilityListener;
-import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.widget.ShareActionProvider;
import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper;
@@ -186,7 +186,7 @@ public class GalleryActionBar implements OnNavigationListener {
}
public GalleryActionBar(AbstractGalleryActivity activity) {
- mActionBar = activity.getSupportActionBar();
+ mActionBar = activity.getActionBar();
mContext = activity.getAndroidContext();
mActivity = activity;
mInflater = ((Activity) mActivity).getLayoutInflater();
@@ -396,7 +396,7 @@ public class GalleryActionBar implements OnNavigationListener {
private Intent mShareIntent;
public void createActionBarMenu(int menuRes, Menu menu) {
- mActivity.getSupportMenuInflater().inflate(menuRes, menu);
+ mActivity.getMenuInflater().inflate(menuRes, menu);
mActionBarMenu = menu;
MenuItem item = menu.findItem(R.id.action_share_panorama);