am e8d8af2b: Merge "Update fingerprint settings to spec" into mnc-dev
* commit 'e8d8af2b464df3815d1a02c370cf44a80cafd8e3': Update fingerprint settings to spec
This commit is contained in:
Jorim Jaggi
Android Git Automerger
24
res/drawable/ic_add_24dp.xml
Normal file
24
res/drawable/ic_add_24dp.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<!--
|
||||
~ Copyright (C) 2015 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
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24.0dp"
|
||||
android:height="24.0dp"
|
||||
android:viewportWidth="48.0"
|
||||
android:viewportHeight="48.0">
|
||||
<path
|
||||
android:fillColor="?android:attr/colorAccent"
|
||||
android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z"/>
|
||||
</vector>
|
||||
27
res/layout/fingerprint_settings_footer.xml
Normal file
27
res/layout/fingerprint_settings_footer.xml
Normal file
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2015 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
|
||||
-->
|
||||
<TextView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
style="@android:style/TextAppearance.Material.Body1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:paddingTop="32dp"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:selectable="false">
|
||||
</TextView>
|
||||
@@ -740,7 +740,7 @@
|
||||
<!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
|
||||
<string name="fingerprint_usage_category_title">Use fingerprint for</string>
|
||||
<!-- Preference to add another fingerprint -->
|
||||
<string name="fingerprint_add_title">Add</string>
|
||||
<string name="fingerprint_add_title">Add fingerprint</string>
|
||||
<!-- switch for allowing fingerprint to be used for keyguard -->
|
||||
<string name="fingerprint_enable_keyguard_toggle_title">screen lock</string>
|
||||
<!-- message shown for menu item that launches fingerprint settings or enrollment -->
|
||||
@@ -752,7 +752,7 @@
|
||||
<string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
|
||||
<!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
|
||||
alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:</string>
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, you\'ll need to:</string>
|
||||
<!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
|
||||
the user needs to do. -->
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message_1">Setup your backup screen lock method</string>
|
||||
@@ -796,6 +796,10 @@
|
||||
<string name="fingerprint_enroll_button_add">Add another</string>
|
||||
<!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
|
||||
<string name="fingerprint_enroll_button_next">Next</string>
|
||||
<!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
|
||||
<string name="security_settings_fingerprint_enroll_disclaimer">In addition to unlocking your phone, you can also use your fingerprint to authorize purchases and app access. <annotation id="url">Learn more</annotation></string>
|
||||
<!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
|
||||
<string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled">Screen lock option disabled. You can still use your fingerprint to authorize purchases and app access. <annotation id="url">Learn more</annotation></string>
|
||||
|
||||
<!-- Title of the preferences category for preference items to control encryption -->
|
||||
<string name="crypt_keeper_settings_title">Encryption</string>
|
||||
@@ -5625,6 +5629,8 @@
|
||||
<string name="help_url_nfc_payment" translatable="false"></string>
|
||||
<!-- Help URL, Remote display [DO NOT TRANSLATE] -->
|
||||
<string name="help_url_remote_display" translatable="false"></string>
|
||||
<!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
|
||||
<string name="help_url_fingerprint" translatable="false"></string>
|
||||
|
||||
<!-- User account title [CHAR LIMIT=30] -->
|
||||
<string name="user_account_title">Account for content</string>
|
||||
|
||||
@@ -14,25 +14,7 @@
|
||||
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_fingerprint_preference_title">
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="fingerprint_manage_category"
|
||||
android:title="@string/fingerprint_manage_category_title">
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="fingerprint_usage_category"
|
||||
android:title="@string/fingerprint_usage_category_title">
|
||||
|
||||
<SwitchPreference
|
||||
android:key="fingerprint_enable_keyguard_toggle"
|
||||
android:title="@string/fingerprint_enable_keyguard_toggle_title"
|
||||
android:persistent="false" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/security_settings_fingerprint_preference_title"/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user