Commit Graph

193 Commits

Author SHA1 Message Date
edgar.huang
8aeabc23c6 Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab
am: e096a55f03

Change-Id: Id5ace14f946ac9cab23bcafb053e5087ae6a38a1
2017-09-06 00:44:05 +00:00
edgar.huang
8f42d1a4ab Merge "Settings is crashed high probability when doing follow steps"
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
2017-09-06 00:21:17 +00:00
edgar.huang
ab6f11f47f Settings is crashed high probability when doing follow steps
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
2017-09-05 06:35:27 +00:00
Maurice Lam
fe38bfd742 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e
am: 46a04ecca1

Change-Id: I865f8da9a0bbf7be9e6ec74b27b55300c604bde0
2017-08-31 02:39:41 +00:00
Maurice Lam
61c8796a5e Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
2017-08-31 02:10:37 +00:00
liming.wang
0db5a99608 Fix Settings crashes after tapping "Learn more" in fingerprint page
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

Fixes: 64322876 
Test: manual - go to Settings > Security & Location > Fingerprint
               and then tap "Learn more"

Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
2017-08-23 03:32:40 +00:00
Kevin Chyn
5e8f4b6320 Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c
2017-08-11 17:34:35 +00:00
TreeHugger Robot
2e7b65f74a Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev 2017-08-11 17:26:08 +00:00
Ajay Nadathur
aec29ee4be Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
2017-08-11 17:21:24 +00:00
Ajay Nadathur
58c2da2d9e Update strings for skip fingerprint setup
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Kevin Chyn
8cf5bcdfa7 Reset fingerprint lockout upon successful unlock
FingerprintSettings should not start listening for fingerprints until
after Pin/Pattern/Pass is entered

Fixes: 63437524
Fixes: 63739006

Test: open FP settings, touch an invalid finger 5 times
close FP settings, re-enter FP settings, enter Pin/Pattern/Pass
touch FP with valid finger, should not be in lockout mode

Change-Id: Ia2e219824c33169a5610b36123c42aa3d6ff22c5
2017-08-09 18:49:17 -07:00
Ajay Nadathur
b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Julia Reynolds
5d17c4284d Merge "Use colorful +s" into oc-mr1-dev
am: e286c0627b

Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
2017-08-09 13:54:40 +00:00
Maurice Lam
b2aa7e7da0 Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
am: 6b5f99bcbd

Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
2017-08-09 00:02:12 +00:00
Maurice Lam
6b5f99bcbd Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6
am: d415cbfc0d

Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
2017-08-08 23:26:20 +00:00
Maurice Lam
dbfde54fb6 Merge "Show help string when onEnrollmentHelp() is called"
am: 5a926705ef

Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
2017-08-08 22:56:38 +00:00
Julia Reynolds
fabe766958 Use colorful +s
Instead of grey

Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes: 63820885
Test: manual
2017-08-08 14:00:09 -04:00
Ajay Nadathur
cfcd1c4b77 Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev 2017-07-28 17:45:22 +00:00
Ajay Nadathur
d48d323e13 Remove extra steps in fingerprint flow
bug: 63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
(cherry picked from commit e24f1ab745)
2017-07-27 21:57:55 +00:00
Ajay Nadathur
0449335cd8 Fix fingerprint enrollment bug that fails during last leg
- Upon configuration changes during the last leg of enrollment,
  a check is required to see if maximum progress has been reached.
  If so, the next intent has to be launched.

bug: 36656476
Test: Manually tested and verified.
Change-Id: Ie4ec75cb775f83536ad0127011aabcc87c6c5ae0
2017-07-26 18:29:29 +00:00
Nobuyuki Nakamura
2c872109eb Show help string when onEnrollmentHelp() is called
The help string is not shown when onEnrollmentHelp() is called
between onEnrollmentProgressChange() and mTouchAgainRunnable#run().
To fix this issue, showError() should be called.

Bug: 30274453
Test: manual - start enrolling fingerprint and move finger fast on the sensor

Change-Id: Ie604532940e40cca66dc54b56c3cb4b828a07987
2017-07-12 05:42:37 +00:00
Ajay Kumar Nadathur Sreenivasan
0f9d39518b Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev am: 9afa37ac3c
am: d6e1be947e

Change-Id: I253706d61d4c917601581457b128f7fedec3a12c
2017-07-07 18:03:31 +00:00
Ajay Nadathur
3d9fffed16 Screen lock type metrics are not reported if user goes back
bug: 63116381
Test: Manually tested and verified that metrics are passed back to
setupwizard. Also added robolectric tests
Change-Id: I9d095754addc34121a2a0a12b3e5d1479ff15a78
2017-07-06 14:56:34 -07:00
Maurice Lam
21bd3994c4 Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7
am: d3d1210fad

Change-Id: I6f689b5242b122eb2f4388de10acb7e4c7e3b81e
2017-06-29 02:07:19 +00:00
Maurice Lam
9990f39722 Read theme for lock screen flows
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.

Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
2017-06-28 15:06:09 -07:00
TreeHugger Robot
c343993be3 Merge "Improve delete fingerprint UI." 2017-06-27 20:27:49 +00:00
Fan Zhang
8a1fd388fd Improve delete fingerprint UI.
- Make fingerprint preference use two_target preference
- And add a delete button as secondary target
- Remove delete fingerint code from RenameDeleteDialog, and move to new
  DeleteFingerprintDialog
- Some code cleanup
- Tests

