From d84467bd65877bccfa2008a2475bbc228cc17715 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Wed, 24 Feb 2016 17:47:03 -0800 Subject: [PATCH] Remove displaying of WifiCalling twice in Settings search. + WifiCalling was getting displayed twice due to addition of WifiCallingSettings screen in Settings ranking & index files. + This also solves issue of displaying WifiCalling option in non supported carrier/platform. Bug: 25669303 Change-Id: I179128d1f3c876a4d3f826e0365cbb2b761d57dd --- src/com/android/settings/search/Ranking.java | 1 - .../android/settings/search/SearchIndexableResources.java | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java index 3edfee75d23..61d1775ec17 100644 --- a/src/com/android/settings/search/Ranking.java +++ b/src/com/android/settings/search/Ranking.java @@ -110,7 +110,6 @@ public final class Ranking { // Other wireless settinfs sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS); - sRankMap.put(WifiCallingSettings.class.getName(), RANK_WIRELESS); // Home sRankMap.put(HomeSettings.class.getName(), RANK_HOME); diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index f3c0b42f9b2..cfac9718c11 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -295,13 +295,6 @@ public final class SearchIndexableResources { NO_DATA_RES_ID, LegalSettings.class.getName(), R.drawable.ic_settings_about)); - - sResMap.put(WifiCallingSettings.class.getName(), - new SearchIndexableResource( - Ranking.getRankForClassName(WifiCallingSettings.class.getName()), - R.xml.wifi_calling_settings, - WifiCallingSettings.class.getName(), - R.drawable.ic_settings_wireless)); } private SearchIndexableResources() {