Commit Graph

167 Commits

Author SHA1 Message Date
joshmccloskey
4259495574 Added new string.
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.

Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
2019-09-27 23:15:32 +00:00
joshmccloskey
186dbc65af Changed string for translations.
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.

Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
2019-09-27 21:56:46 +00:00
joshmccloskey
af1e831ab7 Added mandatory scrolling for FaceIntroduction
Test: Verified in SUW/Settings user must scroll through contents in
order to go to the next screen.
Bug: 141380294

Change-Id: I483ab6ae6a282c81ba2f2c4d1d9d1f21c6cb9453
2019-09-25 00:23:59 +00:00
Ilya Matyukhin
3df43a3eae Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev 2019-09-13 09:10:32 +00:00
Ilya Matyukhin
a95459c640 Fix "skip lock screen" not working for a secondary user
Bug: 140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
2019-09-13 09:10:15 +00:00
TreeHugger Robot
ff01d52d50 Merge "Change cancel button type to skip for SUW" into qt-r1-dev 2019-09-10 06:02:39 +00:00
joshmccloskey
d98257bae6 Change cancel button type to skip for SUW
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes: 140702414

Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
2019-09-09 16:46:03 -07:00
Joshua Mccloskey
fde49ec3ad Merge "Modified text to cancel enrollment" into qt-r1-dev 2019-09-05 22:44:12 +00:00
joshmccloskey
a55cbf036f Modified text to cancel enrollment
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
Kevin Chyn
058af41a42 Remove delay from enroll start button
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
8e1d1ca3ab Remove attention controller
Bug: 139484065

Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Edgar Wang
58a5be4401 Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >

Bug: 138458558
Test: robotest & manual

Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Kevin Chyn
e27a304b97 Add ability to finish() ConfirmDeviceCredential if it loses foreground
If user enters face settings but does not enter the password, then
turns off the screen, it's possible the challenge is invalidated. Instead,
we should finish() the device credential screen as well as FaceSettings.

This prevents
1) The user from being prompted for credential with lack of context
2) Credential returning a HAT that wraps an invalidated challenge

The user will be returned to the security settings screen, where they
have more context and can decide if they want to enter face settings again.

Fixes: 138273242

Test: 1) Open face settings, do not enter password
      2) Press power button
      3) Unlock keyguard
      4) User is not presented with credential screen
Test: Go through SUW, turning on/off the screen at various security
      screens. Able to enroll successfully

Change-Id: I3c3d4600138012821bb0eea7d2927df00011cdb0
2019-07-26 16:42:14 -07:00
joshmccloskey
fae3193539 Add extra check for accessibility flow.
Bug: 138197084
Test: Verified other accessibility features like Live Transcribe does
not bring the user to the accessibility flow.
Test: Verified that the Sound Amplifier does not bring the user to
the accessibility flow.

Change-Id: I5131d74926c0b01c565da280c55afe0080855688
2019-07-23 19:13:08 +00:00
joshmccloskey
a96a84e256 Ensure feature is supported and enabled.
Fixes: 137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.

Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
2019-07-11 21:31:31 +00:00
joshmccloskey
365beaebdb Update FaceSlice to use correct pref & FaceManager
Fixes: 137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
2019-07-11 16:28:21 +00:00
Joshua Mccloskey
0839185647 Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
* changes:
  Favor setup face in search settings.
  Remove highlighting for work profile
2019-07-10 02:29:45 +00:00
joshmccloskey
8bbbe545f2 Favor setup face in search settings.
Test: Manual.
Fixes: 137135217
Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e
2019-07-09 22:41:33 +00:00
TreeHugger Robot
007a1aee1b Merge "Diversity extra no longer gets overwritten." into qt-r1-dev 2019-07-09 22:24:00 +00:00
joshmccloskey
85081a4f7e Remove highlighting for work profile
Test: Manual.
Fixes: 137126517
Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc
2019-07-09 15:23:37 -07:00
joshmccloskey
97a95798ac Diversity extra no longer gets overwritten.
Test: Manual.
Fixes: 136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
2019-07-09 18:59:20 +00:00
Kevin Chyn
95634cace1 Send userId together with enroll / setFeature / getFeature method update
Test: Enroll E2E

