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

Commit 9c299734 authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "Move Profile Security Settings into Security Settings" into nyc-dev

parents 712568cd 52681ece

res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -988,6 +988,9 @@ 
    <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->

    <string name="lock_settings_picker_title">Choose screen lock</string>









    <!--  Title for security picker to choose the profile unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->









    <string name="lock_settings_picker_title_profile">Choose profile screen lock</string>

















    <!--  Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->









    <string name="setup_lock_settings_picker_title">Protect your phone</string>
















@@ -1008,6 +1011,10 @@







    <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->









    <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>

















    <!--  Profile Security lock settings --><skip />









    <!--  Title for PreferenceScreen to launch picker for security method for the managed profile when there is none [CHAR LIMIT=22] -->









    <string name="unlock_set_unlock_launch_picker_title_profile">Profile screen lock</string>

















    <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->









    <string name="unlock_set_unlock_launch_picker_change_title">Change lock screen</string>
















@@ -3120,6 +3127,8 @@







    <string name="lockpattern_settings_enable_summary">Must draw pattern to unlock screen</string>









    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->









    <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>









    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the profile unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the profile.-->









    <string name="lockpattern_settings_enable_visible_pattern_title_profile">Make profile pattern visible</string>









    <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->









    <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on tap</string>









    <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->








@@ -5739,6 +5748,7 @@







    <string name="keywords_color_temperature">color temperature D65 D73 white yellow blue warm cool</string>









    <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>









    <string name="keywords_profile_challenge">work challenge, work, profile</string>









    <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>

















    <!-- NFC Wi-Fi pairing/setup strings-->








































res/xml/security_settings_lockscreen_profile.xml
0 → 100644



+28
−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/security_settings_title">



















    <PreferenceScreen









        android:key="unlock_set_or_change_profile"









        android:title="@string/unlock_set_unlock_launch_picker_title_profile"









        android:summary="@string/unlock_set_unlock_mode_off"









        settings:keywords="@string/keywords_lockscreen"









        android:persistent="false"/>



















</PreferenceScreen>
























res/xml/security_settings_password_profile.xml
0 → 100644



+28
−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/security_settings_title">



















    <PreferenceScreen









        android:key="unlock_set_or_change_profile"









        android:title="@string/unlock_set_unlock_launch_picker_title_profile"









        android:summary="@string/unlock_set_unlock_mode_password"









        settings:keywords="@string/keywords_lockscreen"









        android:persistent="false"/>



















</PreferenceScreen>
























res/xml/security_settings_pattern_profile.xml
0 → 100644



+32
−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/security_settings_title">



















    <PreferenceScreen









        android:key="unlock_set_or_change_profile"









        android:title="@string/unlock_set_unlock_launch_picker_title_profile"









        android:summary="@string/unlock_set_unlock_mode_pattern"









        settings:keywords="@string/keywords_lockscreen"









        android:persistent="false"/>



















    <SwitchPreference









        android:key="visiblepattern_profile"









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



















</PreferenceScreen>
























res/xml/security_settings_pin_profile.xml
0 → 100644



+28
−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/security_settings_title">



















    <PreferenceScreen









        android:key="unlock_set_or_change_profile"









        android:title="@string/unlock_set_unlock_launch_picker_title_profile"









        android:summary="@string/unlock_set_unlock_mode_pin"









        settings:keywords="@string/keywords_lockscreen"









        android:persistent="false"/>



















</PreferenceScreen>