Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81610543 authored by Doris Ling's avatar Doris Ling
Browse files

Update Security & screen lock preference 

- change password category title to Privacy and move Location into it.
- remove Advanced security preference category
- remove SIM card preference category and move the SIM card lock
  preferece down.
- move Encryption and Credential settings to a separate screen.

Bug: 34976707
Test: make RunSettingsRoboTests
Change-Id: Iebaba4a8aad135fa88f163de0b60b488fd9510d0
parent d72b6cc1

AndroidManifest.xml

+0 −13
Original line number Diff line number Diff line
@@ -3153,19 +3153,6 @@ 
                       android:value="com.android.settings.category.ia.homepage"/>

        </activity>



        <activity-alias android:name="LocationDashboardAlias"

                        android:targetActivity="Settings$LocationSettingsActivity">

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.security" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.location.LocationSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity-alias>



        <activity-alias android:name="AccessibilityDashboardAlias"

                        android:targetActivity="Settings$AccessibilitySettingsActivity">

            <intent-filter android:priority="2">

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -744,13 +744,15 @@ 
    <string name="account_settings_title">Accounts</string>

    <!-- Main Settings screen setting option title for the item to take you to the security screen -->

    <string name="security_settings_title">Security &amp; screen lock</string>

    <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->

    <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>















    <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->















    <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>















    <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->















    <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>















    <!-- In the security screen, the header title for settings related to  Passwords-->













    <string name="security_passwords_title">Passwords</string>













    <string name="security_passwords_title">Privacy</string>















    <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->















    <string name="disabled_by_administrator_summary">Disabled by administrator</string>















    <!-- In the security screen, the header title for security statuses -->

































res/xml/encryption_and_credential.xml
0 → 100644



+65
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2017 The Android Open Source Project



























     Licensed under the Apache License, Version 2.0 (the "License");













     you may not use this file except in compliance with the License.













     You may obtain a copy of the License at



























          http://www.apache.org/licenses/LICENSE-2.0



























     Unless required by applicable law or agreed to in writing, software













     distributed under the License is distributed on an "AS IS" BASIS,













     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













     See the License for the specific language governing permissions and













     limitations under the License.













-->



























<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"













        android:title="@string/encryption_and_credential_settings_title">



























    <PreferenceCategory android:key="credentials_management"













            android:title="@string/credentials_title"













            android:persistent="false"













            android:order="100">



























        <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"













                android:title="@string/credential_storage_type"













                android:persistent="false" />



























        <Preference android:key="trusted_credentials"













                android:title="@string/trusted_credentials"













                android:summary="@string/trusted_credentials_summary"













                android:persistent="false"













                android:fragment="com.android.settings.TrustedCredentialsSettings"/>



























        <com.android.settingslib.RestrictedPreference android:key="user_credentials"













                android:title="@string/user_credentials"













                android:summary="@string/user_credentials_summary"













                android:persistent="false"













                android:fragment="com.android.settings.UserCredentialsSettings"/>



























        <com.android.settingslib.RestrictedPreference android:key="credentials_install"













                android:title="@string/credentials_install"













                android:summary="@string/credentials_install_summary"













                android:persistent="false">



























            <intent android:action="android.credentials.INSTALL"













                    android:targetPackage="com.android.certinstaller"













                    android:targetClass="com.android.certinstaller.CertInstallerMain"/>



























        </com.android.settingslib.RestrictedPreference>



























        <com.android.settingslib.RestrictedPreference android:key="credentials_reset"













                android:title="@string/credentials_reset"













                android:summary="@string/credentials_reset_summary"













                android:persistent="false">



























            <intent android:action="com.android.credentials.RESET"













                    android:targetPackage="com.android.settings"













                    android:targetClass="com.android.settings.CredentialStorage"/>



























        </com.android.settingslib.RestrictedPreference>



























    </PreferenceCategory>



























</PreferenceScreen>
























res/xml/security_settings_misc.xml



+39
−85




























Original line number
Diff line number
Diff line








@@ -15,28 +15,17 @@













-->































<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"













        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"















        android:title="@string/security_settings_title">





























    <PreferenceCategory android:key="sim_lock"













            android:title="@string/sim_lock_settings_title"













            android:persistent="false">



























        <Preference android:key="sim_lock_settings"













                android:title="@string/sim_lock_settings_category"













    <PreferenceCategory android:title="@string/security_passwords_title"















            android:persistent="false">





























            <intent android:action="android.intent.action.MAIN"













                    android:targetPackage="com.android.settings"













                    android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>



























        <Preference













            android:key="location"













            android:title="@string/location_settings_title">













            <intent android:action="android.settings.LOCATION_SOURCE_SETTINGS"/>















        </Preference>





























    </PreferenceCategory>



























    <PreferenceCategory android:title="@string/security_passwords_title"













            android:persistent="false">





























        <SwitchPreference android:key="show_password"















                android:title="@string/show_password"/>

























