summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2015-06-05 21:28:17 +0200
committerMartijn Coenen <maco@google.com>2015-06-05 21:35:55 +0200
commitcbcc76e8d32f95690d08258a91d58136cd9fb056 (patch)
tree83942e483e23f1e7fec4810a5f6d2fa099f5b002 /src/com/android/settings/nfc
parentfb32790adc9ed647ad4e77c9613a860f9b76e855 (diff)
downloadpackages_apps_Settings-cbcc76e8d32f95690d08258a91d58136cd9fb056.zip
packages_apps_Settings-cbcc76e8d32f95690d08258a91d58136cd9fb056.tar.gz
packages_apps_Settings-cbcc76e8d32f95690d08258a91d58136cd9fb056.tar.bz2
Add NFC payment "how it works" screens.
Bug: 21239081 Bug: 21305138 Bug: 21305420 Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/HowItWorks.java30
-rw-r--r--src/com/android/settings/nfc/PaymentSettings.java6
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);
}
}