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

am 033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev

Browse Source 
* commit '033b5739ba85fca62a8e74a6620c9a14cc9f3f5e':
  Remove Google Play specific search URIs from Settings.
This commit is contained in:
Svetoslav
2013-10-01 22:21:37 -07:00
committed by Android Git Automerger
parent 3e82dff1a1 033b5739ba
commit 9d0c0b2fec
5 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/menu/nfc_payment_settings.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/nfc_payment_menu_item_add_service"
android:title="@string/nfc_payment_menu_item_add_service"
android:showAsAction="ifRoom">
</item>
</menu>

23
res/menu/print_settings.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/print_menu_item_add_service"
android:title="@string/print_menu_item_add_service"
android:showAsAction="ifRoom">
</item>
</menu>

4
res/values/donottranslate.xml
View File

@@ -33,8 +33,4 @@
<item>@string/input_method_selector_always_show_value</item>
<item>@string/input_method_selector_always_hide_value</item>
</string-array>
<!-- Default query string to search for a print service. -->
<string name="download_print_service_query">market://search?q=print service</string>
<!-- Default query string to search for a NFC payment service. -->
<string name="download_nfc_payment_service_query">market://search?q=nfc payment</string>
</resources>

12
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -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() {

11
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -150,10 +150,13 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment implements
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.print_settings, menu);
MenuItem menuItem = menu.findItem(R.id.print_menu_item_add_service);
menuItem.setIntent(new Intent(Intent.ACTION_VIEW,
Uri.parse(getString(R.string.download_print_service_query))));
String searchUri = Settings.Secure.getString(getContentResolver(),
Settings.Secure.PRINT_SERVICE_SEARCH_URI);
if (!TextUtils.isEmpty(searchUri)) {
MenuItem menuItem = menu.add(R.string.print_menu_item_add_service);
menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
menuItem.setIntent(new Intent(Intent.ACTION_VIEW,Uri.parse(searchUri)));
}
}
@Override