summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-02-19 21:04:57 -0800
committerJim Miller <jaggies@google.com>2015-02-27 12:06:18 -0800
commit94d4bd9390b9b9003788a2e779e2b4b256d07c3b (patch)
tree71db90e4337f807ac836a3d7948b2d5856db4bf4 /res/layout-land
parent78fcb280b958dcce2ff06d27a5a52cbb89b10748 (diff)
downloadpackages_apps_Settings-94d4bd9390b9b9003788a2e779e2b4b256d07c3b.zip
packages_apps_Settings-94d4bd9390b9b9003788a2e779e2b4b256d07c3b.tar.gz
packages_apps_Settings-94d4bd9390b9b9003788a2e779e2b4b256d07c3b.tar.bz2
Add fingerprint settings.
- Improved layout. - Enrollment is now working. - Added vibration and progress feedback. - Better fingerprint animation logic. - Poke userActivity() when sensor is touched. - Added progress animation. - Only show fingerprint menu item on devices that have fingerprint hw - Set View state to GONE for views that aren't shown & fix resulting layout issue - Fix bug where stage wasn't advancing when returning from ChooseLockGeneric. - Renamed FingerprintSettings to FingerprintEnroll - Fixed bug with storing fingerprint ids that prevented the last one from being removed. - Added better progress indication. When remaining is at max, count that as the first step. - Fix whitespace formatting in CL Fixes bug 1953439 Change-Id: I721bf440c63640203af94ce21340d8281076c249
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/fingerprint_enroll.xml143
1 files changed, 143 insertions, 0 deletions
diff --git a/res/layout-land/fingerprint_enroll.xml b/res/layout-land/fingerprint_enroll.xml
new file mode 100644
index 0000000..8954d74
--- /dev/null
+++ b/res/layout-land/fingerprint_enroll.xml
@@ -0,0 +1,143 @@
+<?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.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical">
+
+ <!-- Left area -->
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="0dip"
+ android:layout_weight="0.4"
+ android:background="@color/fingerprint_title_area_bg"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/fingerprint_enroll_title"
+ android:background="@color/fingerprint_title_area_bg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="20dip"
+ android:layout_marginStart="40dip"
+ android:layout_marginEnd="40dip"
+ style="@style/TextAppearance.FingerprintTitle"
+ android:layout_alignParentBottom="true"/>
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/fingerprint_enroll_message"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="0.6"
+ android:layout_marginTop="24dip"
+ android:layout_marginStart="40dip"
+ android:layout_marginEnd="40dip"
+ android:layout_marginBottom="36dip"
+ style="@style/TextAppearance.FingerprintMessage"/>
+
+ </LinearLayout>
+
+ <!-- Right area -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:id="@+id/fingerprint_view_selector"
+ android:layout_width="wrap_content"
+ android:layout_height="0dip"
+ android:orientation="vertical"
+ android:layout_weight="1"
+ android:layout_gravity="center">
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/fingerprint_progress_ring_bg">
+
+ <!-- One of the following views will show for any given mode -->
+ <ProgressBar
+ android:id="@+id/fingerprint_progress_bar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="200dip"
+ android:layout_height="200dip"
+ android:max="100"
+ android:progress="0"
+ android:indeterminate="false"
+ android:progressDrawable="@drawable/fingerprint_progress_ring" />
+
+ <ImageView
+ android:id="@+id/fingerprint_sensor_location"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:src="@drawable/fingerprint_sensor_location"
+ android:visibility="gone"/>
+
+ <ImageView
+ android:id="@+id/fingerprint_animator"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:src="@drawable/fingerprint_animation"
+ android:visibility="visible" />
+
+ <ImageView
+ android:id="@+id/fingerprint_in_app_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:src="@drawable/fingerprint_in_app_indicator"
+ android:visibility="visible" />
+ </FrameLayout>
+
+ </LinearLayout>
+
+ <!-- Button area -->
+ <LinearLayout
+ android:id="@+id/fingerprint_enroll_button_area"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:id="@+id/fingerprint_enroll_button_add"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/fingerprint_enroll_button_add" />
+
+ <Button
+ android:id="@+id/fingerprint_enroll_button_next"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/fingerprint_enroll_button_next" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+</LinearLayout>