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

Merge "Update button strings for new design" into main

Browse Source
This commit is contained in:
Becca Hughes
2024-02-14 20:42:38 +00:00
committed by Android (Google) Code Review
parent a4f81032f2 797694855f
commit 74f8cb6eeb
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -10874,6 +10874,12 @@
<!-- Title of the warning dialog for enabling the credential provider. [CHAR_LIMIT=NONE] -->
<string name="credman_enable_confirmation_message_title">Use %1$s\?</string>
<!-- Positive button text for disabling credential manager. [CHAR_LIMIT=30] -->
<string name="credman_confirmation_turn_off_positive_button">Turn off</string>
<!-- Positive button text for changing credential manager provider. [CHAR_LIMIT=30] -->
<string name="credman_confirmation_change_provider_positive_button">Change</string>
<!-- Title of the error dialog when too many credential providers are selected (new strings for 24Q3). [CHAR_LIMIT=NONE] -->
<string name="credman_limit_error_msg_title">You can only have 5 services on</string>

12
src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
View File

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

6
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

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