PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-23 20:05:33 +00:00
committed by Android (Google) Code Review
parent f7e9d46370 93582995da
commit 4433c8ce3d
13 changed files with 520 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -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>

35
res/xml/security_lockscreen_settings.xml Normal file
View File

@@ -0,0 +1,35 @@
<?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>

5
res/xml/security_settings_chooser.xml
View File

@@ -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>

5
res/xml/security_settings_password.xml
View File

@@ -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>

5
res/xml/security_settings_pattern.xml
View File

@@ -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>

5
res/xml/security_settings_pin.xml
View File

@@ -28,6 +28,11 @@
android:summary="@string/unlock_set_unlock_mode_pin"
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>