@@ -54,53 +43,20 @@





























    </PreferenceCategory>





























    <PreferenceCategory android:key="credentials_management"













            android:title="@string/credentials_title"













            android:persistent="false">



























        <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"













                android:title="@string/credential_storage_type"













                android:persistent="false" />



























        <Preference android:key="trusted_credentials"













                android:title="@string/trusted_credentials"













                android:summary="@string/trusted_credentials_summary"













                android:persistent="false"













                android:fragment="com.android.settings.TrustedCredentialsSettings"/>



























        <com.android.settingslib.RestrictedPreference android:key="user_credentials"













                android:title="@string/user_credentials"













                android:summary="@string/user_credentials_summary"













                android:persistent="false"













                android:fragment="com.android.settings.UserCredentialsSettings"/>



























        <com.android.settingslib.RestrictedPreference android:key="credentials_install"













                android:title="@string/credentials_install"













                android:summary="@string/credentials_install_summary"













                android:persistent="false">



























            <intent android:action="android.credentials.INSTALL"













                    android:targetPackage="com.android.certinstaller"













                    android:targetClass="com.android.certinstaller.CertInstallerMain"/>



























        </com.android.settingslib.RestrictedPreference>



























        <com.android.settingslib.RestrictedPreference android:key="credentials_reset"













                android:title="@string/credentials_reset"













                android:summary="@string/credentials_reset_summary"













    <Preference android:key="sim_lock_settings"













        android:title="@string/sim_lock_settings_category"















        android:persistent="false">





























            <intent android:action="com.android.credentials.RESET"













        <intent android:action="android.intent.action.MAIN"















            android:targetPackage="com.android.settings"













                    android:targetClass="com.android.settings.CredentialStorage"/>



























        </com.android.settingslib.RestrictedPreference>













            android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>





























    </PreferenceCategory>













    </Preference>





























    <PreferenceCategory android:key="advanced_security"













            android:title="@string/advanced_security_title"













            android:persistent="false">













    <Preference













        android:key="encryption_and_credential"













        android:title="@string/encryption_and_credential_settings_title"













        android:fragment="com.android.settings.EncryptionAndCredential"/>































    <Preference android:key="manage_trust_agents"















        android:title="@string/manage_trust_agents"









@@ -122,6 +78,4 @@













            android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />















    </Preference>





























    </PreferenceCategory>





























</PreferenceScreen>
























src/com/android/settings/EncryptionAndCredential.java
0 → 100644



+268
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2007 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package com.android.settings;



























import android.app.Activity;













import android.app.admin.DevicePolicyManager;













import android.content.Context;













import android.content.Intent;













import android.content.res.Resources;













import android.os.Bundle;













import android.os.UserHandle;













import android.os.UserManager;













import android.provider.SearchIndexableResource;













import android.security.KeyStore;













import android.support.v7.preference.PreferenceGroup;













import android.support.v7.preference.PreferenceScreen;



























import com.android.internal.logging.nano.MetricsProto.MetricsEvent;













import com.android.internal.widget.LockPatternUtils;













import com.android.settings.dashboard.DashboardFragment;













import com.android.settings.search.BaseSearchIndexProvider;













import com.android.settings.search.Indexable;













import com.android.settings.search.SearchIndexableRaw;













import com.android.settingslib.RestrictedLockUtils;













import com.android.settingslib.RestrictedPreference;



























import java.util.ArrayList;













import java.util.List;



























/**













 * Encryption and Credential settings.













 * TODO: Extends this from {@link DashboardFragment} instead













 */













public class EncryptionAndCredential extends SettingsPreferenceFragment implements Indexable {



























    private static final String TAG = "EncryptionAndCredential";



























    // Misc Settings













    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";













    private static final String KEY_USER_CREDENTIALS = "user_credentials";













    private static final String KEY_RESET_CREDENTIALS = "credentials_reset";













    private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";













    private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";



























    private static final int MY_USER_ID = UserHandle.myUserId();



























    private UserManager mUm;



























    private KeyStore mKeyStore;













    private RestrictedPreference mResetCredentials;



























    private boolean mIsAdmin;



























    @Override













    public int getMetricsCategory() {













        return MetricsEvent.SECURITY;













    }



























    @Override













    public void onCreate(Bundle savedInstanceState) {













        super.onCreate(savedInstanceState);



























        final Activity activity = getActivity();



























        mUm = UserManager.get(activity);













    }



























    /**













     * Important!













     *













     * Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the













     * logic or adding/removing preferences here.













     */













