Resolve merge conflicts of b9e837bc78 to nyc-dev

+ Fix merge conflict fromm mm-wireless-dev to nyc-dev Change-Id: I8a604cec65bbe5ed61262771c9fe0489798425ed
2016-02-29 10:48:51 -08:00
parent 5a3dec0c40 b9e837bc78
commit 7e6eec5b87
2 changed files with 0 additions and 8 deletions
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -116,7 +116,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);
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -320,13 +320,6 @@ public final class SearchIndexableResources {
                        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));
-
        sResMap.put(ZenModeVisualInterruptionSettings.class.getName(),
                new SearchIndexableResource(
                        Ranking.getRankForClassName(