Convert the rest of encryption page into pref controller

Bug: 32953042 Test: robotests Change-Id: I6c1b28314a988e6499065ddaee2aeae0ac28c537
2017-11-02 14:09:34 -07:00
parent c58a88368f
commit b2aae6cd57
12 changed files with 465 additions and 118 deletions
--- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
@@ -34,7 +34,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;

@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
        shadows = {
                ShadowUserManager.class,
                ShadowLockPatternUtils.class