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

Commit 7b5c19ae authored by Adnan's avatar Adnan Committed by Adnan Begovic
Browse files

Settings: For the sake of search, don't split security settings. 

    - There's also no good reason for having separate xml's for these.

Change-Id: I0216a2be10b801769eef7783f6c52a2b18b06aef
parent 06013278

res/xml/security_settings.xml

+105 −0
Original line number Diff line number Diff line
@@ -16,6 +16,111 @@ 


<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">



    <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

            android:title="@string/owner_info_settings_title"

            android:summary="@string/owner_info_settings_summary"/>



    <PreferenceCategory

            android:key="app_security"

            android:title="@string/app_security_title">



        <ListPreference

                android:key="sms_security_check_limit"

                android:dialogTitle="@string/sms_security_check_limit_title"

                android:title="@string/sms_security_check_limit_title"

                android:entries="@array/sms_security_check_limit_entries"

                android:entryValues="@array/sms_security_check_limit_values"

                android:defaultValue="30" />



    </PreferenceCategory>



    <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"

                    android:persistent="false">

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

                    android:targetPackage="com.android.settings"

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

        </Preference>

    </PreferenceCategory>



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

                        android:persistent="false">



        <CheckBoxPreference android:key="show_password"

                            android:title="@string/show_password"

                            android:persistent="false"/>

    </PreferenceCategory>



    <PreferenceCategory android:key="device_admin_category"

                        android:title="@string/device_admin_title"

                        android:persistent="false">



        <Preference android:title="@string/manage_device_admin"

                    android:summary="@string/manage_device_admin_summary"

                    android:persistent="false"

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



        <CheckBoxPreference

                android:key="toggle_install_applications"

                android:title="@string/install_applications"

                android:summaryOff="@string/install_unknown_applications"

                android:summaryOn="@string/install_unknown_applications"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="toggle_verify_applications"

                android:title="@string/verify_applications"

                android:summaryOff="@string/verify_applications_summary"

                android:summaryOn="@string/verify_applications_summary"

                android:persistent="false" />



        <Preference

                android:key="manage_notification_access"

                android:title="@string/manage_notification_access"

                android:persistent="false"

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



    </PreferenceCategory>



    <PreferenceCategory android:key="credentials_management"

                        android:title="@string/credentials_title"

                        android:persistent="false">

        <Preference settings:excludeFromSearch="true"

                    android:key="credential_storage_type"

                    android:title="@string/credential_storage_type"

                    style="?android:attr/preferenceInformationStyle"

                    android:persistent="false" />



        <Preference android:title="@string/trusted_credentials"

                    android:summary="@string/trusted_credentials_summary"

                    android:persistent="false"

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



        <Preference 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"/>

        </Preference>



        <Preference android:key="reset_credentials"

                    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"/>

        </Preference>

    </PreferenceCategory>

</PreferenceScreen>

res/xml/security_settings_app_cyanogenmod.xml

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The CyanogenMod 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">



    <PreferenceCategory

        android:key="app_security"

        android:title="@string/app_security_title">



        <ListPreference

            android:key="sms_security_check_limit"

            android:dialogTitle="@string/sms_security_check_limit_title"

            android:title="@string/sms_security_check_limit_title"

            android:entries="@array/sms_security_check_limit_entries"

            android:entryValues="@array/sms_security_check_limit_values"

            android:defaultValue="30" />



    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_misc.xml

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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">



    <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"

                android:persistent="false">

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

                     android:targetPackage="com.android.settings"

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

        </Preference>

    </PreferenceCategory>



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

            android:persistent="false">



        <CheckBoxPreference android:key="show_password"

                android:title="@string/show_password"

                android:persistent="false"/>

    </PreferenceCategory>



    <PreferenceCategory android:key="device_admin_category"

            android:title="@string/device_admin_title"

            android:persistent="false">



        <Preference android:title="@string/manage_device_admin"

                android:summary="@string/manage_device_admin_summary"

                android:persistent="false"

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



        <CheckBoxPreference

                android:key="toggle_install_applications"

                android:title="@string/install_applications"

                android:summaryOff="@string/install_unknown_applications"

                android:summaryOn="@string/install_unknown_applications"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="toggle_verify_applications"

                android:title="@string/verify_applications"

                android:summaryOff="@string/verify_applications_summary"

                android:summaryOn="@string/verify_applications_summary"

                android:persistent="false" />



        <Preference

                android:key="manage_notification_access"

                android:title="@string/manage_notification_access"

                android:persistent="false"

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



    </PreferenceCategory>



    <PreferenceCategory android:key="credentials_management"

            android:title="@string/credentials_title"

            android:persistent="false">

        <Preference android:key="credential_storage_type"

                android:title="@string/credential_storage_type"

                style="?android:attr/preferenceInformationStyle"

                android:persistent="false" />



        <Preference android:title="@string/trusted_credentials"

                android:summary="@string/trusted_credentials_summary"

                android:persistent="false"

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



        <Preference 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"/>

        </Preference>



        <Preference android:key="reset_credentials"

                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"/>

        </Preference>

    </PreferenceCategory>

</PreferenceScreen>

res/xml/security_settings_owner.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 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">



        <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

            android:title="@string/owner_info_settings_title"

            android:summary="@string/owner_info_settings_summary"/>



</PreferenceScreen>

src/com/android/settings/SecuritySettings.java

+0 −6
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ public class SecuritySettings extends RestrictedSettingsFragment 
        if (root != null) {

            root.removeAll();

        }

        addPreferencesFromResource(R.xml.security_settings_owner);

        addPreferencesFromResource(R.xml.security_settings);

        root = getPreferenceScreen();
@@ -152,9 +151,6 @@ public class SecuritySettings extends RestrictedSettingsFragment 
            }

        }



        // Append the rest of the settings

        // App security settings

        addPreferencesFromResource(R.xml.security_settings_app_cyanogenmod);

        mSmsSecurityCheck = (ListPreference) root.findPreference(KEY_SMS_SECURITY_CHECK_PREF);

        // Determine options based on device telephony support

        if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
@@ -170,8 +166,6 @@ public class SecuritySettings extends RestrictedSettingsFragment 
            root.removePreference(appCategory);

        }



        addPreferencesFromResource(R.xml.security_settings_misc);



        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

            MSimTelephonyManager tm = MSimTelephonyManager.getDefault();

            int numPhones = MSimTelephonyManager.getDefault().getPhoneCount();