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

This commit is contained in:
TreeHugger Robot
2017-10-18 17:30:47 +00:00
committed by Android (Google) Code Review

View File

@@ -277,9 +277,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
root.removeAll(); root.removeAll();
} }
if (ProgressiveDisclosureMixin.isV2Enabled()) { if (ProgressiveDisclosureMixin.isV2Enabled()) {
addPreferencesFromResource(R.xml.security_settings);
} else {
addPreferencesFromResource(R.xml.security_settings_advanced_button); addPreferencesFromResource(R.xml.security_settings_advanced_button);
} else {
addPreferencesFromResource(R.xml.security_settings);
} }
root = getPreferenceScreen(); root = getPreferenceScreen();