Change-Id: I49d9c7d1d03497f07c7e20a805f23e6da934f587
Fix: 37783186
Test: make RunSettingsRoboTests
2017-06-27 11:33:23 -07:00
Maurice Lam
fbfca43e6e Merge "Rename buttons in lock screen setup" into oc-dr1-dev 2017-06-27 01:10:49 +00:00
Maurice Lam
624212f43c Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev 2017-06-27 01:10:23 +00:00
Maurice Lam
c57b19d80c Rename buttons in lock screen setup
- "Continue" in choose lock flows are renamed to "Next"
- "Done" in fingerprint enroll finish screen is renamed to "Next"
  during setup flow.

Test: Manual
Bug: 62839648
Change-Id: I3ea77b759b654d7c1da1f7b545781c9dfd74caa3
2017-06-23 19:15:06 -07:00
Maurice Lam
870b69b067 Add skip button to fingerprint enrolling screen
Test: Manual
Bug: 62839648
Change-Id: I3f05c64eb5b88cd91c8c98b02845a99df2d27203
2017-06-23 18:48:13 -07:00
Maurice Lam
70a031fe06 Update buttons in FP find sensor
Remove the next button (so the user has to touch the sensor to
proceed), and add a skip button.

Test: cd tests/robotests && mma
Bug: 62839648
Change-Id: I555948ac2f3235e08b91f0957aa8e0ce24535c08
2017-06-23 18:05:20 -07:00
TreeHugger Robot
cf3130338c Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev 2017-06-22 19:58:51 +00:00
Maurice Lam
34a181aceb Create add more fingerprint suggestion for setup
Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.

Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755
2017-06-21 17:17:48 -07:00
Kevin Chyn
00d21e3c75 FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT
Fixes: 62681560

Test: open fingerprint settings, use an unenrolled fingerprint to
authenticate 20 times in a row. Look at logs and it shouldn't be flooded
with fingerprint logs

Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988
2017-06-20 14:24:43 -07:00
Maurice Lam
4c930fc2d5 Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.

Test: Added Robolectric and instrumentation tests
Bug: 38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit 0f897d79f6)
2017-06-15 20:23:21 +00:00
TreeHugger Robot
8e7cd4e6fe Merge "String update for setup wizard" 2017-06-02 22:33:57 +00:00
Kevin Chyn
7359c0d5f4 Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev am: 98b67a4e94
am: 618467daff

Change-Id: I78b14e932635fd316fa96fc2cfadcdf9567e724c
2017-06-01 08:25:07 +00:00
Kevin Chyn
bb846a6608 Add onResume to FingerprintEnrollEnrolling
Fixes: 62233947

Test: revoke usb permissions, start enrolling, attach usb,
	press ok, continue enroll. enroll should be able to continue
	and complete

onPause was added in b/38102355, but onResume was not added. We should
set the listener in onResume()

Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
2017-05-31 17:11:03 -07:00
Maurice Lam
1a07ab4790 String update for setup wizard
Test: Manual
Bug: 38503505
Change-Id: Idc881e5288ab205dee0a85a02d1365f6c4901c88
2017-05-31 14:59:37 -07:00
Maurice Lam
ebb8294333 Support find sensor screen with no animation
Some illustration view can manage their own start-stop lifecycle and
doesn't need to be handled by the activity.

Make mAnimation null if the animation is not an instance of
FingerprintFindSensorAnimation.

Test: cd tests/robotests && mma
Bug: 38463695
Change-Id: I41989e5cb0639407f58d9c8edda0eef93adbf2e8
2017-05-25 11:21:16 -07:00
Kevin Chyn
1c38d4bbe7 Merge "Queue events if enrollment sidecar listener is null" into oc-dev am: 32ad1c0db4
am: 35fb3302d7

Change-Id: I94cfe913b3e66ce27a0ee7ea439d3ed6a77942f3
2017-05-22 23:09:35 +00:00
TreeHugger Robot
32ad1c0db4 Merge "Queue events if enrollment sidecar listener is null" into oc-dev 2017-05-22 22:40:42 +00:00
Kevin Chyn
a1b3ec5963 Queue events if enrollment sidecar listener is null
Fixes: 38102355

Test: manual
Change-Id: I98bd347ee98117f7489376abd94d276d20e7b762
2017-05-22 12:10:03 -07:00
Kevin Chyn
3795082c83 Merge "Fix settings crash due to enrolling error" into oc-dev am: 5ccc2fe242
am: 2ca8635a5e

Change-Id: I167959f2ef69bcda7fb604e3f3e85512799ce691
2017-05-20 00:01:59 +00:00
Kevin Chyn
468a72aed3 Fix settings crash due to enrolling error
Test: There's a condition where FP enrollment fails and a fragment
transaction/commit occurs after onSaveInstanceState. We should be
using commitAllowingStateLoss() instead of commit()

I'm not able to repro this issue but from looking at the stack
trace this should fix the problem.


Fixes: 38432354

Change-Id: I56b9c8d2efc45e9d77f29b897280f5378c3a84a0
2017-05-19 13:04:08 -07:00
TreeHugger Robot
821c83e749 Merge "Default setup wizard to use PIN" 2017-05-18 08:43:24 +00:00
Charles He
80c3a16e92 Merge "Properly remove fingerprints when removing device lock." into oc-dev am: 98229bdf32
am: af36129ae9

Change-Id: Iffc4f16ac3301bc0fbe9b4d8a1c88b3e71ce2373
2017-05-17 13:12:00 +00:00
Charles He
7569bb1881 Properly remove fingerprints when removing device lock.
When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.

Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.

However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.

In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().

Bug: 37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7
2017-05-16 23:40:38 +01:00