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

This commit is contained in:
Martijn Coenen
2015-06-08 08:02:28 +00:00
committed by Android (Google) Code Review
10 changed files with 121 additions and 2 deletions

View File

@@ -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;
}
}

View File

@@ -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);
}
}