PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev

Browse Source 
am: 9a03b951d2

Change-Id: If754d6e11ef3d39d716b41a3219a5d30c48fc218
This commit is contained in:
Fan Zhang
2017-08-17 01:20:19 +00:00
committed by android-build-merger
parent e66117f59a 9a03b951d2
commit 5c15a79fa4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/security_settings_password_sub.xml
View File

@@ -22,7 +22,7 @@
<com.android.settings.TimeoutListPreference <com.android.settings.TimeoutListPreference
android:key="lock_after_timeout" android:key="lock_after_timeout"
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary" android:summary="@string/summary_placeholder"
android:entries="@array/lock_after_timeout_entries" android:entries="@array/lock_after_timeout_entries"
android:entryValues="@array/lock_after_timeout_values" /> android:entryValues="@array/lock_after_timeout_values" />
@@ -32,7 +32,6 @@
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="owner_info_settings" android:key="owner_info_settings"
android:title="@string/owner_info_settings_title" android:title="@string/owner_info_settings_title" />
android:summary="@string/owner_info_settings_summary" />
</PreferenceScreen> </PreferenceScreen>

5
res/xml/security_settings_pin_sub.xml
View File

@@ -22,7 +22,7 @@
<com.android.settings.TimeoutListPreference <com.android.settings.TimeoutListPreference
android:key="lock_after_timeout" android:key="lock_after_timeout"
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary" android:summary="@string/summary_placeholder"
android:entries="@array/lock_after_timeout_entries" android:entries="@array/lock_after_timeout_entries"
android:entryValues="@array/lock_after_timeout_values" /> android:entryValues="@array/lock_after_timeout_values" />
@@ -32,7 +32,6 @@
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="owner_info_settings" android:key="owner_info_settings"
android:title="@string/owner_info_settings_title" android:title="@string/owner_info_settings_title" />
android:summary="@string/owner_info_settings_summary" />
</PreferenceScreen> </PreferenceScreen>