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

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

Merge "Add page Settings->Security & lock screen->Lock screen preferences."

parents f7e9d463 93582995

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -744,6 +744,10 @@ 
    <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>

    <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->

    <string name="lockscreen_settings_title">Lock screen preferences</string>

    <!-- Security Settings screen setting option summary for the item to take you to the lock screen preference screen -->

    <string name="lockscreen_settings_summary">Access settings in lock screen</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>
































res/xml/security_lockscreen_settings.xml
0 → 100644



+35
−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/lockscreen_settings_title">



















        <com.android.settings.notification.RestrictedDropDownPreference









            android:key="lock_screen_notifications"









            android:title="@string/lock_screen_notifications_title"









            android:summary="%s"/>



















        <com.android.settingslib.RestrictedSwitchPreference









            android:key="add_users_when_locked"









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



















        <com.android.settingslib.RestrictedPreference









            android:key="owner_info_settings"









            android:title="@string/owner_info_settings_title"









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



















</PreferenceScreen>
























res/xml/security_settings_chooser.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -29,6 +29,11 @@







            settings:keywords="@string/keywords_lockscreen"









            android:persistent="false"/>



















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









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



















    </PreferenceCategory>



















</PreferenceScreen>
























res/xml/security_settings_password.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,11 @@







            android:summary="@string/unlock_set_unlock_mode_password"









            settings:keywords="@string/keywords_lockscreen" />



















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









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



















    </PreferenceCategory>



















</PreferenceScreen>
























res/xml/security_settings_pattern.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,11 @@







            android:summary="@string/unlock_set_unlock_mode_pattern"









            settings:keywords="@string/keywords_lockscreen" />



















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









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



















    </PreferenceCategory>



















</PreferenceScreen>