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

Fix legal info back button

Browse Source 
Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
This commit is contained in:
Jason Monk
2015-06-10 10:02:59 -04:00
parent da6a4904a9
commit f94023216a
7 changed files with 200 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -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()),