diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-13 13:54:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:07:30 +0000 |
| commit | 20a2aaa9595e9ab958d27eb430af6560e24ba78c (patch) | |
| tree | d810cc69bfa5db15a0d8833cfc73a4618a0eee73 /res/xml | |
| parent | f0ad93f3b99b9fd7c5191dc9fa91c59809d48870 (diff) | |
| parent | 29a4eb7a33da12a957b3305138ada69140d8ab75 (diff) | |
| download | packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.zip packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.gz packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.bz2 | |
Merge commit 'android-4.2.2_r1' into mr1.1-staging
Conflicts:
AndroidManifest.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es/strings.xml
res/values-fi/strings.xml
res/values-hu/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/strings.xml
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/ChooseLockPatternTutorial.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/Settings.java
Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/device_info_status.xml | 5 | ||||
| -rw-r--r-- | res/xml/security_settings_misc.xml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml index aaa90a9..38a3e80 100644 --- a/res/xml/device_info_status.xml +++ b/res/xml/device_info_status.xml @@ -42,6 +42,11 @@ android:title="@string/status_network_type" android:summary="@string/device_info_not_available" android:persistent="false" /> + <Preference android:key="latest_area_info" + style="?android:attr/preferenceInformationStyle" + android:title="@string/status_latest_area_info" + android:summary="@string/device_info_not_available" + android:persistent="false" /> <Preference android:key="service_state" style="?android:attr/preferenceInformationStyle" android:title="@string/status_service_state" diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index b0313eb..ee87e51 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -33,7 +33,6 @@ <CheckBoxPreference android:key="show_password" android:title="@string/show_password" - android:summary="@string/show_password_summary" android:persistent="false"/> </PreferenceCategory> |