Bug: 136264301
Change-Id: Ie3f98ab80c831083d750d9459ed7a189df25dd66
2019-06-28 13:42:20 -07:00
Joshua Mccloskey
35252d1b9f Merge "Adding slice for Face Enrollment" into qt-r1-dev 2019-06-26 01:15:50 +00:00
joshmccloskey
6634c159fd Adding slice for Face Enrollment
Fixes: 134965754
Test: Verified slice appears when not enrolled.
Test: Verified slice does not appear when enrolled.
Test: Verified slice disappears after clicking on icon and going back
to settings page.
Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843
2019-06-24 17:41:36 -07:00
Kevin Chyn
bd6e80e56d Retrieve help URL
Fixes: 118644802

Test: Help page is seen
Change-Id: Ib89d21ce5027f9ca9c3b6709a9a1301f988a0675
2019-06-18 11:13:31 -07:00
Kevin Chyn
92d2aae337 Do not allow toggle to be clickable/focusable
The entire preference is already clickable/focusable. Also, changed it so that
the entire preferenceview is clickable/focusable in non-accessibility mode as well
to better match Settings UX.

Also, no need to setClickable, since it is already by default

Fixes: 130398575

Test: With and without accessibility turned on, toggle works
Test: With accessibility turned on, toggle no longer takes a separate
      focus in addition to the preference

Change-Id: Iaff05cdf350f8d4f4c0f53b539770a7ad1f7d8ad
2019-06-17 13:15:21 -07:00
Kevin Chyn
5d8cd009fa Merge "Update string for work profile face unlock" into qt-r1-dev 2019-06-15 00:49:36 +00:00
Kevin Chyn
2d586f18f8 Update string for work profile face unlock
Fixes: 134053456

Test: With work profile and fully managed device, strings are correct
Change-Id: I358b94acfa0626083fdc422b6333765dcc2bc158
2019-06-14 12:56:59 -07:00
Kevin Chyn
ffcc25ba92 Merge changes from topic "face-bypass-move" into qt-r1-dev
* changes:
  Make bypass controller consistent with rest of face unlock settings
  Move lockscreen bypass setting to Settings > Security > Face unlock
2019-06-12 21:51:42 +00:00
Kevin Chyn
059980d215 Make bypass controller consistent with rest of face unlock settings
1) Should only be shown for owner profile
2) Should be disabled if A) not enrolled, B) DevicePolicyManager, C) HAL issue

Fixes: 134700640
Test: Manual test of conditions above
Change-Id: Id72db59c662df6c529c98aafd610de8c86c77ebd
2019-06-12 13:27:22 -07:00
Kevin Chyn
6a4a0e7396 Move lockscreen bypass setting to Settings > Security > Face unlock
Fixes: 134700640

Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
      works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display

Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
2019-06-12 13:27:18 -07:00
Kevin Chyn
e9d50cd91b Call finish() when enrollment loses focus
Bug: 134971919

Test: Entering keyguard on any enrollment screen finishes enrollment now
Test: Going back/forward works

Change-Id: I2c80a5586c10fa3feb780a5eadfe203abed52dea
2019-06-12 11:05:47 -07:00
TreeHugger Robot
a854373bee Merge "Increased toggling area" into qt-r1-dev 2019-06-12 05:40:53 +00:00
joshmccloskey
c2cb46782c Increased toggling area
Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes: 130398575

Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f
2019-06-12 02:57:17 +00:00
Kevin Chyn
ee6cc56b68 Only launch fingerprint settings after enrollment if it's from the summary controller
am: eeecb3e24d

Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b
2019-06-07 21:07:07 -07:00
Kevin Chyn
eeecb3e24d Only launch fingerprint settings after enrollment if it's from the summary controller
Fixes: 133822544

Test: No more multiple instances of fingerprint settings after enrolling
      from within the settings page

Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL does not
      send the user to fingerprint settings after completing enrollment

