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

Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE

Browse Source 
Manual report of 0897f975c1

 - clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources

Change-Id: I3ab77677f3d926b0a3eb9be5d77ee23b568856aa
This commit is contained in:
Fabrice Di Meglio
2014-05-30 17:59:00 -07:00
parent a391d9c6ac
commit 23c6666a88
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/security_settings_picker.xml
View File

@@ -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"

2
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -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;

2
src/com/android/settings/search/Ranking.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.search;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.DataUsageSummary;
import com.android.settings.DateTimeSettings;
import com.android.settings.DevelopmentSettings;
@@ -108,6 +109,7 @@ public final class Ranking {
sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
sRankMap.put(SecuritySettings.class.getName(), RANK_SECURITY);
sRankMap.put(ChooseLockGeneric.ChooseLockGenericFragment.class.getName(), RANK_SECURITY);
sRankMap.put(InputMethodAndLanguageSettings.class.getName(), RANK_IME);

9
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -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;
@@ -174,6 +175,14 @@ public final class SearchIndexableResources {
SecuritySettings.class.getName(),
R.drawable.ic_settings_security));
sResMap.put(ChooseLockGeneric.ChooseLockGenericFragment.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(
ChooseLockGeneric.ChooseLockGenericFragment.class.getName()),
R.xml.security_settings_picker,
ChooseLockGeneric.ChooseLockGenericFragment.class.getName(),
R.drawable.ic_settings_security));
sResMap.put(InputMethodAndLanguageSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(InputMethodAndLanguageSettings.class.getName()),