diff options
Diffstat (limited to 'res')
22 files changed, 489 insertions, 27 deletions
diff --git a/res/drawable-hdpi/ic_emergency.png b/res/drawable-hdpi/ic_emergency.png Binary files differnew file mode 100644 index 0000000..89c05e3 --- /dev/null +++ b/res/drawable-hdpi/ic_emergency.png diff --git a/res/drawable-hdpi/stat_sys_phone_call.png b/res/drawable-hdpi/stat_sys_phone_call.png Binary files differnew file mode 100755 index 0000000..9b5f075 --- /dev/null +++ b/res/drawable-hdpi/stat_sys_phone_call.png diff --git a/res/drawable-mdpi/ic_emergency.png b/res/drawable-mdpi/ic_emergency.png Binary files differnew file mode 100755 index 0000000..c6faf1e --- /dev/null +++ b/res/drawable-mdpi/ic_emergency.png diff --git a/res/drawable-mdpi/stat_sys_phone_call.png b/res/drawable-mdpi/stat_sys_phone_call.png Binary files differnew file mode 100644 index 0000000..c44d062 --- /dev/null +++ b/res/drawable-mdpi/stat_sys_phone_call.png diff --git a/res/drawable/data_sweep_left.xml b/res/drawable/data_sweep_left.xml index cb801a0..3532cbc 100644 --- a/res/drawable/data_sweep_left.xml +++ b/res/drawable/data_sweep_left.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_left_activated" /> diff --git a/res/drawable/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml index 378b0aa..cfdbfbb 100644 --- a/res/drawable/data_sweep_limit.xml +++ b/res/drawable/data_sweep_limit.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_limit_activated" /> diff --git a/res/drawable/data_sweep_right.xml b/res/drawable/data_sweep_right.xml index a75a1b2..cbe2a85 100644 --- a/res/drawable/data_sweep_right.xml +++ b/res/drawable/data_sweep_right.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_right_activated" /> diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml index 001d0c5..8fbe8e7 100644 --- a/res/drawable/data_sweep_warning.xml +++ b/res/drawable/data_sweep_warning.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" + android:enterFadeDuration="@android:integer/config_mediumAnimTime" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_warning_activated" /> diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml index a5193ce..60dcf6a 100644 --- a/res/layout/crypt_keeper_password_entry.xml +++ b/res/layout/crypt_keeper_password_entry.xml @@ -42,4 +42,16 @@ android:textColor="#ffffffff" /> -</LinearLayout>
\ No newline at end of file + <!-- Emergency call button. + Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() --> + <Button android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10dip" + style="@*android:style/Widget.Button.Transparent" + android:textSize="14sp" + android:drawablePadding="6dip" + /> + +</LinearLayout> diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml index 3f4ca5b..547d85d 100644 --- a/res/layout/data_usage_header.xml +++ b/res/layout/data_usage_header.xml @@ -19,13 +19,18 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <LinearLayout - android:id="@+id/network_switches" + <FrameLayout + android:id="@+id/network_switches_container" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:showDividers="middle|end" - android:divider="?android:attr/listDivider" /> + android:layout_height="wrap_content"> + <LinearLayout + android:id="@+id/network_switches" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:showDividers="middle|end" + android:divider="?android:attr/listDivider" /> + </FrameLayout> <LinearLayout android:layout_width="match_parent" diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml index 41b8eed..7e68143 100644 --- a/res/layout/data_usage_summary.xml +++ b/res/layout/data_usage_summary.xml @@ -20,6 +20,7 @@ android:layout_height="match_parent"> <LinearLayout + android:id="@+id/tabs_container" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml new file mode 100644 index 0000000..9955a79 --- /dev/null +++ b/res/layout/trusted_credential.xml @@ -0,0 +1,41 @@ +<?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. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize" + android:background="?android:attr/selectableItemBackground" + android:padding="15dip" + > + <TextView + android:id="@+id/trusted_credential_subject" + android:layout_width="0px" + android:layout_height="wrap_content" + android:layout_weight="1" + /> + <!-- checkbox is invisible and not gone so that the height is consistent between tabs --> + <CheckBox + android:id="@+id/trusted_credential_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + android:clickable="false" + android:focusable="false" + android:layout_weight="0" + /> +</LinearLayout> diff --git a/res/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml new file mode 100644 index 0000000..c18d933 --- /dev/null +++ b/res/layout/trusted_credential_details.xml @@ -0,0 +1,34 @@ +<?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. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > + <FrameLayout + android:id="@+id/cert_details" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + /> + <Button + android:id="@+id/cert_remove_button" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_gravity="right" + android:layout_margin="6dip" + /> +</LinearLayout> diff --git a/res/layout/trusted_credentials.xml b/res/layout/trusted_credentials.xml new file mode 100644 index 0000000..06ce44b --- /dev/null +++ b/res/layout/trusted_credentials.xml @@ -0,0 +1,80 @@ +<?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. +--> +<TabHost + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + <LinearLayout + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="5dp" + > + <TabWidget + android:id="@android:id/tabs" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + /> + <FrameLayout + android:id="@android:id/tabcontent" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="5dp" + > + <FrameLayout + android:id="@+id/system_tab" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > + <ProgressBar + android:id="@+id/system_progress" + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + /> + <ListView + android:id="@+id/system_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:visibility="gone" + > + </ListView> + </FrameLayout> + <FrameLayout + android:id="@+id/user_tab" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > + <ProgressBar + android:id="@+id/user_progress" + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + /> + <ListView + android:id="@+id/user_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:visibility="gone" + > + </ListView> + </FrameLayout> + </FrameLayout> + </LinearLayout> +</TabHost> diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml new file mode 100644 index 0000000..3e4b441 --- /dev/null +++ b/res/layout/vpn_dialog.xml @@ -0,0 +1,126 @@ +<?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. +--> + +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="5mm"> + + <LinearLayout android:id="@+id/editor" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + + <TextView style="@style/vpn_label" android:text="@string/vpn_name"/> + <EditText style="@style/vpn_value" android:id="@+id/name" + android:singleLine="true"/> + + <TextView style="@style/vpn_label" android:text="@string/vpn_type"/> + <Spinner style="@style/vpn_value" android:id="@+id/type" + android:prompt="@string/vpn_type" + android:entries="@array/vpn_types"/> + + <TextView style="@style/vpn_label" android:text="@string/vpn_server"/> + <EditText style="@style/vpn_value" android:id="@+id/server" + android:singleLine="true"/> + + <CheckBox style="@style/vpn_value" android:id="@+id/mppe" + android:text="@string/vpn_mppe" + android:visibility="gone"/> + + <LinearLayout android:id="@+id/l2tp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + <TextView style="@style/vpn_label" android:text="@string/vpn_l2tp_secret"/> + <EditText style="@style/vpn_value" android:id="@+id/l2tp_secret" + android:singleLine="true" + android:password="true" + android:hint="@string/vpn_not_used"/> + </LinearLayout> + + <LinearLayout android:id="@+id/ipsec_psk" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_identifier"/> + <EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier" + android:singleLine="true" + android:hint="@string/vpn_not_used"/> + + <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_secret"/> + <EditText style="@style/vpn_value" android:id="@+id/ipsec_secret" + android:singleLine="true" + android:password="true"/> + </LinearLayout> + + <LinearLayout android:id="@+id/ipsec_user" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_user_cert"/> + <Spinner style="@style/vpn_value" android:id="@+id/ipsec_user_cert" + android:prompt="@string/vpn_ipsec_user_cert" /> + </LinearLayout> + + <LinearLayout android:id="@+id/ipsec_ca" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_ca_cert"/> + <Spinner style="@style/vpn_value" android:id="@+id/ipsec_ca_cert" + android:prompt="@string/vpn_ipsec_ca_cert" /> + </LinearLayout> + + <TextView style="@style/vpn_label" android:text="@string/vpn_domains"/> + <EditText style="@style/vpn_value" android:id="@+id/domains" + android:hint="@string/vpn_not_used"/> + + <!-- Not sure if we have time to make it. --> + <TextView style="@style/vpn_label" android:text="@string/vpn_routes" + android:visibility="gone"/> + <EditText style="@style/vpn_value" android:id="@+id/routes" + android:visibility="gone"/> + </LinearLayout> + + <LinearLayout android:id="@+id/login" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + + <TextView style="@style/vpn_label" android:text="@string/vpn_username"/> + <EditText style="@style/vpn_value" android:id="@+id/username" + android:singleLine="true"/> + + <TextView style="@style/vpn_label" android:text="@string/vpn_password"/> + <EditText style="@style/vpn_value" android:id="@+id/password" + android:singleLine="true" + android:password="true"/> + + <CheckBox style="@style/vpn_value" android:id="@+id/save_login" + android:text="@string/vpn_save_login"/> + </LinearLayout> + </LinearLayout> +</ScrollView> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3f2fc23..c0578fa 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -612,5 +612,39 @@ <item>Use HDCP checking for DRM content only</item> <item>Always use HDCP checking</item> </string-array> -</resources> + <!-- Match this with the constants in VpnProfile. --> <skip /> + <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] --> + <string-array name="vpn_types" translatable="false"> + <item>PPTP</item> + <item>L2TP/IPSec PSK</item> + <item>L2TP/IPSec RSA</item> + <item>IPSec Xauth PSK</item> + <item>IPSec Xauth RSA</item> + <item>IPSec Hybrid RSA</item> + </string-array> + + <!-- Match this with the constants in VpnProfile. --> <skip /> + <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] --> + <string-array name="vpn_types_long"> + <item>PPTP VPN</item> + <item>L2TP/IPSec VPN with pre-shared keys</item> + <item>L2TP/IPSec VPN with certificates</item> + <item>IPSec VPN with pre-shared keys and Xauth authentication</item> + <item>IPSec VPN with certificates and Xauth authentication</item> + <item>IPSec VPN with certificates and hybrid authentication</item> + </string-array> + + <!-- Match this with the constants in VpnProfile. --> <skip /> + <!-- Status for a VPN network. [CHAR LIMIT=100] --> + <string-array name="vpn_states"> + <!-- Status message when VPN is connecting. --> + <item>Connecting\u2026</item> + <!-- Status message when VPN is connected. --> + <item>Connected</item> + <!-- Status message when VPN is disconnected. --> + <item>Disconnected</item> + <!-- Status message when VPN failed to connect. --> + <item>Failed</item> + </string-array> +</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index b0b0a2e..cc677ad 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1082,6 +1082,10 @@ <string name="wifi_notify_open_networks">Network notification</string> <!-- Checkbox summary for option to notify user when open networks are nearby --> <string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string> + <!-- Checkbox title for option to toggle wifi watchdog service --> + <string name="wifi_enable_watchdog_service">Wi-Fi Connectivity Checks</string> + <!-- Checkbox summary for option to toggle wifi watchdog service --> + <string name="wifi_enable_watchdog_service_summary">Detect and manage potential network connectivity problems</string> <!-- Setting title for setting the wifi sleep policy --> <string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string> <!-- Setting summary for setting the wifi sleep policy --> @@ -2611,12 +2615,14 @@ found in the list of installed applications.</string> <string name="accessibility_settings">Accessibility</string> <!-- Settings title for accessibility settings screen --> <string name="accessibility_settings_title">Accessibility settings</string> - <!-- Settings summary for accessibility settings --> + <!-- Settings summary for accessibility settings [CHAR LIMIT=40] --> <string name="accessibility_settings_summary">Manage accessibility options</string> - <!-- Setting Checkbox title for enabling accessibility --> - <string name="toggle_accessibility_title">Accessibility</string> - <!-- Setting accessibility services category --> + <!-- Setting Checkbox title for enabling accessibility large text [CHAR LIMIT=25] --> + <string name="toggle_large_text_title">Large text</string> + <!-- Setting accessibility services category [CHAR LIMIT=25] --> <string name="accessibility_services_category">Accessibility services</string> + <!-- Setting Checkbox title for enabling accessibility services [CHAR LIMIT=40] --> + <string name="toggle_accessibility_title">Allow accessibility services</string> <!-- Message for announcing the lack of installed accessibility services. --> <string name="no_accessibility_services_summary">No installed accessibility services.</string> <!-- Warning message about security implications of enabling an accessibility service, @@ -2638,8 +2644,6 @@ found in the list of installed applications.</string> applications installed.\n\nYou can download a screen reader for your device from Android Market.\n\nClick "OK" to install the screen reader.</string> - <!-- Accessibility settings: Webpage accessibility scripts category [CHAR LIMIT=25] --> - <string name="accessibility_script_injection_category">Accessibility scripts</string> <!-- Accessibility settings: Checkbox title for enabling download of accessibility scripts [CHAR LIMIT=40] --> <string name="accessibility_script_injection_enabled">Download accessibility scripts</string> <!-- Accessibility settings: Checkbox summary for enabling download of accessibility scripts [CHAR LIMIT=65] --> @@ -2947,8 +2951,6 @@ found in the list of installed applications.</string> <string name="vpn_settings_activity_title">VPN settings</string> - <!-- Title of VPN connect dialog --> - <string name="vpn_connect_to">Connect to <xliff:g id="name" example="Work Network">%s</xliff:g></string> <!-- In VPN connect dialog, for inputing username and password --> <string name="vpn_username_colon">Username:</string> <string name="vpn_password_colon">Password:</string> @@ -2969,8 +2971,6 @@ found in the list of installed applications.</string> <string name="vpn_menu_revert">Revert</string> <string name="vpn_menu_connect">Connect to network</string> <string name="vpn_menu_disconnect">Disconnect from network</string> - <string name="vpn_menu_edit">Edit network</string> - <string name="vpn_menu_delete">Delete network</string> <!-- VPN error dialog messages --> <string name="vpn_error_miss_entering">You must enter <xliff:g id="code">%s</xliff:g>.</string> @@ -3011,7 +3011,6 @@ found in the list of installed applications.</string> <string name="vpn_connect_hint">Connect to network</string> <!-- Name of a VPN profile --> - <string name="vpn_name">VPN name</string> <string name="vpn_a_name">a VPN name</string> <!-- Toast message shown when a profile is added --> @@ -3033,7 +3032,6 @@ found in the list of installed applications.</string> <!-- Preference title --> <string name="vpn_l2tp_secret_string_title">Set L2TP secret</string> <!-- Complete term --> - <string name="vpn_l2tp_secret">L2TP secret</string> <string name="vpn_a_l2tp_secret">an L2TP secret</string> <string name="vpn_pptp_encryption_title">encryption</string> <string name="vpn_pptp_encryption">PPTP encryption</string> @@ -3097,6 +3095,10 @@ found in the list of installed applications.</string> <string name="credentials_reset">Clear credentials</string> <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] --> <string name="credentials_reset_summary">Remove all certificates</string> + <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] --> + <string name="trusted_credentials">Trusted credentials</string> + <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] --> + <string name="trusted_credentials_summary">Display trusted CA certificates</string> <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] --> <string name="credentials_unlock">Enter password</string> @@ -3481,4 +3483,80 @@ found in the list of installed applications.</string> <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] --> <string name="data_usage_sweep_warning"><font size="32"><xliff:g id="number" example="128">%1$s</xliff:g></font> <font size="12"><xliff:g id="unit" example="KB">%2$s</xliff:g></font>\n<font size="12">warning</font></string> + <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. --> + <string name="cryptkeeper_emergency_call">Emergency call</string> + <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call --> + <string name="cryptkeeper_return_to_call">Return to call</string> + + <!-- Input label for the name of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_name">Name</string> + <!-- Input label for the type of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_type">Type</string> + <!-- Input label for the server address of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_server">Server address</string> + <!-- Checkbox label to enable PPP encryption for a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_mppe">PPP encryption (MPPE)</string> + <!-- Input label for the L2TP secret of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_l2tp_secret">L2TP secret</string> + <!-- Input label for the IPSec identifier of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_ipsec_identifier">IPSec identifier</string> + <!-- Input label for the IPSec pre-shared key of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_ipsec_secret">IPSec pre-shared key</string> + <!-- Selection label for the IPSec user certificate of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_ipsec_user_cert">IPSec user certificate</string> + <!-- Selection label for the IPSec CA certificate of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_ipsec_ca_cert">IPSec CA certificate</string> + <!-- Input label for the DNS search domains of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_domains">DNS search domains</string> + <!-- Input label for the forwarding routes of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_routes">Forwarding routes</string> + <!-- Input label for the username of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_username">Username</string> + <!-- Input label for the password of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_password">Password</string> + <!-- Checkbox label to save the username and the password for a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_save_login">Save this information</string> + + <!-- Hint for an optional input of a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_not_used">(not used)</string> + <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] --> + <string name="vpn_no_ca_cert">(do not verify server)</string> + + <!-- Button label to cancel chaning a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_cancel">Cancel</string> + <!-- Button label to save a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_save">Save</string> + <!-- Button label to connect to a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_connect">Connect</string> + <!-- Dialog title to edit a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_edit">Edit VPN network</string> + <!-- Dialog title to connect to a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_connect_to">Connect to <xliff:g id="network" example="School">%s</xliff:g></string> + + <!-- Preference title for VPN settings. [CHAR LIMIT=40] --> + <string name="vpn_title">VPN settings</string> + <!-- Preference title to create a new VPN network. [CHAR LIMIT=40] --> + <string name="vpn_create">Add VPN network</string> + <!-- Menu item to edit a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_menu_edit">Edit network</string> + <!-- Menu item to delete a VPN network. [CHAR LIMIT=40] --> + <string name="vpn_menu_delete">Delete network</string> + + <!-- Tab label for built-in system CA certificates. --> + <string name="trusted_credentials_system_tab">System</string> + <!-- Tab label for user added CA certificates. --> + <string name="trusted_credentials_user_tab">User</string> + <!-- Button label for disabling a system CA certificate. --> + <string name="trusted_credentials_disable_label">Disable</string> + <!-- Button label for enabling a system CA certificate. --> + <string name="trusted_credentials_enable_label">Enable</string> + <!-- Button label for removing a user CA certificate. --> + <string name="trusted_credentials_remove_label">Remove</string> + <!-- Alert dialog confirmation when enabling a system CA certificate. --> + <string name="trusted_credentials_enable_confirmation">Enable the system CA certificate?</string> + <!-- Alert dialog confirmation when disabling a system CA certificate. --> + <string name="trusted_credentials_disable_confirmation">Disable the system CA certificate?</string> + <!-- Alert dialog confirmation when removing a user CA certificate. --> + <string name="trusted_credentials_remove_confirmation">Permanently remove the user CA certificate?</string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index e2d7fe2..2e3c1d9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -138,4 +138,14 @@ <item name="android:singleLine">true</item> </style> + <style name="vpn_label"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textSize">14sp</item> + </style> + + <style name="vpn_value"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + </style> </resources> diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 771b69e..90aef84 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -19,20 +19,23 @@ android:title="@string/accessibility_settings_title"> <CheckBoxPreference - android:key="toggle_accessibility_service_checkbox" - android:title="@string/toggle_accessibility_title" + android:key="toggle_large_text_checkbox" + android:title="@string/toggle_large_text_title" android:persistent="false"/> <PreferenceCategory android:key="accessibility_services_category" - android:title="@string/accessibility_services_category" /> - - <PreferenceCategory android:key="accessibility_script_injection_category" - android:title="@string/accessibility_script_injection_category"> + android:title="@string/accessibility_services_category"> + <CheckBoxPreference + android:key="toggle_accessibility_service_checkbox" + android:title="@string/toggle_accessibility_title" + android:persistent="false" + android:order="-10000"/> <CheckBoxPreference android:key="toggle_accessibility_script_injection_checkbox" android:title="@string/accessibility_script_injection_enabled" android:summary="@string/accessibility_script_injection_enabled_summary" - android:persistent="false" /> + android:persistent="false" + android:order="10000" /> </PreferenceCategory> <PreferenceCategory android:key="power_button_category" diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index e996f70..3a88d0b 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -56,6 +56,11 @@ <PreferenceCategory android:title="@string/credentials_title" android:persistent="false"> + <Preference android:title="@string/trusted_credentials" + android:summary="@string/trusted_credentials_summary" + android:persistent="false" + android:fragment="com.android.settings.TrustedCredentials"/> + <Preference android:title="@string/credentials_install" android:summary="@string/credentials_install_summary" android:persistent="false"> diff --git a/res/xml/vpn_settings2.xml b/res/xml/vpn_settings2.xml new file mode 100644 index 0000000..189e7ed --- /dev/null +++ b/res/xml/vpn_settings2.xml @@ -0,0 +1,22 @@ +<?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" + android:title="@string/vpn_title"> + <Preference android:key="add_network" + android:title="@string/vpn_create" + android:persistent="false"/> +</PreferenceScreen> diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml index 1444de1..d7344b1 100644 --- a/res/xml/wifi_advanced_settings.xml +++ b/res/xml/wifi_advanced_settings.xml @@ -24,6 +24,13 @@ android:summary="@string/wifi_notify_open_networks_summary" android:persistent="false" /> + <!-- android:dependency="enable_wifi" --> + <CheckBoxPreference + android:key="wifi_enable_watchdog_service" + android:title="@string/wifi_enable_watchdog_service" + android:summary="@string/wifi_enable_watchdog_service_summary" + android:persistent="false" /> + <ListPreference android:key="sleep_policy" android:title="@string/wifi_setting_sleep_policy_title" |
