commit 63f32fcbf100dd3d6a39fe8d99521e18011a4eef
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 18 17:30:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 18 17:30:47 2017 +0000
tree ed30094abebf92286f9a518ac23b6ca26dd583cf
parent 528f3bfeec287bb410daa50f5e61c1b97a3025b0
parent aee173142f226c294ed099eae01c61352a2ce073

Merge "Fix a bug: applied wrong layout for advanecd button flag"

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();