diff options
| author | Jim Miller <jaggies@google.com> | 2015-03-04 18:07:32 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-03-11 18:15:55 -0700 |
| commit | 9218687e4baaf0226ef16b58f78123d979711e5d (patch) | |
| tree | 0f5f51299a5f28ead30386f71243782bab000981 /res/layout-land | |
| parent | 5455bb540a8b4a5150a1b790c4a36fb0410f8ac3 (diff) | |
| download | packages_apps_Settings-9218687e4baaf0226ef16b58f78123d979711e5d.zip packages_apps_Settings-9218687e4baaf0226ef16b58f78123d979711e5d.tar.gz packages_apps_Settings-9218687e4baaf0226ef16b58f78123d979711e5d.tar.bz2 | |
Implement additional fingerprint flows in Settings.
- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet
Bug 19592835
Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/fingerprint_enroll.xml | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/res/layout-land/fingerprint_enroll.xml b/res/layout-land/fingerprint_enroll.xml index 8954d74..7bd41d1 100644 --- a/res/layout-land/fingerprint_enroll.xml +++ b/res/layout-land/fingerprint_enroll.xml @@ -62,62 +62,59 @@ <!-- Right area --> <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dip" + android:layout_width="0dip" + android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical"> - <LinearLayout + <RelativeLayout android:id="@+id/fingerprint_view_selector" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="0dip" - android:orientation="vertical" android:layout_weight="1" - android:layout_gravity="center"> + android:layout_gravity="center" + android:gravity="center"> - <FrameLayout + <!-- Only one of the following views will show for any given mode --> + <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:background="@drawable/fingerprint_progress_ring_bg"> + android:layout_centerInParent="true"> + + <ImageView + android:id="@+id/fingerprint_animator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/fingerprint_indicator" /> - <!-- 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:layout_centerInParent="true" + style="?android:attr/progressBarStyleHorizontal" + android:max="10000" 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" /> + </RelativeLayout> - <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> + <ImageView + android:id="@+id/fingerprint_sensor_location" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/fingerprint_sensor_location" /> - </LinearLayout> + <ImageView + android:id="@+id/fingerprint_in_app_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/fingerprint_in_app_indicator" /> + </RelativeLayout> <!-- Button area --> <LinearLayout |