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

Let fragment and indexProvider share prefControllers

Browse Source 
Bug: 35812240
Test: make RunSettingsRoboTests
Change-Id: Ifd96f935836a52e0a56f170f3cdf9b9ddf7c499a
This commit is contained in:
Fan Zhang
2017-02-28 10:52:46 -08:00
parent 6c146f2ab5
commit b00811da64
17 changed files with 265 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

@@ -184,16 +184,19 @@ public class StorageDashboardFragment extends DashboardFragment
}
@Override
public List<String> getNonIndexableKeys(Context context) {
if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
.isEnabled()) {
return null;
}
final ManageStoragePreferenceController controller =
new ManageStoragePreferenceController(context);
final List<String> keys = new ArrayList<>();
controller.updateNonIndexableKeys(keys);
return keys;
public List<PreferenceController> getPreferenceControllers(Context context) {
final StorageManager sm = context.getSystemService(StorageManager.class);
final UserManagerWrapper userManager =
new UserManagerWrapperImpl(context.getSystemService(UserManager.class));
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new StorageSummaryDonutPreferenceController(context));
controllers.add(new StorageItemPreferenceController(context, null /* host */,
null /* volume */, new StorageManagerVolumeProvider(sm)));
controllers.addAll(SecondaryUserController.getSecondaryUserControllers(
context, userManager));
controllers.add(new ManageStoragePreferenceController(context));
return controllers;
}
};
}