diff options
author | John Reck <jreck@google.com> | 2012-12-12 13:43:43 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2012-12-12 13:43:43 -0800 |
commit | ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106 (patch) | |
tree | 5ee8e298937a49690099c78f561dabbbc9af5549 /src/com/android/gallery3d/ui | |
parent | 8e8cc05541f6c8c34c6c37aa5622e146064a1793 (diff) | |
download | android_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/ui')
-rw-r--r-- | src/com/android/gallery3d/ui/ActionModeHandler.java | 16 | ||||
-rw-r--r-- | src/com/android/gallery3d/ui/MenuExecutor.java | 5 | ||||
-rw-r--r-- | src/com/android/gallery3d/ui/PopupList.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/ui/PositionController.java | 8 |
4 files changed, 13 insertions, 18 deletions
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index d90fc20d0..9b84bf75c 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -17,21 +17,21 @@ package com.android.gallery3d.ui; import android.annotation.TargetApi; +import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.nfc.NfcAdapter; import android.os.Handler; +import android.view.ActionMode; +import android.view.ActionMode.Callback; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.Button; +import android.widget.ShareActionProvider; +import android.widget.ShareActionProvider.OnShareTargetSelectedListener; -import com.actionbarsherlock.app.SherlockActivity; -import com.actionbarsherlock.view.ActionMode; -import com.actionbarsherlock.view.ActionMode.Callback; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; -import com.actionbarsherlock.widget.ShareActionProvider; -import com.actionbarsherlock.widget.ShareActionProvider.OnShareTargetSelectedListener; import com.android.gallery3d.R; import com.android.gallery3d.app.AbstractGalleryActivity; import com.android.gallery3d.common.ApiHelper; @@ -129,7 +129,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi } public void startActionMode() { - SherlockActivity a = mActivity; + Activity a = mActivity; mActionMode = a.startActionMode(this); View customView = LayoutInflater.from(a).inflate( R.layout.action_mode, null); diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index a9eeaf89c..46e400483 100644 --- a/src/com/android/gallery3d/ui/MenuExecutor.java +++ b/src/com/android/gallery3d/ui/MenuExecutor.java @@ -26,12 +26,11 @@ import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.view.Menu; +import android.view.MenuItem; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import com.android.gallery3d.R; import com.android.gallery3d.app.AbstractGalleryActivity; -import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaItem; diff --git a/src/com/android/gallery3d/ui/PopupList.java b/src/com/android/gallery3d/ui/PopupList.java index dd6269380..248f50b25 100644 --- a/src/com/android/gallery3d/ui/PopupList.java +++ b/src/com/android/gallery3d/ui/PopupList.java @@ -159,7 +159,7 @@ public class PopupList { R.drawable.menu_dropdown_panel_holo_dark)); mContentList = new ListView(mContext, null, - com.actionbarsherlock.R.attr.dropDownListViewStyle); + android.R.attr.dropDownListViewStyle); mContentList.setAdapter(new ItemDataAdapter()); mContentList.setOnItemClickListener(mOnItemClickListener); popup.setContentView(mContentList); diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java index 9069d5da2..6a4bcea87 100644 --- a/src/com/android/gallery3d/ui/PositionController.java +++ b/src/com/android/gallery3d/ui/PositionController.java @@ -18,10 +18,10 @@ package com.android.gallery3d.ui; import android.content.Context; import android.graphics.Rect; -import android.os.Build; import android.util.Log; import android.widget.Scroller; +import com.android.gallery3d.app.PhotoPage; import com.android.gallery3d.common.Utils; import com.android.gallery3d.ui.PhotoView.Size; import com.android.gallery3d.util.GalleryUtils; @@ -211,11 +211,7 @@ class PositionController { public PositionController(Context context, Listener listener) { mListener = listener; mPageScroller = new FlingScroller(); - if (Build.VERSION.SDK_INT >= 11) { - mFilmScroller = new Scroller(context, null, false); - } else { - mFilmScroller = new Scroller(context, null); - } + mFilmScroller = new Scroller(context, null, false); // Initialize the areas. initPlatform(); |