diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-14 21:15:50 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-14 21:15:50 -0800 |
| commit | eb7a665c4621999bf2711f16c5a37af35b156546 (patch) | |
| tree | e2980af18687ce148a5250a05847fce3bd0a338f /res/xml | |
| parent | 8129ea29cafba3f1199a7935b69f949908c01011 (diff) | |
| parent | 20a2aaa9595e9ab958d27eb430af6560e24ba78c (diff) | |
| download | packages_apps_settings-eb7a665c4621999bf2711f16c5a37af35b156546.zip packages_apps_settings-eb7a665c4621999bf2711f16c5a37af35b156546.tar.gz packages_apps_settings-eb7a665c4621999bf2711f16c5a37af35b156546.tar.bz2 | |
Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Settings into mr1.1-staging
Change-Id: I17e7cea5e432d0025c64465a7c01c42bb24e7133
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> |