diff options
author | d34d <clark@cyngn.com> | 2015-12-03 16:48:54 -0800 |
---|---|---|
committer | d34d <clark@cyngn.com> | 2015-12-03 16:53:37 -0800 |
commit | a2f4c5812e83812a94f9b608456a233d4c12019a (patch) | |
tree | b6326cb237d66c8927528681dfe3c59f52b4c394 /res | |
parent | 070fbeaf5d4f0a25282f64936a21b4ac7e5c469b (diff) | |
download | packages_apps_SetupWizard-a2f4c5812e83812a94f9b608456a233d4c12019a.zip packages_apps_SetupWizard-a2f4c5812e83812a94f9b608456a233d4c12019a.tar.gz packages_apps_SetupWizard-a2f4c5812e83812a94f9b608456a233d4c12019a.tar.bz2 |
Revert "Fingerprint: Use AOSP fingerprint setup"
This reverts commit 070fbeaf5d4f0a25282f64936a21b4ac7e5c469b.
We still need to show the fingerprint setup screen which allows
the user to skip setting up a fingerprint if they choose to do so.
Change-Id: Ifa49ad1ac0e5cf113290b973ac5e9cd8abdbed9a
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/setup_fingerprint.xml | 90 | ||||
-rw-r--r-- | res/values/strings.xml | 9 |
2 files changed, 99 insertions, 0 deletions
diff --git a/res/layout/setup_fingerprint.xml b/res/layout/setup_fingerprint.xml new file mode 100644 index 0000000..6af8519 --- /dev/null +++ b/res/layout/setup_fingerprint.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/header" /> + + <FrameLayout android:id="@+id/page" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + + <ScrollView android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/PageContent"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/PageSummaryText" + android:textSize="16sp" + android:paddingLeft="@dimen/content_margin_left" + android:layout_marginBottom="@dimen/summary_margin_bottom" + android:paddingRight="@dimen/location_text_margin_right" + android:text="@string/fingerprint_setup_summary" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="24dp" + android:paddingLeft="@dimen/content_margin_left" + android:paddingRight="@dimen/location_text_margin_right" + android:drawableStart="@drawable/ic_check_mark" + android:drawablePadding="24dp" + android:gravity="center_vertical" + android:textSize="16sp" + android:textStyle="bold" + android:text="@string/fingerprint_setup_backup_lock_method"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="24dp" + android:paddingLeft="@dimen/content_margin_left" + android:paddingRight="@dimen/location_text_margin_right" + android:drawableStart="@drawable/ic_check_mark" + android:drawablePadding="24dp" + android:gravity="center_vertical" + android:textSize="16sp" + android:textStyle="bold" + android:text="@string/fingerprint_setup_add_fingerprint"/> + + <TextView + android:id="@+id/setup_fingerprint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/content_margin_left" + android:paddingRight="@dimen/location_text_margin_right" + android:gravity="center_vertical" + android:textSize="16sp" + android:textAllCaps="true" + android:textColor="@color/fingerprint_setup_text_color" + android:text="@string/fingerprint_setup_screen_lock_setup"/> + + </LinearLayout> + </ScrollView> + </FrameLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 46984fb..5f1f183 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -84,4 +84,13 @@ <string name="setup_require_cyanogen_label"><b>Require your Cyanogen OS account password</b> in order to use your device even after a factory reset.</string> <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string> <string name="setup_warning_skip_anyway">Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost</string> + + <!-- Fingerprint setup --> + <string name="settings_fingerprint_setup_title">Select backup screen lock type</string> + <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string> + <string name="fingerprint_setup_title">Fingerprint setup</string> + <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string> + <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string> + <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string> + <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string> </resources> |