diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/credentials_dialog.xml (renamed from res/layout/credentials_password_dialog.xml) | 55 | ||||
| -rw-r--r-- | res/layout/credentials_unlock_dialog.xml | 49 | ||||
| -rw-r--r-- | res/values/strings.xml | 82 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 | ||||
| -rw-r--r-- | res/xml/security_settings_misc.xml | 83 |
5 files changed, 161 insertions, 114 deletions
diff --git a/res/layout/credentials_password_dialog.xml b/res/layout/credentials_dialog.xml index 440a107..506b3d6 100644 --- a/res/layout/credentials_password_dialog.xml +++ b/res/layout/credentials_dialog.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project +<!-- Copyright (C) 2011 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" @@ -27,47 +27,54 @@ <TextView android:id="@+id/hint" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="@dimen/vpn_connect_normal_text_size" - android:text="@string/credentials_first_time_hint" - android:layout_marginBottom="10sp" - android:visibility="gone"/> + android:layout_marginBottom="10sp"/> <TextView android:id="@+id/error" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="10sp" android:textColor="@color/red" android:textStyle="bold" android:visibility="gone"/> <TextView android:id="@+id/old_password_prompt" - android:layout_width="match_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/credentials_old_password" android:visibility="gone"/> + <EditText android:id="@+id/old_password" android:layout_width="match_parent" android:layout_height="wrap_content" - android:password="True" - android:singleLine="True" + android:password="true" + android:singleLine="true" android:visibility="gone"/> - <TextView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/credentials_new_password" /> - <EditText android:id="@+id/new_password" + <LinearLayout android:id="@+id/new_passwords" + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:password="True" - android:singleLine="True"/> + android:layout_height="match_parent" + android:visibility="gone"> - <TextView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/credentials_confirm_password" /> - <EditText android:id="@+id/confirm_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:password="True" - android:singleLine="True"/> + <TextView android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/credentials_new_password"/> + + <EditText android:id="@+id/new_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true"/> + + <TextView android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/credentials_confirm_password"/> + <EditText android:id="@+id/confirm_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true"/> + </LinearLayout> </LinearLayout> </ScrollView> diff --git a/res/layout/credentials_unlock_dialog.xml b/res/layout/credentials_unlock_dialog.xml deleted file mode 100644 index a538807..0000000 --- a/res/layout/credentials_unlock_dialog.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="15dip"> - - <TextView android:id="@+id/hint" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="@dimen/vpn_connect_normal_text_size" - android:text="@string/credentials_unlock_hint" - android:layout_marginBottom="10sp" - android:visibility="gone"/> - - <TextView android:id="@+id/error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@color/red" - android:textStyle="bold" - android:visibility="gone"/> - - <EditText android:id="@+id/old_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:password="True" - android:singleLine="True"/> - - </LinearLayout> -</ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index 42c846d..5a2ecca 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2830,55 +2830,55 @@ found in the list of installed applications.</string> <!-- A secret edit field's grayed out value when it has not been set --> <string name="vpn_secret_not_set">(not set)</string> - <!-- Title of preference group for credential storage settings --> - <string name="credentials_category">Credential storage</string> - <!-- Title of preference to enable/dislable access to credential storage --> + <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] --> + <string name="credentials_title">Credential storage</string> + <!-- Title of preference to enable/dislable access to credential storage [CHAR LIMIT=30] --> <string name="credentials_access">Use secure credentials</string> - <!-- Summary of preference to enable/dislable access to credential storage --> + <!-- Summary of preference to enable/dislable access to credential storage [CHAR LIMIT=NONE] --> <string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string> - <!-- Title of dialog to enable/dislable access to credential storage --> - <string name="credentials_unlock">Enter password</string> - <!-- Description of dialog to enable/dislable access to credential storage --> - <string name="credentials_unlock_hint">Enter the credential storage password.</string> - <!-- Title of preference to install certificates from SD card [CHAR LIMIT=25] --> - <string name="credentials_install_certificates" product="nosdcard">Install from USB storage</string> - <!-- Title of preference to install certificates from SD card --> - <string name="credentials_install_certificates" product="default">Install from SD card</string> - <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=25] --> - <string name="credentials_install_certificates_summary" product="nosdcard">Install encrypted certificates from USB storage</string> - <!-- Summary of preference to install certificates from SD card --> - <string name="credentials_install_certificates_summary" product="default">Install encrypted certificates from SD card</string> - <!-- Title of preference to set storage password --> + <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] --> + <string name="credentials_install" product="nosdcard">Install from USB storage</string> + <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] --> + <string name="credentials_install" product="default">Install from SD card</string> + <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] --> + <string name="credentials_install_summary" product="nosdcard">Install certificates from USB storage</string> + <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] --> + <string name="credentials_install_summary" product="default">Install certificates from SD card</string> + <!-- Title of preference to set the password for credential storage [CHAR LIMIT=30] --> <string name="credentials_set_password">Set password</string> - <!-- Summary of preference to set storage password --> - <string name="credentials_set_password_summary">Set or change the credential storage password</string> - <!-- Title of preference to reset credential storage --> - <string name="credentials_reset">Clear storage</string> - <!-- Summary of preference to reset credential storage --> - <string name="credentials_reset_summary">Clear credential storage of all contents and reset its password</string> - <!-- Description of dialog to reset the credential storage --> - <string name="credentials_reset_hint">Are you sure you want to delete all credentials and reset the credential storage password?</string> - <!-- Description for the old-password input box --> + <!-- Summary of preference to set the password for credential storage [CHAR LIMIT=NONE] --> + <string name="credentials_set_password_summary">Set or change the password for credential storage</string> + <!-- Title of preference to reset credential storage [CHAR LIMIT=30] --> + <string name="credentials_reset">Clear credentials</string> + <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] --> + <string name="credentials_reset_summary">Remove all the contents and reset the password</string> + + <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] --> + <string name="credentials_unlock">Enter password</string> + <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] --> + <string name="credentials_unlock_hint">Enter the password for credential storage.</string> + <!-- Description of dialog to set the password for credential storage [CHAR LIMIT=NONE] --> + <string name="credentials_password_hint">Set the password for credential storage. It must have at least 8 characters.</string> + <!-- Description of the input box for the old password [CHAR LIMIT=30] --> <string name="credentials_old_password">Current password:</string> - <!-- Description for the new-password input box --> + <!-- Description of the input box for the new password [CHAR LIMIT=30] --> <string name="credentials_new_password">New password:</string> - <!-- Description for the confirm-new-password input box --> + <!-- Description of the input box to confirm the new password [CHAR LIMIT=30] --> <string name="credentials_confirm_password">Confirm new password:</string> - <!-- Description when user set up the storage for the very first time --> - <string name="credentials_first_time_hint">Set a password for the credential storage (at least 8 characters).</string> - <string name="credentials_wrong_password">Please enter the correct password.</string> - <string name="credentials_reset_warning">Please enter the correct password. You have one more try to enter the correct password before the credential storage is erased.</string> - <string name="credentials_reset_warning_plural">Please enter the correct password. You have <xliff:g id="number" example="5">%1$d</xliff:g> more tries to enter the correct password before the credential storage is erased.</string> + <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] --> + <string name="credentials_reset_hint">All the contents will be removed, and the password will be reset. Are you sure about that?</string> + <!-- Error message [CHAR LIMIT=NONE] --> <string name="credentials_passwords_mismatch">Passwords do not match.</string> - <string name="credentials_passwords_empty">You must enter and confirm a password.</string> - <string name="credentials_password_empty">Please enter the password.</string> - <string name="credentials_password_too_short">The password must have at least 8 characters.</string> - <!-- toast message --> - <string name="credentials_erased">The credential storage is erased.</string> - <!-- toast message --> + <!-- Error message [CHAR LIMIT=NONE] --> + <string name="credentials_wrong_password">Incorrect password.</string> + <!-- Error message [CHAR LIMIT=NONE] --> + <string name="credentials_reset_warning">Incorrect password. You have one more chance before credential storage is erased.</string> + <!-- Error message [CHAR LIMIT=NONE] --> + <string name="credentials_reset_warning_plural">Incorrect password. You have <xliff:g id="number" example="5">%1$d</xliff:g> more chances before credential storage is erased.</string> + <!-- Toast message [CHAR LIMIT=30] --> + <string name="credentials_erased">Credential storage is erased.</string> + <!-- Toast message [CHAR LIMIT=30] --> <string name="credentials_enabled">Credential storage is enabled.</string> - <!-- toast message --> - <string name="credentials_disabled">Credential storage is disabled.</string> <!-- Sound settings screen, setting check box label --> <string name="emergency_tone_title">Emergency tone</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index c361fa9..a49cd0a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -114,4 +114,10 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> </style> + + <style name="Transparent"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowNoTitle">true</item> + <item name="android:windowIsFloating">true</item> + </style> </resources> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml new file mode 100644 index 0000000..e67542b --- /dev/null +++ b/res/xml/security_settings_misc.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <PreferenceCategory android:key="sim_lock" + android:title="@string/sim_lock_settings_title" + android:persistent="false"> + + <Preference android:title="@string/sim_lock_settings_category" + android:persistent="false"> + <intent android:action="android.intent.action.MAIN" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.IccLockSettings"/> + </Preference> + </PreferenceCategory> + + <PreferenceCategory android:title="@string/security_passwords_title" + android:persistent="false"> + + <CheckBoxPreference android:key="show_password" + android:title="@string/show_password" + android:summary="@string/show_password_summary" + android:persistent="false"/> + </PreferenceCategory> + + <PreferenceCategory android:title="@string/device_admin_title" + android:persistent="false"> + <Preference android:title="@string/manage_device_admin" + android:summary="@string/manage_device_admin_summary" + android:persistent="false"> + <intent android:action="android.intent.action.MAIN" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.DeviceAdminSettings"/> + </Preference> + </PreferenceCategory> + + <PreferenceCategory android:title="@string/credentials_title" + android:persistent="false"> + <CheckBoxPreference android:key="enable_credentials" + android:title="@string/credentials_access" + android:summary="@string/credentials_access_summary" + android:persistent="false"/> + + <Preference android:title="@string/credentials_install" + android:summary="@string/credentials_install_summary" + android:persistent="false"> + <intent android:action="android.credentials.INSTALL" + android:targetPackage="com.android.certinstaller" + android:targetClass="com.android.certinstaller.CertInstallerMain"/> + </Preference> + + <Preference android:title="@string/credentials_set_password" + android:summary="@string/credentials_set_password_summary" + android:persistent="false"> + <intent android:action="com.android.credentials.SET_PASSWORD" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.CredentialStorage"/> + </Preference> + + <Preference android:key="reset_credentials" + android:title="@string/credentials_reset" + android:summary="@string/credentials_reset_summary" + android:persistent="false"> + <intent android:action="com.android.credentials.RESET" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.CredentialStorage"/> + </Preference> + </PreferenceCategory> +</PreferenceScreen> |