Bill Yi
6edf1646c1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:17:49 -07:00
Bill Yi
49175304a4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:16:02 -07:00
Bill Yi
77f1c50053
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 41a7f9de31
2019-07-09 16:58:40 -07:00
TreeHugger Robot
41a7f9de31
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-09 23:10:22 +00:00
joshmccloskey
235405d66e
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
...
am: 007a1aee1b
2019-07-09 15:51:45 -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
Xin Li
f03ae69f69
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
...
Bug: 136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
2019-07-09 15:31:44 -07: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
209c049dca
Fix work account setup lock screen content for face auth
...
am: 5604585930
2019-07-08 17:10:55 -07:00
android-build-team Robot
ec58694ae8
Snap for 5622519 from fd365ae91e to pi-platform-release
...
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
2019-07-08 23:29:58 +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
Android Build Merger (Role)
34cf96e241
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours am: ce4d5fbff9 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-06 02:14:07 +00:00
Bill Yi
bb0b72a1d9
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours
...
am: ce4d5fbff9
2019-07-05 19:13:54 -07:00
Bill Yi
f169d0de87
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours
...
am: 2759932e72
2019-07-05 19:13:53 -07:00
Bill Yi
2759932e72
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
ce4d5fbff9
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
cd3a5441b6
[automerger skipped] Import translations. DO NOT MERGE
...
am: bad6060727
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
fa99f72ad3
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours
...
am: b038d65f4c
2019-07-03 17:36:47 -07:00
Mark Chien
649f98541a
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
...
am: 8a44e4f274
2019-07-03 17:19:49 -07:00
Bill Yi
dbd5065d5b
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours
...
am: 479df9b529
2019-07-03 16:48:28 -07:00
Bill Yi
9dc4eb1470
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 246873db8e
2019-07-03 16:42:04 -07:00
Bill Yi
b038d65f4c
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
2019-07-03 16:24:44 -07:00
Bill Yi
479df9b529
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
2019-07-03 16:19:58 -07:00
Kevin Chyn
d40d9887f9
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
...
am: 47593cd29b
2019-07-03 16:14:47 -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
Neil Fuller
e13cd91161
Merge "Add tobiast@ to the OWNERS file" am: a931693721 am: 46e53e770c
...
am: bf673318f1
2019-07-02 16:26:40 -07:00
Neil Fuller
bf673318f1
Merge "Add tobiast@ to the OWNERS file" am: a931693721
...
am: 46e53e770c
2019-07-02 15:32:40 -07:00
Xin Li
c12cc62208
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7 -s ours
...
am: 59b1a2f6bb
2019-07-02 11:41:19 -07:00
Neil Fuller
46e53e770c
Merge "Add tobiast@ to the OWNERS file"
...
am: a931693721
2019-07-02 10:13:36 -07:00
Xin Li
59b1a2f6bb
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 0a68e9bfe7
2019-07-02 10:04:54 -07:00
Neil Fuller
a931693721
Merge "Add tobiast@ to the OWNERS file"
2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c
Add tobiast@ to the OWNERS file
...
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
Bill Yi
7ed2100d0e
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
2019-07-01 16:21:34 -07:00
Xin Li
0a68e9bfe7
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
2019-07-01 21:00:04 +00: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
a350189b88
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
2019-07-01 10:34:22 -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
fea6983c2b
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
2019-07-01 05:08:46 -07:00
TreeHugger Robot
0217400ea5
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
2019-07-01 11:52:33 +00:00
