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

Commit 7284141d authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Password settings: use EM DASH as the pwd count placeholder" into... 

Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev am: 83e4f3c6 am: 0cc68e85

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177778

Change-Id: I4cc8db9db39ba77312dc8524e6a7da1c3156fc35
parents 9c93cae7 0cc68e85

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -12152,6 +12152,9 @@ 
        <item quantity="one"><xliff:g id="count">%1$d</xliff:g> password</item>

        <item quantity="other"><xliff:g id="count">%1$d</xliff:g> passwords</item>

    </plurals>

    <!-- DO NOT TRANSLATE Summary placeholder for when the passwords count is still loading or is

         unavailable. -->

    <string name="autofill_passwords_count_placeholder" translatable="false">\u2014</string>

    <!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->

    <string name="autofill_keywords">auto, fill, autofill, password</string>

























src/com/android/settings/applications/autofill/PasswordsPreferenceController.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -137,8 +137,8 @@ public class PasswordsPreferenceController extends BasePreferenceController







                prefContext.startActivityAsUser(intent, UserHandle.of(user));









                return true;









            });









            // Set an empty summary to avoid a UI flicker when the value loads.









            pref.setSummary(R.string.summary_placeholder);









            // Set a placeholder summary to avoid a UI flicker when the value loads.









            pref.setSummary(R.string.autofill_passwords_count_placeholder);



















            final MutableLiveData<Integer> passwordCount = new MutableLiveData<>();









            passwordCount.observe(