PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add advanced button to security & location page

Browse Source 
Change-Id: I45977105d6ddabef8f2d9bdc7b46959af9cbbf0f
Fixes: 36657221
Test: visual
This commit is contained in:
Fan Zhang
2017-10-16 17:16:53 -07:00
parent 7ad17d72ad
commit 069830012f
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SecuritySettings.java
View File

@@ -59,6 +59,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.ProgressiveDisclosureMixin;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;
import com.android.settings.enterprise.ManageDeviceAdminPreferenceController;
@@ -275,7 +276,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
if (root != null) {
root.removeAll();
}
addPreferencesFromResource(R.xml.security_settings);
if (ProgressiveDisclosureMixin.isV2Enabled()) {
addPreferencesFromResource(R.xml.security_settings);
} else {
addPreferencesFromResource(R.xml.security_settings_advanced_button);
}
root = getPreferenceScreen();
// Add category for security status