    private PreferenceScreen createPreferenceHierarchy() {













        PreferenceScreen root = getPreferenceScreen();













        if (root != null) {













            root.removeAll();













        }













        addPreferencesFromResource(R.xml.encryption_and_credential);













        root = getPreferenceScreen();



























        // Add options for device encryption













        mIsAdmin = mUm.isAdminUser();



























        if (mIsAdmin) {













            if (LockPatternUtils.isDeviceEncryptionEnabled()) {













                // The device is currently encrypted.













                addPreferencesFromResource(R.xml.security_settings_encrypted);













            } else {













                // This device supports encryption but isn't encrypted.













                addPreferencesFromResource(R.xml.security_settings_unencrypted);













            }













        }









































        // Credential storage













        mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()



























        if (!RestrictedLockUtils.hasBaseUserRestriction(getActivity(),













                UserManager.DISALLOW_CONFIG_CREDENTIALS, MY_USER_ID)) {













            RestrictedPreference userCredentials = (RestrictedPreference) root.findPreference(













                    KEY_USER_CREDENTIALS);













            userCredentials.checkRestrictionAndSetDisabled(













                    UserManager.DISALLOW_CONFIG_CREDENTIALS);













            RestrictedPreference credentialStorageType = (RestrictedPreference) root.findPreference(













                    KEY_CREDENTIAL_STORAGE_TYPE);













            credentialStorageType.checkRestrictionAndSetDisabled(













                    UserManager.DISALLOW_CONFIG_CREDENTIALS);













            RestrictedPreference installCredentials = (RestrictedPreference) root.findPreference(













                    KEY_CREDENTIALS_INSTALL);













            installCredentials.checkRestrictionAndSetDisabled(













                    UserManager.DISALLOW_CONFIG_CREDENTIALS);













            mResetCredentials = (RestrictedPreference) root.findPreference(KEY_RESET_CREDENTIALS);













            mResetCredentials.checkRestrictionAndSetDisabled(













                    UserManager.DISALLOW_CONFIG_CREDENTIALS);



























            final int storageSummaryRes =













                    mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware













                            : R.string.credential_storage_type_software;













            credentialStorageType.setSummary(storageSummaryRes);













        } else {













            PreferenceGroup credentialsManager = (PreferenceGroup)













                    root.findPreference(KEY_CREDENTIALS_MANAGER);













            credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));













            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));













            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));













            credentialsManager.removePreference(root.findPreference(KEY_USER_CREDENTIALS));













        }



























        return root;













    }



























    @Override













    public void onResume() {













        super.onResume();



























        // Make sure we reload the preference hierarchy since some of these settings













        // depend on others...













        createPreferenceHierarchy();



























        if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) {













            mResetCredentials.setEnabled(!mKeyStore.isEmpty());













        }













    }



























    /**













     * see confirmPatternThenDisableAndClear













     */













    @Override













    public void onActivityResult(int requestCode, int resultCode, Intent data) {













        super.onActivityResult(requestCode, resultCode, data);













        createPreferenceHierarchy();













    }



























    @Override













    protected int getHelpResource() {













        return R.string.help_url_security;













    }



























    /**













     * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"













     */













    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =













            new SecuritySearchIndexProvider();



























    private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {



























        @Override













        public List<SearchIndexableResource> getXmlResourcesToIndex(













                Context context, boolean enabled) {













            final List<SearchIndexableResource> index = new ArrayList<SearchIndexableResource>();



























            final DevicePolicyManager dpm = (DevicePolicyManager)













                    context.getSystemService(Context.DEVICE_POLICY_SERVICE);













            final UserManager um = UserManager.get(context);



























            if (um.isAdminUser()) {













                switch (dpm.getStorageEncryptionStatus()) {













                    case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:













                        // The device is currently encrypted.













                        index.add(getSearchResource(context, R.xml.security_settings_encrypted));













                        break;













                    case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:













                        // This device supports encryption but isn't encrypted.













                        index.add(getSearchResource(context, R.xml.security_settings_unencrypted));













                        break;













                }













            }



























            return index;













        }



























        private SearchIndexableResource getSearchResource(Context context, int xmlResId) {













            final SearchIndexableResource sir = new SearchIndexableResource(context);













            sir.xmlResId = xmlResId;













            return sir;













        }



























        @Override













        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {













            final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();













            final Resources res = context.getResources();



























            final String screenTitle = res.getString(













                R.string.encryption_and_credential_settings_title);



























            SearchIndexableRaw data = new SearchIndexableRaw(context);













            data.title = screenTitle;













            data.screenTitle = screenTitle;













            result.add(data);



























            final UserManager um = UserManager.get(context);













            if (!um.isAdminUser()) {













                int resId = um.isLinkedUser() ?













                        R.string.profile_info_settings_title : R.string.user_info_settings_title;



























                data = new SearchIndexableRaw(context);













                data.title = res.getString(resId);













                data.screenTitle = screenTitle;













                result.add(data);













            }



























            // Credential storage













            if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {













                KeyStore keyStore = KeyStore.getInstance();



























                final int storageSummaryRes = keyStore.isHardwareBacked() ?













                        R.string.credential_storage_type_hardware :













                        R.string.credential_storage_type_software;



























                data = new SearchIndexableRaw(context);













                data.title = res.getString(storageSummaryRes);













                data.screenTitle = screenTitle;













                result.add(data);













            }



























            return result;













        }



























        @Override













        public List<String> getNonIndexableKeys(Context context) {













            final List<String> keys = new ArrayList<String>();



























            final UserManager um = UserManager.get(context);



























            if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {













                keys.add(KEY_CREDENTIALS_MANAGER);













            }



























            return keys;













        }













    }



























}