Bill Yi
160d7e3906
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 41a7f9de31
2019-07-09 17:10:26 -07:00
TreeHugger Robot
41a7f9de31
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-09 23:10:22 +00:00
joshmccloskey
e97a459b6d
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
...
am: 007a1aee1b
2019-07-09 16:05:43 -07: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
Bill Yi
43682f3f27
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I84335ed2cdca77f9f506c084b11c5bb3215dd05f
2019-07-09 12:31:21 -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
Bill Yi
13d6e13166
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
2019-07-09 11:46:23 -07:00
Curtis Belmonte
99396a13d8
Fix work account setup lock screen content for face auth
...
am: 5604585930
2019-07-08 17:10:19 -07:00
TreeHugger Robot
03b2efe619
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-08 21:27:57 +00:00
Curtis Belmonte
5604585930
Fix work account setup lock screen content for face auth
...
For devices which provide biometric authentication options, such as
fingerprint or face, we should be showing different content on the lock
setup screen during the corp account setup wizard. Namely, the title
should read "Choose screen lock", and the "Not now" option should be
changed to "Continue without [auth method]". However, we currently only
check for whether fingerprint authentication is available, leading to
incorrect text for devices with face authentication.
This CL fixes the issue by changing the introducing a private method to
check for any biometric authentication (currently just mForFingerprint ||
mForFace). It then uses this method in place of the existing
mForFingerprint checks in SetupChooseLockGeneric.
Test: On a device with fingerprint auth and one with face auth:
1. Set a work profile with TestDPC and add some password quality requirement
2. adb shell settings put global device_provisioned
3. adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
4. Verify that the correct content is now shown (screenshot/xZPVtpa3j3Z)
5. Verify that setting lock with and without biometric auth still works
Fixes: 136556653
Change-Id: I46d3c964f05986aa97cc8ed77fe0ac125337ddd0
2019-07-08 19:03:56 +00:00
Bill Yi
5485db52e7
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours
...
am: ce4d5fbff9
2019-07-05 19:13:54 -07:00
Bill Yi
0dc89a0510
[automerger skipped] Import translations. DO NOT MERGE
...
am: bad6060727
2019-07-05 19:09:11 -07:00
Bill Yi
35939a6189
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Icdaa795f233501177a08cdce04829dd97ded4e98
2019-07-05 19:08:40 -07:00
Bill Yi
ce4d5fbff9
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
bad6060727
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9933f3eb0721fab73ff7776324de6ce088469a67
2019-07-05 16:53:24 -07:00
Bill Yi
292e7ad110
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
2019-07-05 14:38:28 -07:00
Bill Yi
d04d159ff9
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours
...
am: b038d65f4c
2019-07-03 17:16:33 -07:00
Mark Chien
d6971f763d
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
...
am: 8a44e4f274
2019-07-03 16:37:08 -07:00
Bill Yi
e108107a92
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 246873db8e
2019-07-03 16:30:18 -07:00
Kevin Chyn
15265e29d1
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
...
am: 47593cd29b
2019-07-03 16:25:09 -07:00
Bill Yi
b038d65f4c
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
2019-07-03 16:24:44 -07:00
Mark Chien
8a44e4f274
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
2019-07-03 13:16:03 +00:00
TreeHugger Robot
246873db8e
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-03 07:21:59 +00:00
Bill Yi
a0fb9000bb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
2019-07-02 23:30:20 -07:00
Bill Yi
0b2b3a0ded
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ea845510ab634d146f09f885ab0de8cd789c325
2019-07-02 19:46:11 -07:00
Kevin Chyn
47593cd29b
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
2019-07-03 02:07:49 +00:00
TreeHugger Robot
0cfcec2031
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-02 00:17:22 +00:00
Bill Yi
8d7e46515b
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
2019-07-01 16:21:33 -07:00
Bill Yi
a8d8d638af
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I90c0ada933cdd3d4b2431efdfe8290d3479aeac7
2019-07-01 14:22:44 -07:00
Bill Yi
da20a84f9b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6ab947284694fa3922d185f58f57c5acfd83b2ee
2019-07-01 12:27:35 -07:00
Robert Snoeberger
26688e912f
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
2019-07-01 10:36:26 -07:00
Robert Snoeberger
a4a25871d4
Merge "Remove "clocks" from string" into qt-r1-dev
2019-07-01 17:19:27 +00:00
Robert Snoeberger
0e65d651d1
Remove "clocks" from string
...
Fixes: 136193731
Bug: 136090066
Test: manual
Change-Id: I63751bb31016754930a4773d791f118103026ada
2019-07-01 17:12:16 +00:00
Amin Shaikh
13ac03cc8d
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
2019-07-01 05:09:31 -07:00
TreeHugger Robot
0217400ea5
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
2019-07-01 11:52:33 +00:00
Bill Yi
9eff336d66
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: ae58e057d7
2019-07-01 02:58:55 -07:00
Bill Yi
a02965899f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 512b97f994
2019-07-01 02:58:21 -07:00
Bill Yi
ae58e057d7
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3
2019-07-01 02:45:08 -07:00
TreeHugger Robot
eabf014bb3
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-01 09:35:06 +00:00
TreeHugger Robot
512b97f994
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-01 09:35:04 +00:00
Pasty Chang
f76b39eb3c
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
...
am: 2ba113898a
2019-06-30 18:57:28 -07:00
Pasty Chang
2ba113898a
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
2019-07-01 01:20:54 +00:00
Bill Yi
042c1d5eb7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6d165ca5174555cba705f59a270f935cd6d52a6c
2019-06-30 16:21:10 -07:00
Bill Yi
9690c70312
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If33daab9a7d9e2c88b602147d66da40968412de6
2019-06-30 15:39:46 -07:00
Bill Yi
26a2694bd3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
2019-06-30 14:58:27 -07:00
tmfang
ac2bad7203
Merge "Add summary for white balance feature" into qt-r1-dev
...
am: 9cd8167bff
2019-06-29 04:41:29 -07:00
TreeHugger Robot
9cd8167bff
Merge "Add summary for white balance feature" into qt-r1-dev
2019-06-29 10:57:45 +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
