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

Commit d9f5d1ca authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Convert SecuritySubSetting into DashboardFragment"

parents 4b6d4211 a681094e

res/xml/security_settings_pattern_sub.xml→res/xml/screen_lock_settings.xml

+20 −16
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2016 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

  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:key="security_settings_pattern_sub_screen"

    android:title="@string/settings_label">

    android:key="security_settings_password_sub_screen"

    android:title="@string/security_settings_title">



    <!-- available in pattern -->

    <SwitchPreference

        android:key="visiblepattern"

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



    <!-- available in pin/pattern/password -->

    <com.android.settings.TimeoutListPreference

        android:key="lock_after_timeout"

        android:title="@string/lock_after_timeout"
@@ -31,10 +33,12 @@ 
        android:entries="@array/lock_after_timeout_entries"

        android:entryValues="@array/lock_after_timeout_values" />



    <!-- available in pin/pattern/password -->

    <SwitchPreference

        android:key="power_button_instantly_locks"

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



    <!-- available in pin/pattern/password/slide -->

    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

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

res/xml/security_settings_password_sub.xml

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

<!--

  ~ Copyright (C) 2016 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:key="security_settings_password_sub_screen"

    android:title="@string/settings_label">



    <com.android.settings.TimeoutListPreference

        android:key="lock_after_timeout"

        android:title="@string/lock_after_timeout"

        android:summary="@string/summary_placeholder"

        android:entries="@array/lock_after_timeout_entries"

        android:entryValues="@array/lock_after_timeout_values" />



    <SwitchPreference

        android:key="power_button_instantly_locks"

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



    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

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



</PreferenceScreen>

res/xml/security_settings_pin_sub.xml

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

<!--

  ~ Copyright (C) 2016 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:key="security_settings_pin_sub_screen"

    android:title="@string/settings_label">



    <com.android.settings.TimeoutListPreference

        android:key="lock_after_timeout"

        android:title="@string/lock_after_timeout"

        android:summary="@string/summary_placeholder"

        android:entries="@array/lock_after_timeout_entries"

        android:entryValues="@array/lock_after_timeout_values" />



    <SwitchPreference

        android:key="power_button_instantly_locks"

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



    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

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



</PreferenceScreen>

res/xml/security_settings_slide_sub.xml

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

<!--

  ~ Copyright (C) 2016 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:key="security_settings_slide_sub_screen"

    android:title="@string/settings_label">



    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

        android:title="@string/owner_info_settings_title"

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



</PreferenceScreen>

src/com/android/settings/password/ManagedLockPasswordProvider.java

+0 −9
Original line number Diff line number Diff line
@@ -65,15 +65,6 @@ public class ManagedLockPasswordProvider { 
                : R.xml.security_settings_password;

    }



    /**

     * Gets resource id of the subscreen that should be shown after clicking gear icon for lock

     * screen preference in security settings if the current password quality is set to

     * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.

     */

    public int getResIdForLockUnlockSubScreen() {

        return R.xml.security_settings_password_sub;

    }



    /**

     * Creates intent that should be launched when user chooses managed password in the lock

     * settings picker.