Merge "Instantiate pref controllers from xml if it's defined."

This commit is contained in:
TreeHugger Robot
2018-02-24 00:13:45 +00:00
committed by Android (Google) Code Review
28 changed files with 496 additions and 267 deletions

View File

@@ -119,15 +119,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@Override
public List<String> getNonIndexableKeys(Context context) {
return new ArrayList<>();
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(
Context context) {
//TODO(b/69333961): update the index for controllers
return super.getPreferenceControllers(context);
}
};
}