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

Merge "Reorder prefs in display settings for new info architecture"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-11 23:39:02 +00:00
committed by Android (Google) Code Review
parent ab50807d1e 99abc025b9
commit 1c3ac5bca9
2 changed files with 135 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import com.android.settings.display.TapToWakePreferenceController;
import com.android.settings.display.TimeoutPreferenceController;
import com.android.settings.display.VrDisplayPreferenceController;
import com.android.settings.display.WallpaperPreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.drawer.CategoryKey;
@@ -67,7 +68,11 @@ public class DisplaySettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.display_settings;
if (mDashboardFeatureProvider.isEnabled()) {
return R.xml.ia_display_settings;
} else {
return R.xml.display_settings;
}
}
@Override
@@ -139,12 +144,18 @@ public class DisplaySettings extends DashboardFragment {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
ArrayList<SearchIndexableResource> result = new ArrayList<>();
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.display_settings;
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;
}
result.add(sir);
return result;
}