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

Commit 75c2ca96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove security settings v1 code"

parents f92b2773 73dc479a

AndroidManifest.xml

+4 −36
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$SecuritySettingsActivity"

        <activity android:name=".Settings$SecurityDashboardActivity"

                android:label="@string/security_settings_title"

                android:icon="@drawable/ic_homepage_security"

                android:configChanges="orientation|keyboardHidden|screenSize"
@@ -1306,28 +1306,6 @@ 
                android:value="true" />

        </activity>



        <!-- TODO(32953042) Merge with Settings$SecuritySettingsActivity -->

        <activity android:name="Settings$SecuritySettingsActivityV2"

                  android:label="@string/security_settings_title"

                  android:icon="@drawable/ic_homepage_security"

                  android:enabled="false"

                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:taskAffinity=""

                  android:parentActivityName="Settings">

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

                <action android:name="android.settings.SECURITY_SETTINGS" />

                <action android:name="android.credentials.UNLOCK" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

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

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

                       android:value="com.android.settings.security.SecuritySettingsV2" />

        </activity>



        <activity android:name="MonitoringCertInfoActivity"

                android:label=""

                android:theme="@style/Transparent"
@@ -1358,16 +1336,6 @@ 
                android:value="true" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="SecuritySettings"

                android:label="@string/security_settings_title"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:exported="true"

                android:targetActivity="Settings$SecuritySettingsActivity">

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

                android:value="com.android.settings.security.SecuritySettings" />

        </activity-alias>



        <activity android:name="Settings$PrivacySettingsActivity"

                android:label="@string/privacy_settings_title"

                android:icon="@drawable/ic_settings_backup"
@@ -1405,7 +1373,7 @@ 
        <activity android:name="Settings$DeviceAdminSettingsActivity"

                android:label="@string/device_admin_settings_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$SecuritySettingsActivity">

                android:parentActivityName=".Settings$SecurityDashboardActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -1436,7 +1404,7 @@ 
        <activity android:name="Settings$UsageAccessSettingsActivity"

                android:label="@string/usage_access_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$SecuritySettingsActivity">

                android:parentActivityName=".Settings$SecurityDashboardActivity">

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

                <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -1574,7 +1542,7 @@ 
        <activity android:name="Settings$EnterprisePrivacySettingsActivity"

                android:label="@string/enterprise_privacy_settings"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$SecuritySettingsActivity">

                android:parentActivityName=".Settings$SecurityDashboardActivity">

            <intent-filter>

                <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

res/xml/security_settings.xml

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

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

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

    android:key="security_dashboard_page"

    android:title="@string/security_settings_title"

    settings:initialExpandedChildrenCount="9">



</PreferenceScreen>

res/xml/security_settings_chooser.xml

deleted100644 → 0
+0 −39
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"

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

                  android:key="security_settings_chooser_screen"

                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="security_category"

        android:title="@string/lock_settings_title">



        <com.android.settings.widget.GearPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_none"

            settings:keywords="@string/keywords_lockscreen"

            android:persistent="false"/>



        <Preference android:key="lockscreen_preferences"

            android:title="@string/lockscreen_settings_title"

            android:fragment="com.android.settings.security.LockscreenDashboardFragment"/>



    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_lockscreen.xml

deleted100644 → 0
+0 −35
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"

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

                  android:key="security_settings_lockscreen_screen"

                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="security_category"

        android:title="@string/lock_settings_title">



        <com.android.settingslib.RestrictedPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_off"

            settings:keywords="@string/keywords_lockscreen"

            android:persistent="false"/>



    </PreferenceCategory>



</PreferenceScreen>