Merge "Add NFC payment "how it works" screens." into mnc-dev

2 files changed, 34 insertions, 2 deletions

diff --git a/src/com/android/settings/nfc/HowItWorks.java b/src/com/android/settings/nfc/HowItWorks.java
new file mode 100644
index 0000000..310a7e1
--- /dev/null
+++ b/src/com/android/settings/nfc/HowItWorks.java
@@ -0,0 +1,30 @@
+package com.android.settings.nfc;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.R;
+public class HowItWorks extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.nfc_payment_how_it_works);
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        Button gotIt = (Button) findViewById(R.id.nfc_how_it_works_button);
+        gotIt.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+               finish();
+            }
+        });
+    }
+
+    @Override
+    public boolean onNavigateUp() {
+        finish();
+        return true;
+    }
+
+}
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index ca38d92..bc438d1 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.nfc;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
@@ -88,7 +89,8 @@ public class PaymentSettings extends SettingsPreferenceFragment {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem menuItem = menu.add(R.string.nfc_payment_how_it_works);
-        menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        // TODO link to tutorial screen
+        Intent howItWorksIntent = new Intent(getActivity(), HowItWorks.class);
+        menuItem.setIntent(howItWorksIntent);
+        menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
     }
 }