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

Merge "Remove old code from DisplaySettings not used in new IA."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-28 21:33:31 +00:00
committed by Android (Google) Code Review
parent 88d9977b88 c626f00b01
commit b567ff46c3
4 changed files with 6 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DisplaySettings.java
View File

@@ -64,11 +64,7 @@ public class DisplaySettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
if (mDashboardFeatureProvider.isEnabled()) {
return R.xml.ia_display_settings;
} else {
return R.xml.display_settings;
}
return R.xml.ia_display_settings;
}
@Override
@@ -104,14 +100,7 @@ public class DisplaySettings extends DashboardFragment {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
final boolean useNewIA = FeatureFactory.getFactory(context)
.getDashboardFeatureProvider(context)
.isEnabled();
if (useNewIA) {
sir.xmlResId = R.xml.ia_display_settings;
} else {
sir.xmlResId = R.xml.display_settings;
}
sir.xmlResId = R.xml.ia_display_settings;
result.add(sir);
return result;
}

1
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -283,7 +283,6 @@ public class SettingsGateway {
Settings.ConnectedDeviceDashboardActivity.class.getName(),
Settings.AppAndNotificationDashboardActivity.class.getName(),
"com.android.settings.BatteryDashboardAlias",
"com.android.settings.DisplayDashboardAlias",
"com.android.settings.SoundDashboardAlias",
"com.android.settings.SecurityDashboardAlias",
"com.android.settings.UsersDashboardAlias",