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

Merge "Reworks lock screen flows." into nyc-dev

Browse Source
This commit is contained in:
Udam Saini
2016-02-10 17:54:58 +00:00
committed by Android (Google) Code Review
parent 51d56dc14e 8ef4c62003
commit 779fdcca29
17 changed files with 538 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
res/xml/fingerprint_enroll_introduction_items.xml Normal file
View File

@@ -0,0 +1,40 @@
<?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.
-->
<ItemGroup xmlns:android="http://schemas.android.com/apk/res/android">
<Item
android:enabled="false"
android:layout="@layout/suw_items_description"
android:title="@string/security_settings_fingerprint_enroll_introduction_message" />
<Item
android:enabled="false"
android:id="@+id/fingerprint_introduction_message_warning"
android:layout="@layout/suw_items_description" />
<Item
android:id="@+id/next_button"
android:icon="@drawable/ic_fingerprint_list_icon"
android:title="@string/security_settings_fingerprint_enroll_introduction_continue" />
<Item
android:id="@+id/cancel_button"
android:icon="@drawable/ic_skip"
android:title="@string/security_settings_fingerprint_enroll_introduction_cancel" />
</ItemGroup>

52
res/xml/setup_security_settings_picker.xml Normal file
View File

@@ -0,0 +1,52 @@
<?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:title="@string/lock_settings_picker_title"
android:key="lock_settings_picker">
<com.android.settingslib.RestrictedPreference
android:key="unlock_set_off"
android:title="@string/unlock_set_unlock_off_title"
android:persistent="false"/>
<com.android.settingslib.RestrictedPreference
android:key="unlock_set_none"
android:title="@string/unlock_set_unlock_none_title"
android:persistent="false"/>
<com.android.settingslib.RestrictedPreference
android:key="unlock_set_pattern"
android:title="@string/unlock_set_unlock_pattern_title"
android:persistent="false"/>
<com.android.settingslib.RestrictedPreference
android:key="unlock_set_pin"
android:title="@string/unlock_set_unlock_pin_title"
android:persistent="false"/>
<com.android.settingslib.RestrictedPreference
android:key="unlock_set_password"
android:title="@string/unlock_set_unlock_password_title"
android:persistent="false"/>
<com.android.settingslib.RestrictedPreference
android:key="unlock_set_do_later"
android:title="@string/unlock_set_do_later_title"
android:persistent="false"/>
</PreferenceScreen>