From aee173142f226c294ed099eae01c61352a2ce073 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 17 Oct 2017 14:49:04 -0700
Subject: [PATCH] Fix a bug: applied wrong layout for advanecd button flag

Change-Id: I5a44bb5e910bc73e46087820e5ccf76e220fa834
Fixes: 3076430
Test: robotests
---
 src/com/android/settings/SecuritySettings.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 287498faed4..822a60d1836 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -277,9 +277,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
             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();