Commit Graph

37455 Commits

Author SHA1 Message Date
Betty Chang
7b6ac5b5f9 Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e am: 82b402fb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: Iccd1b99438004e133e83f78f216d37e67fba0396
2021-05-24 07:25:57 +00:00
Alex Li
73c1067444 Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76 am: f54063e13b am: cd5efe2f6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091

Change-Id: I441dcb7c793909a9a1f9fef3cd2acd6550913166
2021-05-24 07:25:31 +00:00
Betty Chang
82b402fb4c Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: I13b9036bc456124600a2917656000aadd8d26e25
2021-05-24 07:11:07 +00:00
Alex Li
cd5efe2f6d Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76 am: f54063e13b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091

Change-Id: I2badb3cffc24031ad6e095b7f022de71917cc84d
2021-05-24 07:10:55 +00:00
Edgar Wang
080bb2840e Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe am: f81739cdc6 am: b26f5cc21d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956

Change-Id: I373b24691226d79449a358fb07cf6492c901f2e8
2021-05-24 06:52:26 +00:00
Betty Chang
4246049c7c Merge "Remove the Network rating provider item" into sc-dev 2021-05-24 06:42:10 +00:00
Alex Li
d647dece76 Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev 2021-05-24 06:32:09 +00:00
Edgar Wang
f81739cdc6 Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956

Change-Id: Ib728b7f4de24832630c8e28fe0b43d9a2cb45411
2021-05-24 06:20:39 +00:00
Edgar Wang
54aacf80fe Merge "Align the items in account sync page to the start border" into sc-dev 2021-05-24 06:08:30 +00:00
Ryan Lin
807915722e Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: f8688671f7 am: 09f73edb4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I511e04cbf7f32ae3ef061dc2ba5391296bf5bd78
2021-05-24 04:15:35 +00:00
TreeHugger Robot
86947a85a9 Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: e250b21c41 am: bbb887c51b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: Ib9e275c4fe7defe4564ba73066488327e706e399
2021-05-24 04:15:24 +00:00
Ryan Lin
09f73edb4e Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: f8688671f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I81e7cbc3fb7249c073fc854236bfc2c5e198f1e9
2021-05-24 03:59:00 +00:00
TreeHugger Robot
bbb887c51b Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: e250b21c41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: I20a03bc69fb7ae990b1af8d2ff8676adf159b3d7
2021-05-24 03:58:55 +00:00
Ryan Lin
0753ba3e8b Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I9c98831688f1fd743723bb54e672ee99d1fd0b5b
2021-05-24 03:49:17 +00:00
Ryan Lin
31389702ad Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev 2021-05-24 03:41:39 +00:00
TreeHugger Robot
14c2dfadb0 Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: Ib26fc131216d2c423c176be6a0ec2a3e7de20f27
2021-05-24 03:40:15 +00:00
TreeHugger Robot
9081a2e67d Merge "Update Policy transparency dialog to new style" into sc-dev 2021-05-24 03:28:04 +00:00
Jason Chiu
4b1d1e21d5 Align the items in account sync page to the start border
The prefernces haven't been applied to the SettingsLib preference theme
which sets iconSpaceReserved false.

Fixes: 187670431
Test: visual, robotest
Change-Id: Ifa797fbec4f207248fd0254e26d456b8889e25d8
2021-05-24 10:13:53 +08:00
Curtis Belmonte
7f07c8394c Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c am: 35e4397090 am: 7a5d88069c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880

Change-Id: I5d38919c30ba67400835f79b569fb48ade1fa080
2021-05-22 00:15:40 +00:00
TreeHugger Robot
24ed3ea495 Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f am: fb4a0b5f55 am: b3c1cadd96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085

Change-Id: Icb5e6f504bec3f6b379737d84b391c19d1bf7bb4
2021-05-22 00:15:29 +00:00
Chen Xu
555ab0593b Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 9cfc1d747e am: 55fac6d18b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209

Change-Id: I92dc4add6f8c25801ba7669812f1c9a27afa487e
2021-05-22 00:15:21 +00:00
Curtis Belmonte
7a5d88069c Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c am: 35e4397090
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880

Change-Id: I80601c0320d14ff9ba8533bc0c40f339a4b0639a
2021-05-22 00:09:23 +00:00
TreeHugger Robot
b3c1cadd96 Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f am: fb4a0b5f55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085

Change-Id: I0143aaa35aaf3c7fa45e5c0aa1f3877b49cd5fbc
2021-05-22 00:08:43 +00:00
Chen Xu
55fac6d18b Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 9cfc1d747e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209

Change-Id: I621b0892368bdb836b1992a2110a7b2965496630
2021-05-22 00:07:44 +00:00
Curtis Belmonte
502a18ddc9 Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880

Change-Id: Id98a29e882fad49d4629bf34f8b1ada75e288b1f
2021-05-21 23:52:36 +00:00
TreeHugger Robot
2392ac66e1 Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085

Change-Id: I6526b369a98d59f31788d3bc02357947cb43d646
2021-05-21 23:52:07 +00:00
Chen Xu
569a14d0d9 Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209

