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

Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev

Browse Source
This commit is contained in:
Jim Miller
2015-09-19 00:59:51 +00:00
committed by Android (Google) Code Review
parent c6a96d4076 d433359684
commit d251fed3ef
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -707,6 +707,8 @@
<item quantity="one"><xliff:g id="count">%1$d</xliff:g> fingerprint set up</item> <item quantity="one"><xliff:g id="count">%1$d</xliff:g> fingerprint set up</item>
<item quantity="other"><xliff:g id="count">%1$d</xliff:g> fingerprints set up</item> <item quantity="other"><xliff:g id="count">%1$d</xliff:g> fingerprints set up</item>
</plurals> </plurals>
<!-- message shown in summary field when no fingerprints are registered -->
<string name="security_settings_fingerprint_preference_summary_none"></string>
<!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] --> <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string> <string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
<!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an

2
src/com/android/settings/SecuritySettings.java
View File

@@ -361,6 +361,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
fingerprintCount, fingerprintCount)); fingerprintCount, fingerprintCount));
clazz = FingerprintSettings.class.getName(); clazz = FingerprintSettings.class.getName();
} else { } else {
fingerprintPreference.setSummary(
R.string.security_settings_fingerprint_preference_summary_none);
clazz = FingerprintEnrollIntroduction.class.getName(); clazz = FingerprintEnrollIntroduction.class.getName();
} }
intent.setClassName("com.android.settings", clazz); intent.setClassName("com.android.settings", clazz);