commit aee173142f226c294ed099eae01c61352a2ce073
author Fan Zhang <zhfan@google.com> Tue Oct 17 14:49:04 2017 -0700
committer Fan Zhang <zhfan@google.com> Tue Oct 17 14:49:04 2017 -0700
tree d8417a5253f2573f664be894d481a8f18112f720
parent 24ff765731b2fda6c8ea7ea3f2648849402f4e4d

Fix a bug: applied wrong layout for advanecd button flag

Change-Id: I5a44bb5e910bc73e46087820e5ccf76e220fa834
Fixes: 3076430
Test: robotests

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 287498f..822a60d 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -277,9 +277,9 @@
             root.removeAll();
         }
         if (ProgressiveDisclosureMixin.isV2Enabled()) {
-            addPreferencesFromResource(R.xml.security_settings);
-        } else {
             addPreferencesFromResource(R.xml.security_settings_advanced_button);
+        } else {
+            addPreferencesFromResource(R.xml.security_settings);
         }
         root = getPreferenceScreen();