Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c6666a authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE 

Manual report of 0897f975

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

Change-Id: I3ab77677f3d926b0a3eb9be5d77ee23b568856aa
parent a391d9c6

res/xml/security_settings_picker.xml

+3 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/ChooseLockGeneric.java

+0 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/search/Ranking.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/search/SearchIndexableResources.java

+9 −0
Original line number Diff line number Diff line
@@ -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()),