diff options
| -rw-r--r-- | res/xml/security_settings_picker.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/search/SearchIndexableResources.java | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml index 6ed7d5f..fda44e1 100644 --- a/res/xml/security_settings_picker.xml +++ b/res/xml/security_settings_picker.xml @@ -14,7 +14,9 @@ limitations under the License. --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/lock_settings_picker_title" + android:key="lock_settings_picker"> <PreferenceScreen android:key="unlock_set_off" diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 0081ad3..30a72ef 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -23,8 +23,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.os.Bundle; -import android.os.Process; -import android.os.UserHandle; import android.os.UserManager; import android.preference.Preference; import android.preference.PreferenceScreen; diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 7b87be2..9ce949a 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -18,6 +18,7 @@ package com.android.settings.search; import android.provider.SearchIndexableResource; +import com.android.settings.ChooseLockGeneric; import com.android.settings.DataUsageSummary; import com.android.settings.DateTimeSettings; import com.android.settings.DevelopmentSettings; @@ -187,6 +188,12 @@ public final class SearchIndexableResources { SecuritySettings.class.getName(), R.drawable.ic_settings_security)); + sResMap.put(ChooseLockGeneric.ChooseLockGenericFragment.class.getName(), + new SearchIndexableResource(RANK_SECURITY, + R.xml.security_settings_picker, + ChooseLockGeneric.ChooseLockGenericFragment.class.getName(), + R.drawable.ic_settings_security)); + sResMap.put(InputMethodAndLanguageSettings.class.getName(), new SearchIndexableResource(RANK_IME, NO_DATA_RES_ID, |