PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,088 Commits 1 Branch 0 Tags
82c75c6eae4c2b5eb8b4872b43ba645e9de3af3c
Commit Graph

55088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
49175304a4 [automerger skipped] Import translations. DO NOT MERGE 
am: 13d6e13166 -s ours
am skip reason: subject contains skip directive

Change-Id: I9cadf1b43bc055fffa72a6bb96f929c5e5ed28dc
 2019-07-09 17:16:02 -07:00
Bill Yi
160d7e3906 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 41a7f9de31 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3eb1d5258c1893b7b7e355216fc0d51ddce706b
 2019-07-09 17:10:26 -07:00
Bill Yi
77f1c50053 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 41a7f9de31 -s ours
am skip reason: subject contains skip directive

Change-Id: I041df99d86d0b293d9dadcd987a22596a34d6863
 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
e97a459b6d Merge "Diversity extra no longer gets overwritten." into qt-r1-dev 
am: 007a1aee1b

Change-Id: Iff53397eed65d53a1cc53b01b85d9dab1f004ee3
 2019-07-09 16:05:43 -07:00
joshmccloskey
235405d66e Merge "Diversity extra no longer gets overwritten." into qt-r1-dev 
am: 007a1aee1b

Change-Id: Ic5d286f40b36c2b745b9d1168e60234015184b6a
 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
android-build-team Robot
39eacec97f Snap for 5713143 from 5604585930 to qt-c2f2-release 
Change-Id: I46d511a2fa9b6fb1df68efaef1655ad7e8162f9b
 2019-07-09 03:06:43 +00:00
android-build-team Robot
29cd1a9fea Snap for 5713174 from 292e7ad110 to qt-release 
Change-Id: Ie17a2f13b775ea666400306afee8d12cdf9dec5c
 2019-07-09 02:57:17 +00:00
Curtis Belmonte
209c049dca Fix work account setup lock screen content for face auth 
am: 5604585930

Change-Id: Id6044f31b68d7b36a40b165be639bc58cc0e8b33
 2019-07-08 17:10:55 -07:00
Curtis Belmonte
99396a13d8 Fix work account setup lock screen content for face auth 
am: 5604585930

Change-Id: I4c17bde1aa4d4a07c2d9b4bb72fbc07832d1bd1f
 2019-07-08 17:10:19 -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
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
android-build-team Robot
bc5c839e12 Snap for 5709975 from ce4d5fbff9 to qt-c2f2-release 
Change-Id: Id992a8e42233e077ce96c34f323bcf6f5e8db14a
 2019-07-06 23:10:41 +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
5485db52e7 [automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours 
am: ce4d5fbff9 -s ours
am skip reason: subject contains skip directive

Change-Id: If3c82155189da3a0564c2eb682eee98245e91e82
 2019-07-05 19:13:54 -07:00
Bill Yi
bb0b72a1d9 [automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours 
am: ce4d5fbff9 -s ours
am skip reason: subject contains skip directive

Change-Id: I45dae3a5c23a32b625a44025d4e47597e49d6789
 2019-07-05 19:13:54 -07:00
Bill Yi
f169d0de87 [automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours 
am: 2759932e72 -s ours
am skip reason: subject contains skip directive

Change-Id: I716345ea2e5b8e8d899d320ff2b8317b8bccf971
 2019-07-05 19:13:53 -07:00
Bill Yi
0dc89a0510 [automerger skipped] Import translations. DO NOT MERGE 
am: bad6060727 -s ours
am skip reason: subject contains skip directive

Change-Id: I2cd9425cab5d5da12695fd2d58c5335687f8ed3c
 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
2759932e72 [automerger skipped] Import translations. DO NOT MERGE 
am: 292e7ad110 -s ours
am skip reason: subject contains skip directive

Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278
 2019-07-05 19:04:54 -07:00
Bill Yi
ce4d5fbff9 [automerger skipped] Import translations. DO NOT MERGE 
am: 292e7ad110 -s ours
am skip reason: subject contains skip directive

Change-Id: I1957817bdae8c4294cc6cc144a4dafea472004a6
 2019-07-05 19:04:54 -07:00
Bill Yi
cd3a5441b6 [automerger skipped] Import translations. DO NOT MERGE 
am: bad6060727 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a587003900358aeddf32eac184668f483a381b1
 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
android-build-team Robot
65f12d2942 Snap for 5706862 from b038d65f4c to qt-c2f2-release 
Change-Id: Id692dc1f4fae0467e77e0bc8b5a83f23d024a1b0
 2019-07-04 03:05:19 +00:00
android-build-team Robot
5868d85608 Snap for 5706892 from a0fb9000bb to qt-release 
Change-Id: If19f709d9b070496081c3ea25ab531c6bff9f6ea
 2019-07-04 02:58:25 +00:00
Bill Yi
fa99f72ad3 [automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours 
am: b038d65f4c -s ours
am skip reason: subject contains skip directive

Change-Id: Id68bae980aaf0d4d3d041efd2b6cba17f1a1d09c
 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

Change-Id: Ifabc853b754fd6323e01246613656fe72961c253
 2019-07-03 17:19:49 -07:00
Bill Yi
d04d159ff9 [automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours 
am: b038d65f4c -s ours
am skip reason: subject contains skip directive

Change-Id: I9ecb0c88a6ecd0b7feb5bcfbfa815b4da71a1df4
 2019-07-03 17:16:33 -07:00
Bill Yi
dbd5065d5b [automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours 
am: 479df9b529 -s ours
am skip reason: subject contains skip directive

Change-Id: I8562829647339c35d2b33b6952e2955a878cd4d7
 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 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9f406526e0a1a2e5263706a09bb4427a49dea6c
 2019-07-03 16:42:04 -07:00
Mark Chien
d6971f763d Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev 
am: 8a44e4f274

Change-Id: I68703e3184557d1cd2597f0601a6e2fec1710c71
 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 -s ours
am skip reason: subject contains skip directive

Change-Id: I22be0cf868553d2728e0d3e407b1edb6c10e02b1
 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

Change-Id: Icbde69859391ec8b3497c736d6812e30ddcd417d
 2019-07-03 16:25:09 -07:00
Bill Yi
b038d65f4c [automerger skipped] Import translations. DO NOT MERGE 
am: a0fb9000bb -s ours
am skip reason: subject contains skip directive

Change-Id: I6a45fa6f274773e72385e7e1f8356b7e7ad68995
 2019-07-03 16:24:44 -07:00
Bill Yi
479df9b529 [automerger skipped] Import translations. DO NOT MERGE 
am: a0fb9000bb -s ours
am skip reason: subject contains skip directive

Change-Id: I53bbafb3bcf25c01d4b1bc45edb66398ca900e91
 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

Change-Id: I093dcaa95180a22d05f91af645e82f588f09864b
 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