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

Commit 7e6eec5b authored by Sanket Padawe's avatar Sanket Padawe
Browse files

Resolve merge conflicts of b9e837bc to nyc-dev 

+ Fix merge conflict fromm mm-wireless-dev to nyc-dev

Change-Id: I8a604cec65bbe5ed61262771c9fe0489798425ed
parents 5a3dec0c b9e837bc

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

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

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

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