Change-Id: Iace3a9e910d0b623f571d51f9b505f4878f69ce7
2021-05-21 23:51:57 +00:00
Curtis Belmonte
0327293c3c Merge "Update Face Unlock strings to the latest versions" into sc-dev 2021-05-21 23:40:40 +00:00
TreeHugger Robot
c8b025cc7f Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev 2021-05-21 23:34:55 +00:00
Chen Xu
ed23483ca7 Merge "integrate config_disable_all_cb_messages to settings" into sc-dev 2021-05-21 21:21:19 +00:00
Joe Bolinger
eb5fd6ec30 Prevent duplicate lock confirmation in face & fingerprint settings.
Wait for all extras to be available before launching the next activity.

Fix: 187005993
Test: manual (open face/fp settings & verify only asked for PIN once)
Change-Id: I9e3f46d5750b11ab0773d08d44908d3e9703ca42
2021-05-21 20:55:11 +00:00
Curtis Belmonte
47d74ccfd7 Update Face Unlock strings to the latest versions
Makes the following changes to strings related to Face Unlock:
- Standardize capitalization of "Face Unlock"
- Use latest versions of traffic light face enroll strings
- Use latest versions of combined biometrics settings strings
- Set SUW description strings programmatically instead of in XML

Test: Manually tested Face Unlock traffic light and grid UIs

Bug: 183649070
Change-Id: Ie67978ae2630493a5b03b00c3f8a639066ab8f3a
2021-05-21 13:11:52 -07:00
Edgar Wang
de88f5244c Update Policy transparency dialog to new style
- Tweak layout
- Update app icon
- Update font Size

Bug: 188756125
Test: manual
Change-Id: I7ddd73c80ead95d57202d1753408b437611a76b4
2021-05-22 04:00:38 +08:00
Quang Luong
26f4bf4cf3 Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d am: bc39d7bd0b am: 1af183e8a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881

Change-Id: Ida62f263cb4cbf6eb9de67ad2f301f45458bd69c
2021-05-21 17:45:51 +00:00
TreeHugger Robot
b9ff4f7c97 Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a am: f23959cf91 am: 2b65bf65fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076

Change-Id: I78bc636af5b80c1a309d03646c9073c8830c4a67
2021-05-21 17:45:25 +00:00
Yi Jiang
5f61029fdb Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38 am: f1ceff4995 am: 16ceee3678
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779

Change-Id: I02f2eecb7e89c30ffd509cf1710f1cfacca66af5
2021-05-21 17:43:04 +00:00
Quang Luong
bc39d7bd0b Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881

Change-Id: Ic86c48d54aa589581b8cacaf7b0cf1be91604742
2021-05-21 17:19:29 +00:00
TreeHugger Robot
2b65bf65fe Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a am: f23959cf91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076

Change-Id: Id543559bb53f3744e96509ded3d8dfe490c0409c
2021-05-21 17:17:44 +00:00
Yi Jiang
16ceee3678 Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38 am: f1ceff4995
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779

Change-Id: Iaf8fad78aa18af63a9b0672b861796e2aeb507d6
2021-05-21 17:17:12 +00:00
TreeHugger Robot
61ea520982 Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076

Change-Id: Ie926569098177c743a6510982df03077aa36d619
2021-05-21 17:17:03 +00:00
Quang Luong
ae59885f3d Merge "Refresh security pref in Network Details page" into sc-dev 2021-05-21 17:14:35 +00:00
TreeHugger Robot
48fab1db3a Merge "Fix the color of dot wrongly in device admin page" into sc-dev 2021-05-21 17:05:30 +00:00
Yi Jiang
b286fb2897 Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779

Change-Id: Ifc1dcab14ade4d17e276a39377dd41fc64ab854b
2021-05-21 17:01:20 +00:00
Yi Jiang
f1d1765e38 Merge "Defers initialization of preferences." into sc-dev 2021-05-21 16:41:10 +00:00
YUKAI HUNG
927456155b Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20 am: 6b9883b8a3 am: 5027dcac36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093

Change-Id: I817b2287deeae761681cc9c4e164675f8d22c854
2021-05-21 13:55:46 +00:00
YUKAI HUNG
5027dcac36 Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20 am: 6b9883b8a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093

Change-Id: I11b90e65216ad05341116744172e8a52ad8e5bc3
2021-05-21 13:41:25 +00:00
YUKAI HUNG
1cc84dce86 Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093

Change-Id: I6d57b94f683f35f4f09fb1f840544c4076764b06
2021-05-21 13:24:41 +00:00
Yanting Yang
6c28d1a6f1 Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50 am: dca2e6903c am: 807289d6ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997

Change-Id: I8b67bf064171fcc95263cb00ed1ccfa91b522def
2021-05-21 13:16:42 +00:00
YUKAI HUNG
8033a6ff20 Merge "Fix footer preference may flash one time when entering" into sc-dev 2021-05-21 13:04:11 +00:00
Yanting Yang
807289d6ce Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50 am: dca2e6903c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997

Change-Id: Ida85fc2d9d46810efd5f22ddc24df8d962343d20
2021-05-21 12:58:55 +00:00