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

Commit 62775bf7 authored by Adrian Roos's avatar Adrian Roos
Browse files

Move lock screen setting behind gear 

Bug: 19003093
Change-Id: I15baa5b1d19324521070d641ae6a227d782a4e9e
parent a7accd20

res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -7024,6 +7024,18 @@ 
    <!-- No default home set summary [CHAR LIMIT=NONE] -->

    <string name="no_default_home">No default Home</string>









    <!-- Title of the preference controlling whether the device encryption password/PIN/Pattern must be entered before being able to start the device. [CHAR LIMIT=60]-->









    <string name="lockpattern_settings_require_cred_before_startup">Secure start-up</string>

















    <!-- Summary of the preference controlling whether the device encryption *pattern* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->









    <string name="lockpattern_settings_require_pattern_before_startup_summary">Require pattern to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>

















    <!-- Summary of the preference controlling whether the device encryption *PIN* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->









    <string name="lockpattern_settings_require_pin_before_startup_summary">Require PIN to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>

















    <!-- Summary of the preference controlling whether the device encryption *password* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->









    <string name="lockpattern_settings_require_password_before_startup_summary">Require password to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>

















    <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=30] -->









    <string name="suggestion_additional_fingerprints">Additional Fingerprints</string>

































res/xml/security_settings_chooser.xml



+3
−6






























Original line number
Diff line number
Diff line







@@ -15,23 +15,20 @@







-->



















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









        android:title="@string/lock_settings_title">



















        <PreferenceScreen









        <com.android.settings.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"/>



















        <com.android.settings.SingleLineSummaryPreference









            android:key="owner_info_settings"









            android:title="@string/owner_info_settings_title"









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



















    </PreferenceCategory>



















</PreferenceScreen>
























res/xml/security_settings_lockscreen.xml



+0
−6






























Original line number
Diff line number
Diff line







@@ -29,12 +29,6 @@







            settings:keywords="@string/keywords_lockscreen"









            android:persistent="false"/>



















        <com.android.settings.SingleLineSummaryPreference









            android:key="owner_info_settings"









            android:enabled="false"









            android:title="@string/owner_info_settings_title"









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



















    </PreferenceCategory>



















</PreferenceScreen>
























res/xml/security_settings_password.xml



+1
−18






























Original line number
Diff line number
Diff line







@@ -22,30 +22,13 @@







        android:key="security_category"









        android:title="@string/lock_settings_title">



















        <PreferenceScreen









        <com.android.settings.GearPreference









            android:key="unlock_set_or_change"









            android:title="@string/unlock_set_unlock_launch_picker_title"









            android:summary="@string/unlock_set_unlock_mode_password"









            settings:keywords="@string/keywords_lockscreen"









            android:persistent="false"/>



















        <com.android.settings.RestrictedListPreference









            android:key="lock_after_timeout"









            android:title="@string/lock_after_timeout"









            android:summary="@string/lock_after_timeout_summary"









            android:entries="@array/lock_after_timeout_entries"









            android:entryValues="@array/lock_after_timeout_values"









            android:persistent="false"/>



















        <SwitchPreference









            android:key="power_button_instantly_locks"









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



















        <com.android.settings.SingleLineSummaryPreference









            android:key="owner_info_settings"









            android:title="@string/owner_info_settings_title"









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



















    </PreferenceCategory>



















</PreferenceScreen>
























res/xml/security_settings_password_sub.xml
0 → 100644



+45
−0






























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"









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









                  android:title="@string/settings_label">



















        <com.android.settings.RestrictedListPreference









                android:key="lock_after_timeout"









                android:title="@string/lock_after_timeout"









                android:summary="@string/lock_after_timeout_summary"









                android:entries="@array/lock_after_timeout_entries"









                android:entryValues="@array/lock_after_timeout_values"









                android:persistent="false"/>



















        <SwitchPreference









                android:key="power_button_instantly_locks"









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



















        <com.android.settings.SingleLineSummaryPreference









                android:key="owner_info_settings"









                android:title="@string/owner_info_settings_title"









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



















        <SwitchPreference









            android:key="require_cred_before_startup"









            android:title="@string/lockpattern_settings_require_cred_before_startup"









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





























</PreferenceScreen>