Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79769485 authored by Becca Hughes's avatar Becca Hughes
Browse files

Update button strings for new design 

Updates the positive button strings see
mocks here:

https://screenshot.googleplex.com/6hLciwYTPMsYytt
https://screenshot.googleplex.com/ASAotxvEHnrDodq

Implementation:

https://hsv.googleplex.com/4658122816749568
https://hsv.googleplex.com/5590705238966272

Bug: 322074376
Change-Id: I8488d4b9414448bfbfc9462fe5450681bfbbfbdb
Test: flash device
parent f7e54aab

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -10872,6 +10872,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>







































src/com/android/settings/applications/credentials/DefaultCombinedPicker.java



+12
−0




























Original line number
Diff line number
Diff line








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

































src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java



+5
−1




























Original line number
Diff line number
Diff line








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