diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-09-30 15:59:43 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2013-09-30 15:59:46 -0700 |
| commit | 5c3052936883038d25b2afe52c2dd023e9aa6812 (patch) | |
| tree | 793cea3f7d4333983f1db89c61a04e83fd65f487 /src/com/android/settings/nfc | |
| parent | 768dc8f7293356cdada32a13a476c7477f0bb126 (diff) | |
| download | packages_apps_Settings-5c3052936883038d25b2afe52c2dd023e9aa6812.tar.gz packages_apps_Settings-5c3052936883038d25b2afe52c2dd023e9aa6812.tar.bz2 packages_apps_Settings-5c3052936883038d25b2afe52c2dd023e9aa6812.zip | |
Remove Google Play specific search URIs from Settings.
1. If there are no installed print services or NFC payment services,
we would like to allow the user to search for one in Play. However,
Play is Google specific and we should not have hard coded URI that
rely on it in settings. Declare secure settings for each of these
URI and check at runtime if the URI is non-empty, then show the
add menu item.
bug:11011519
Change-Id: I2c5cb172015bbecd7d2f8ffd3cb7fd790b01dab8
Diffstat (limited to 'src/com/android/settings/nfc')
| -rw-r--r-- | src/com/android/settings/nfc/PaymentSettings.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 06697a463..7548c5099 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -25,6 +25,7 @@ import android.os.Message; import android.preference.Preference; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; +import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -152,10 +153,13 @@ public class PaymentSettings extends SettingsPreferenceFragment implements @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); - inflater.inflate(R.menu.nfc_payment_settings, menu); - MenuItem menuItem = menu.findItem(R.id.nfc_payment_menu_item_add_service); - menuItem.setIntent(new Intent(Intent.ACTION_VIEW, - Uri.parse(getString(R.string.download_nfc_payment_service_query)))); + String searchUri = Settings.Secure.getString(getContentResolver(), + Settings.Secure.PAYMENT_SERVICE_SEARCH_URI); + if (!TextUtils.isEmpty(searchUri)) { + MenuItem menuItem = menu.add(R.string.nfc_payment_menu_item_add_service); + menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM); + menuItem.setIntent(new Intent(Intent.ACTION_VIEW,Uri.parse(searchUri))); + } } private final Handler mHandler = new Handler() { |