diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-30 16:53:34 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-30 16:58:07 -0700 |
commit | 90be51d5395cb092127e60f5b356d22438021d7f (patch) | |
tree | c83b2b46a8124fc7569a70baa54be483150f9270 | |
parent | 789b3e8fc0ff5e8123e3d18df1eef1daf9580acb (diff) | |
download | packages_apps_Settings-90be51d5395cb092127e60f5b356d22438021d7f.zip packages_apps_Settings-90be51d5395cb092127e60f5b356d22438021d7f.tar.gz packages_apps_Settings-90be51d5395cb092127e60f5b356d22438021d7f.tar.bz2 |
Fix the build
- somewhat LMP Previe and Master has diverged
- fix the missing symbol
- add the missing ChooseLockGeneric.ChooseLockGenericFragment in the
ranking Map
Change-Id: Ib978763b5bb093d8192749604a62bb15f6904289
-rw-r--r-- | src/com/android/settings/search/Ranking.java | 2 | ||||
-rw-r--r-- | src/com/android/settings/search/SearchIndexableResources.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java index ca3baac..074a8d7 100644 --- a/src/com/android/settings/search/Ranking.java +++ b/src/com/android/settings/search/Ranking.java @@ -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); diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index cea57b9..5156648 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -176,7 +176,9 @@ public final class SearchIndexableResources { R.drawable.ic_settings_security)); sResMap.put(ChooseLockGeneric.ChooseLockGenericFragment.class.getName(), - new SearchIndexableResource(RANK_SECURITY, + new SearchIndexableResource( + Ranking.getRankForClassName( + ChooseLockGeneric.ChooseLockGenericFragment.class.getName()), R.xml.security_settings_picker, ChooseLockGeneric.ChooseLockGenericFragment.class.getName(), R.drawable.ic_settings_security)); |