summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPage.java
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-03-26 18:25:50 -0700
committerMartijn Coenen <maco@google.com>2012-04-04 14:01:50 -0700
commitf9a737de45b0d9ef5bb3355bb2e79dd1d0402d5c (patch)
tree57ba9b53445f1ea17e01c517d6d586e7509f57a9 /src/com/android/gallery3d/app/PhotoPage.java
parentfaffb8e160051177131b37041ef8481caa1bf356 (diff)
downloadandroid_packages_apps_Snap-f9a737de45b0d9ef5bb3355bb2e79dd1d0402d5c.tar.gz
android_packages_apps_Snap-f9a737de45b0d9ef5bb3355bb2e79dd1d0402d5c.tar.bz2
android_packages_apps_Snap-f9a737de45b0d9ef5bb3355bb2e79dd1d0402d5c.zip
Support for beaming a picture.
Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 32aba9308..9f12ffde8 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -24,6 +24,9 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Rect;
import android.net.Uri;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -110,6 +113,8 @@ public class PhotoPage extends ActivityState
private ScreenNailHolder mScreenNailHolder;
private ScreenNail mScreenNail;
+ private NfcAdapter mNfcAdapter;
+
public static interface Model extends PhotoView.Model {
public void resume();
public void pause();
@@ -155,6 +160,7 @@ public class PhotoPage extends ActivityState
mApplication = (GalleryApp)((Activity) mActivity).getApplication();
mSetPathString = data.getString(KEY_MEDIA_SET_PATH);
+ mNfcAdapter = NfcAdapter.getDefaultAdapter(mActivity.getAndroidContext());
Path itemPath = Path.fromString(data.getString(KEY_MEDIA_ITEM_PATH));
if (mSetPathString != null) {
@@ -263,6 +269,10 @@ public class PhotoPage extends ActivityState
intent.setType(MenuExecutor.getMimeType(type));
intent.putExtra(Intent.EXTRA_STREAM, manager.getContentUri(path));
mShareActionProvider.setShareIntent(intent);
+ if (mNfcAdapter != null) {
+ mNfcAdapter.setBeamPushUri(MenuExecutor.getMimeType(type),
+ manager.getContentUri(path), (Activity)mActivity);
+ }
mPendingSharePath = null;
} else {
// This happens when ActionBar is not created yet.
@@ -583,6 +593,7 @@ public class PhotoPage extends ActivityState
mModel.pause();
mHandler.removeMessages(MSG_HIDE_BARS);
mActionBar.removeOnMenuVisibilityListener(mMenuVisibilityListener);
+
mMenuExecutor.pause();
}
@@ -599,6 +610,7 @@ public class PhotoPage extends ActivityState
}
mActionBar.setDisplayOptions(mSetPathString != null, true);
mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener);
+
onUserInteraction();
}
@@ -638,4 +650,5 @@ public class PhotoPage extends ActivityState
return mIndex;
}
}
+
}