Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev

This commit is contained in:
Jeff Sharkey
2012-11-15 11:44:37 -08:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 3 deletions

View File

@@ -2828,8 +2828,6 @@
<string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string> <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>
<!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away. By hide, I mean mask it out. --> <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away. By hide, I mean mask it out. -->
<string name="show_password">Make passwords visible</string> <string name="show_password">Make passwords visible</string>
<!-- On Security & location settings screen, setting check box summary. Summary for the visible passwords setting. -->
<string name="show_password_summary"></string>
<!-- Warning message about security implications of enabling an input method, displayed as a dialog <!-- Warning message about security implications of enabling an input method, displayed as a dialog
message when the user selects to enable an IME. --> message when the user selects to enable an IME. -->
<string name="ime_security_warning">This input method may be able to collect <string name="ime_security_warning">This input method may be able to collect

View File

@@ -33,7 +33,6 @@
<CheckBoxPreference android:key="show_password" <CheckBoxPreference android:key="show_password"
android:title="@string/show_password" android:title="@string/show_password"
android:summary="@string/show_password_summary"
android:persistent="false"/> android:persistent="false"/>
</PreferenceCategory> </PreferenceCategory>