commit b2f93556ac91fe06eb8f6acab05b6a6d1b2fdbe1
author Martijn Coenen <maco@google.com> Tue Jun 14 10:48:35 2011 +0200
committer Martijn Coenen <maco@google.com> Thu Jun 16 21:38:02 2011 +0200
tree 448dddbc2dc064d0af96c227f0185b88c06cdb73
parent d8c7452a7d8975a2d60414c5a33842b4a743e631

Zero-click sharing for Browser using NFC.

This adds zero-click sharing for the Browser app; the URL of the
tab currently displayed will be transferred to any NFC-capable
Android phone upon touch.

Change-Id: I7aabc1b2b3f7700c05223349e5c317534fcfe8f0

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index faee0c7..911f724 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -38,6 +38,7 @@
 import android.graphics.Picture;
 import android.net.Uri;
 import android.net.http.SslError;
+import android.nfc.NfcAdapter;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
@@ -155,6 +156,7 @@
     private IntentHandler mIntentHandler;
     private PageDialogsHandler mPageDialogsHandler;
     private NetworkStateHandler mNetworkHandler;
+    private NfcHandler mNfcHandler;
 
     private Message mAutoFillSetupMessage;
 
@@ -233,6 +235,7 @@
         mUrlHandler = new UrlHandler(this);
         mIntentHandler = new IntentHandler(mActivity, this);
         mPageDialogsHandler = new PageDialogsHandler(mActivity, this);
+        mNfcHandler = new NfcHandler(mActivity, this);
 
         PowerManager pm = (PowerManager) mActivity
                 .getSystemService(Context.POWER_SERVICE);
@@ -531,6 +534,11 @@
 
     }
 
+
+    public Tab getCurrentTab() {
+        return mTabControl.getCurrentTab();
+    }
+
     @Override
     public void shareCurrentPage() {
         shareCurrentPage(mTabControl.getCurrentTab());
@@ -616,9 +624,11 @@
         }
         mUi.onPause();
         mNetworkHandler.onPause();
+        mNfcHandler.onPause();
 
         WebView.disablePlatformNotifications();
         mCrashRecoveryHandler.backupState();
+
     }
 
     void onSaveInstanceState(Bundle outState, boolean saveImages) {
@@ -649,8 +659,10 @@
             mHandler.removeMessages(RELEASE_WAKELOCK);
             mWakeLock.release();
         }
+
         mUi.onResume();
         mNetworkHandler.onResume();
+        mNfcHandler.onResume();
         WebView.enablePlatformNotifications();
     }
 
@@ -820,6 +832,7 @@
                 mWakeLock.release();
             }
         }
+
         // Performance probe
         if (false) {
             Performance.onPageFinished(tab.getUrl());