diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-10 10:02:59 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-06-10 11:05:02 -0400 |
| commit | f94023216accd128b06acdc50950e455a60a9c4e (patch) | |
| tree | 2b90e0ffa7e346d65a1cbdfbdd7c0de010735f2c /src/com/android/settings/search | |
| parent | da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b (diff) | |
| download | packages_apps_Settings-f94023216accd128b06acdc50950e455a60a9c4e.zip packages_apps_Settings-f94023216accd128b06acdc50950e455a60a9c4e.tar.gz packages_apps_Settings-f94023216accd128b06acdc50950e455a60a9c4e.tar.bz2 | |
Fix legal info back button
Make it its own SettingsPreferenceFragment.
whitespace--
Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
Diffstat (limited to 'src/com/android/settings/search')
| -rw-r--r-- | src/com/android/settings/search/Ranking.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/search/SearchIndexableResources.java | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java index 5d987fa..6481aba 100644 --- a/src/com/android/settings/search/Ranking.java +++ b/src/com/android/settings/search/Ranking.java @@ -23,6 +23,7 @@ import com.android.settings.DevelopmentSettings; import com.android.settings.DeviceInfoSettings; import com.android.settings.DisplaySettings; import com.android.settings.HomeSettings; +import com.android.settings.LegalSettings; import com.android.settings.PrivacySettings; import com.android.settings.ScreenPinningSettings; import com.android.settings.SecuritySettings; @@ -172,6 +173,7 @@ public final class Ranking { // Device infos sRankMap.put(DeviceInfoSettings.class.getName(), RANK_DEVICE_INFO); + sRankMap.put(LegalSettings.class.getName(), RANK_DEVICE_INFO); sBaseRankMap.put("com.android.settings", 0); } diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 6a324ac..7cb0dd1 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -24,6 +24,7 @@ import com.android.settings.DevelopmentSettings; import com.android.settings.DeviceInfoSettings; import com.android.settings.DisplaySettings; import com.android.settings.HomeSettings; +import com.android.settings.LegalSettings; import com.android.settings.PrivacySettings; import com.android.settings.R; import com.android.settings.ScreenPinningSettings; @@ -296,6 +297,13 @@ public final class SearchIndexableResources { DeviceInfoSettings.class.getName(), R.drawable.ic_settings_about)); + sResMap.put(LegalSettings.class.getName(), + new SearchIndexableResource( + Ranking.getRankForClassName(LegalSettings.class.getName()), + NO_DATA_RES_ID, + LegalSettings.class.getName(), + R.drawable.ic_settings_about)); + sResMap.put(WifiCallingSettings.class.getName(), new SearchIndexableResource( Ranking.getRankForClassName(WifiCallingSettings.class.getName()), |