summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2012-06-29 18:59:17 +0800
committerYuli Huang <yuli@google.com>2012-06-29 19:23:17 +0800
commit1c74ba27ea9187de2272f294b663c13d43bb7436 (patch)
treefff0623224567fbe3f3019cabf10f89683013ef2 /src/com/android/gallery3d/ui
parent0bba10c41de7078ccbf59c401bce17f2b68c7260 (diff)
downloadandroid_packages_apps_Snap-1c74ba27ea9187de2272f294b663c13d43bb7436.tar.gz
android_packages_apps_Snap-1c74ba27ea9187de2272f294b663c13d43bb7436.tar.bz2
android_packages_apps_Snap-1c74ba27ea9187de2272f294b663c13d43bb7436.zip
Do not use NfcAdapter API in old platforms.
bug:6698904 Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rw-r--r--src/com/android/gallery3d/ui/ActionModeHandler.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index 746d41d4b..2a0157a4b 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -16,11 +16,13 @@
package com.android.gallery3d.ui;
+import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.nfc.NfcAdapter;
+import android.os.Build;
import android.os.Handler;
import android.view.ActionMode;
import android.view.LayoutInflater;
@@ -36,6 +38,7 @@ import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
import com.android.gallery3d.R;
import com.android.gallery3d.app.GalleryActionBar;
import com.android.gallery3d.app.GalleryActivity;
+import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.Utils;
import com.android.gallery3d.data.DataManager;
import com.android.gallery3d.data.MediaObject;
@@ -224,14 +227,20 @@ public class ActionModeHandler implements ActionMode.Callback {
return operation;
}
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+ private void setNfcBeamPushUris(Uri[] uris) {
+ if (mNfcAdapter != null &&
+ Build.VERSION.SDK_INT >= ApiHelper.VERSION_CODES.JELLY_BEAN) {
+ mNfcAdapter.setBeamPushUris(uris, (Activity)mActivity);
+ }
+ }
+
// Share intent needs to expand the selection set so we can get URI of
// each media item
private Intent computeSharingIntent(JobContext jc) {
ArrayList<Path> expandedPaths = mSelectionManager.getSelected(true);
if (expandedPaths.size() == 0) {
- if (mNfcAdapter != null) {
- mNfcAdapter.setBeamPushUris(null, (Activity)mActivity);
- }
+ setNfcBeamPushUris(null);
return null;
}
final ArrayList<Uri> uris = new ArrayList<Uri>();
@@ -259,14 +268,9 @@ public class ActionModeHandler implements ActionMode.Callback {
intent.putExtra(Intent.EXTRA_STREAM, uris.get(0));
}
intent.setType(mimeType);
- if (mNfcAdapter != null) {
- mNfcAdapter.setBeamPushUris(uris.toArray(new Uri[uris.size()]),
- (Activity)mActivity);
- }
+ setNfcBeamPushUris(uris.toArray(new Uri[uris.size()]));
} else {
- if (mNfcAdapter != null) {
- mNfcAdapter.setBeamPushUris(null, (Activity)mActivity);
- }
+ setNfcBeamPushUris(null);
}
return intent;