Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev

This commit is contained in:
Ahaan Ugale
2021-07-02 23:56:20 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 2 deletions

View File

@@ -12152,6 +12152,9 @@
<item quantity="one"><xliff:g id="count">%1$d</xliff:g> password</item> <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> <item quantity="other"><xliff:g id="count">%1$d</xliff:g> passwords</item>
</plurals> </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] --> <!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->
<string name="autofill_keywords">auto, fill, autofill, password</string> <string name="autofill_keywords">auto, fill, autofill, password</string>

View File

@@ -137,8 +137,8 @@ public class PasswordsPreferenceController extends BasePreferenceController
prefContext.startActivityAsUser(intent, UserHandle.of(user)); prefContext.startActivityAsUser(intent, UserHandle.of(user));
return true; return true;
}); });
// Set an empty summary to avoid a UI flicker when the value loads. // Set a placeholder summary to avoid a UI flicker when the value loads.
pref.setSummary(R.string.summary_placeholder); pref.setSummary(R.string.autofill_passwords_count_placeholder);
final MutableLiveData<Integer> passwordCount = new MutableLiveData<>(); final MutableLiveData<Integer> passwordCount = new MutableLiveData<>();
passwordCount.observe( passwordCount.observe(