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

2017-10-18 17:30:47 +00:00
parent 528f3bfeec aee173142f
commit 63f32fcbf1
1 changed files with 2 additions and 2 deletions
--- 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();