diff --git a/res/values/strings.xml b/res/values/strings.xml index 97a9cd53add..012ddc3498b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10874,6 +10874,12 @@ Use %1$s\? + + Turn off + + + Change + You can only have 5 services on diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java index 0bffee97713..d6f5289e07d 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java @@ -114,6 +114,18 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment { setCancelListener(target.mCancelListener); super.onCreate(savedInstanceState); } + + @Override + protected CharSequence getPositiveButtonText() { + final Bundle bundle = getArguments(); + if (TextUtils.isEmpty(bundle.getString(EXTRA_KEY))) { + return getContext().getString( + R.string.credman_confirmation_turn_off_positive_button); + } + + return getContext().getString( + R.string.credman_confirmation_change_provider_positive_button); + } } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java index b089dd8384a..fda6b281142 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java @@ -138,11 +138,15 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment final Bundle bundle = getArguments(); final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) .setMessage(bundle.getCharSequence(EXTRA_MESSAGE)) - .setPositiveButton(android.R.string.ok, this) + .setPositiveButton(getPositiveButtonText(), this) .setNegativeButton(android.R.string.cancel, mCancelListener); return builder.create(); } + protected CharSequence getPositiveButtonText() { + return getContext().getString(android.R.string.ok); + } + @Override public void onClick(DialogInterface dialog, int which) { final Fragment fragment = getTargetFragment();