Merge "Remove security settings v1 code"

This commit is contained in:
TreeHugger Robot
2018-01-29 23:25:09 +00:00
committed by Android (Google) Code Review
41 changed files with 198 additions and 2291 deletions

View File

@@ -66,7 +66,7 @@ public class SecuritySettingsLaunchTest {
public void launchSecuritySettings() throws Exception {
// Launch Settings
SettingsHelper.launchSettingsPage(
InstrumentationRegistry.getContext(), Settings.ACTION_SECURITY_SETTINGS);
InstrumentationRegistry.getTargetContext(), Settings.ACTION_SECURITY_SETTINGS);
mHelper.scrollVert(false);
for (String category : CATEGORIES) {
SettingsTestUtils.assertTitleMatch(mDevice, category);