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

2018-02-24 00:13:45 +00:00
parent 158096d25d 917f101899
commit 8e6d5ad27e
28 changed files with 496 additions and 267 deletions
--- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
+++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
@@ -67,7 +67,7 @@ public class PreferenceControllerContractTest {
            }

            final List<AbstractPreferenceController> controllers =
-                    provider.getPreferenceControllers(mContext);
+                    provider.getAllPreferenceControllers(mContext);
            if (controllers == null) {
                continue;
            }