Change-Id: I003dc142b01ed6ffae83299ab4b69f4896eb93e3
2019-06-07 15:13:29 -07:00
Kevin Chyn
c976efa3e6 Do not stay on education page if user has enrolled max templates
Fixes: 134769754

Test: Enroll max templates, go back, intro screen is seen instead
Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61
2019-06-07 12:41:05 -07:00
Kevin Chyn
f20bb1c635 Resolve challenge lifecycle race conditions
1) FaceSettings now gets closed when it loses foreground. This prevents
   A) Keyguard/LockSettingsService's resetLockout's revokeChallenge from
   leaving FaceSettings with a stale HAT which prevents users from
   enrolling or toggling elements that require the HAT.
   B) generateChallenge has a timeout, which may already have been met
   C) User may have forgotten FaceSettings was open and lost context. Thus
   it makes no sense to show ConfirmLock* since the user may have no idea
   why it's showing anymore.

2) FaceSettings now generatesChallenge in onResume. onCreate is too early
   since again, FaceSettings can be launched via intent while on Keyguard.
   Similarly, we must ensure that Settings's challenge is generated
   late enough (e.g. when it actually gains foregroundness)

Fixes: 133440610
Fixes: 133498264

Test: Open face settings, confirm password, lock screen. After unlocking,
      user needs to re-open face settings.

Test: Modify HAL/framework to show re-enroll notification
      Tap re-enroll notificaton on keyguard
      Delete and re-enroll in settings, successful

Test: FaceSettings enroll works accross orientation change

Test: Tapping enroll button doesn't cause challenge to be revoked
      due to onStop()

Change-Id: I60f606314c458a61e9c1b4f4b66bc27bc44287da
2019-06-04 14:27:28 -07:00
Kevin Chyn
e716ce107d Revert "Add generateChallenge() in onResume()"
This reverts commit d59150eca6.

Bug: 133498264
Bug: 133440610

Reason for revert: Fixing in a different way

Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
2019-06-04 13:29:57 -07:00
TreeHugger Robot
dbe399a023 Merge "Add generateChallenge() in onResume()" into qt-r1-dev 2019-05-31 00:52:11 +00:00
Ilya Matyukhin
d59150eca6 Add generateChallenge() in onResume()
Fixes: 133498264
Fixes: 133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
2019-05-30 15:01:22 -07:00
joshmccloskey
5ef0a1d11d String update.
Test: Manual.
Bug: 133783098
Change-Id: If8ea2b6c9372a3da02b93b815f76e3143cc54dea
2019-05-30 10:51:34 -07:00
Pasty Chang
a9d7d4fa9a Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
am: 57ac23b2e5

Change-Id: I8fa351eb810616c189ee412dab1832c8afe0e6d2
2019-05-23 23:13:24 -07:00
Joshua Mccloskey
d9db8cb608 Merge "Added different button for non SUW enrollment" into qt-r1-dev 2019-05-24 02:36:54 +00:00
joshmccloskey
cf8e9af588 Added different button for non SUW enrollment
Bug: 133416320
Test: Manual.
Change-Id: I7087d5d4aa8f41e8d357f6fb41774d1bc62c17d9
2019-05-23 13:19:00 -07:00
Joshua Mccloskey
da74cc8cc7 Merge "Reduced time to 3 seconds." into qt-r1-dev 2019-05-23 19:44:31 +00:00
pastychang
2cb81f9a2b Fix fingerprint enrolling in settings show heavy theme
The descrpiton textview of fingerprint enrolling page that launchs from
settings shouldn't apply heavy theme. It must check the atrribute of
heavy theme is true first, and then apply it.

Bug: 132366547
Test: Manual
Change-Id: Id52151b308fa80f84a67d132634a8e9c58291878
2019-05-23 15:42:41 +08:00
joshmccloskey
f98f6bacf8 Reduced time to 3 seconds.
Test: Manual.
Fixes: 133364918
Change-Id: I1ce38f49a64d7066117cf3f0008a4558983033f2
2019-05-22 19:35:48 -07:00
Pasty Chang
6746e15859 Merge "Apply stencil theme for description textview" into qt-dev 2019-05-23 01:40:14 +00:00