PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NFC payment settings."

Browse Source
This commit is contained in:
Martijn Coenen
2013-08-07 02:28:40 +00:00
committed by Android (Google) Code Review
parent b75f10305d 26515da087
commit 7f34fab684
11 changed files with 519 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/Settings.java
View File

@@ -143,7 +143,8 @@ public class Settings extends PreferenceActivity
R.id.date_time_settings,
R.id.about_settings,
R.id.accessibility_settings,
R.id.print_settings
R.id.print_settings,
R.id.nfc_payment_settings
};
private SharedPreferences mDevelopmentPreferences;
@@ -556,6 +557,10 @@ public class Settings extends PreferenceActivity
|| Utils.isMonkeyRunning()) {
target.remove(i);
}
} else if (id == R.id.nfc_payment_settings) {
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC_HCE)) {
target.remove(i);
}
} else if (id == R.id.development_settings) {
if (!showDev) {
target.remove(i);
@@ -950,4 +955,5 @@ public class Settings extends PreferenceActivity
public static class UserSettingsActivity extends Settings { /* empty */ }
public static class NotificationAccessSettingsActivity extends Settings { /* empty */ }
public static class UsbSettingsActivity extends Settings { /* empty */ }
public static class NfcPaymentActivity extends Settings { /* empty */ }
}