diff options
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/config.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 15 | ||||
| -rw-r--r-- | res/xml/anonymous_stats.xml | 32 | ||||
| -rw-r--r-- | res/xml/preview_data.xml | 53 | ||||
| -rw-r--r-- | res/xml/privacy_settings_cyanogenmod.xml | 19 | ||||
| -rw-r--r-- | res/xml/security_settings_encrypted.xml | 22 |
6 files changed, 36 insertions, 107 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index b7ccf9b..32d81ab 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -51,8 +51,6 @@ <!-- Config to enable duplicate APN checking. When true, disallows adding new duplicate APNs --> <bool name="config_enable_duplicate_apn_checking">false</bool> - <!-- Metrics server endpoint --> - <string name="stats_cm_url">https://stats.lineageos.org/api/v1/stats</string> <!-- Display ro.product.name above Device model --> <bool name="config_displayDeviceName">false</bool> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6a5d5d8..e5efde6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -937,6 +937,21 @@ <!-- Image button description to switch input method --> <string name="crypt_keeper_switch_input_method">Switch input method</string> + <!-- Title for PreferenceScreen to change encryption password [CHAR LIMIT=22] --> + <string name="crypt_keeper_change_password_title">Change encryption password</string> + + <!-- Summary for PreferenceScreen to change encryption password [CHAR LIMIT=45] --> + <string name="crypt_keeper_change_password_summary">Change the password used for device encryption</string> + + <!-- Header on first screen of choose encryption password [CHAR LIMIT=30] --> + <string name="crypt_keeper_choose_your_password_header">Set encryption password</string> + + <!-- Title for PreferenceScreen to replace encryption password [CHAR LIMIT=22] --> + <string name="crypt_keeper_replace_password_title">Replace encryption password</string> + + <!-- Summary for PreferenceScreen to replace encryption password [CHAR LIMIT=45] --> + <string name="crypt_keeper_replace_password_summary">Remove the separate encryption password</string> + <!-- Unlock Picker Settings --><skip /> <!-- Security Picker --><skip /> diff --git a/res/xml/anonymous_stats.xml b/res/xml/anonymous_stats.xml deleted file mode 100644 index 0f3b8e2..0000000 --- a/res/xml/anonymous_stats.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod 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/anonymous_statistics_title" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> - - <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference - android:key="stats_collection" - android:title="@string/stats_collection_title" - android:summary="@string/stats_collection_summary" - android:defaultValue="true" /> - - <PreferenceScreen - android:title="@string/preview_data_title" - android:fragment="com.android.settings.cmstats.PreviewData" /> - -</PreferenceScreen> diff --git a/res/xml/preview_data.xml b/res/xml/preview_data.xml deleted file mode 100644 index 966e501..0000000 --- a/res/xml/preview_data.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod 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/preview_data_title" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> - - <Preference - android:key="preview_id" - style="?android:preferenceInformationStyle" - android:title="@string/preview_id_title" - android:summary="%s" /> - - <Preference - android:key="preview_device" - style="?android:preferenceInformationStyle" - android:title="@string/preview_device_title" - android:summary="%s" /> - - <Preference - android:key="preview_version" - style="?android:preferenceInformationStyle" - android:title="@string/preview_version_title" - android:summary="%s" /> - - <Preference - android:key="preview_country" - style="?android:preferenceInformationStyle" - android:title="@string/preview_country_title" - android:summary="%s" /> - - <Preference - android:key="preview_carrier" - style="?android:preferenceInformationStyle" - android:title="@string/preview_carrier_title" - android:summary="%s" /> - -</PreferenceScreen> - diff --git a/res/xml/privacy_settings_cyanogenmod.xml b/res/xml/privacy_settings_cyanogenmod.xml index 1ce0f12..cf84b02 100644 --- a/res/xml/privacy_settings_cyanogenmod.xml +++ b/res/xml/privacy_settings_cyanogenmod.xml @@ -28,23 +28,4 @@ android:title="@string/blacklist_title" android:summary="@string/blacklist_summary" android:fragment="com.android.settings.blacklist.BlacklistSettings" /> - - <!-- Anonymous statistics - (CMStats) --> - <PreferenceScreen - android:key="cmstats" - android:title="@string/anonymous_statistics_title" - android:summary="@string/anonymous_statistics_summary" - android:fragment="com.android.settings.cmstats.AnonymousStats" > - </PreferenceScreen> - - <!-- Protected Apps! --> - <Preference - android:key="protected_apps_manager" - android:title="@string/protected_apps" - android:summary="@string/protected_apps_summary"> - <intent - android:action="android.intent.action.VIEW" - android:targetPackage="com.android.settings" - android:targetClass="com.android.settings.applications.ProtectedAppsActivity" /> - </Preference> </PreferenceScreen> diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml index 2399243..4a54788 100644 --- a/res/xml/security_settings_encrypted.xml +++ b/res/xml/security_settings_encrypted.xml @@ -18,7 +18,7 @@ android:title="@string/security_settings_title"> <PreferenceCategory - android:key="security_category" + android:key="encryption_category" android:title="@string/crypt_keeper_settings_title"> <Preference @@ -27,6 +27,26 @@ android:title="@string/crypt_keeper_encrypt_title" android:summary="@string/crypt_keeper_encrypted_summary"/> + <Preference + android:key="crypt_keeper_change_password" + android:title="@string/crypt_keeper_change_password_title" + android:summary="@string/crypt_keeper_change_password_summary"> + + <intent android:action="android.intent.action.MAIN" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.ChooseEncryptionPassword" /> + </Preference> + + <Preference + android:key="crypt_keeper_replace_password" + android:title="@string/crypt_keeper_replace_password_title" + android:summary="@string/crypt_keeper_replace_password_summary"> + + <intent android:action="android.intent.action.MAIN" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.ReplaceEncryptionPassword" /> + </Preference> + </PreferenceCategory> |