PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts of b9e837bc78 to nyc-dev

Browse Source 
am: 7e6eec5b87

* commit '7e6eec5b87ba5ba34f63f7ba99ad911d54729d87':
  Remove displaying of WifiCalling twice in Settings search.
This commit is contained in:
Sanket Padawe
2016-02-29 19:14:52 +00:00
committed by android-build-merger
parent d9bd7b0324 7e6eec5b87
commit 71b73695bd
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/search/Ranking.java
View File

@@ -116,7 +116,6 @@ public final class Ranking {
// Other wireless settinfs // Other wireless settinfs
sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS); sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS);
sRankMap.put(WifiCallingSettings.class.getName(), RANK_WIRELESS);
// Home // Home
sRankMap.put(HomeSettings.class.getName(), RANK_HOME); sRankMap.put(HomeSettings.class.getName(), RANK_HOME);

7
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -320,13 +320,6 @@ public final class SearchIndexableResources {
LegalSettings.class.getName(), LegalSettings.class.getName(),
R.drawable.ic_settings_about)); 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(), sResMap.put(ZenModeVisualInterruptionSettings.class.getName(),
new SearchIndexableResource( new SearchIndexableResource(
Ranking.getRankForClassName( Ranking.getRankForClassName(