SongFerng Wang
8a1dda0f2f
Merge "Add more log for NetworkProviderWorker" into sc-dev am: 3a55bed8a1 am: d4f7175199 am: 78dafd436d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702392
Change-Id: Id5e223353c2064c1b855859fa4cd3304c72d5d1d
2021-05-25 07:24:28 +00:00
SongFerng Wang
78dafd436d
Merge "Add more log for NetworkProviderWorker" into sc-dev am: 3a55bed8a1 am: d4f7175199
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702392
Change-Id: I6e2ee30b9b1430dca9aadd13890c8842fd2cc137
2021-05-25 06:58:14 +00:00
Betty Chang
942564f3a4
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev am: cd5722f8a1 am: f3afcf7eb9 am: 67dcca6aeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675094
Change-Id: I3988d762e8fb7f66ba123289583fa1c3df1d0e15
2021-05-25 06:49:20 +00:00
Betty Chang
33fd2dde45
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev am: cd5722f8a1 am: 874beca5b8 am: bf26925016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675094
Change-Id: I32f830809bdd33a46dfbd864ad15e29b1cc3be07
2021-05-25 06:49:15 +00:00
SongFerng Wang
d4f7175199
Merge "Add more log for NetworkProviderWorker" into sc-dev am: 3a55bed8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702392
Change-Id: Ib631bbe8dc49022b9aac79674d8fb614b17887cd
2021-05-25 06:43:51 +00:00
Betty Chang
67dcca6aeb
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev am: cd5722f8a1 am: f3afcf7eb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675094
Change-Id: Ic3c5c52288cf142ff1964855a02649ff5f342195
2021-05-25 06:35:36 +00:00
Betty Chang
bf26925016
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev am: cd5722f8a1 am: 874beca5b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675094
Change-Id: I33085d48e2f61187518ab110741b32efa0fac246
2021-05-25 06:33:52 +00:00
SongFerng Wang
3a55bed8a1
Merge "Add more log for NetworkProviderWorker" into sc-dev
2021-05-25 06:23:33 +00:00
Betty Chang
874beca5b8
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev am: cd5722f8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675094
Change-Id: I8bfc5b452511868f526a2b366a59c9cdb793c821
2021-05-25 06:04:59 +00:00
Betty Chang
f3afcf7eb9
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev am: cd5722f8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675094
Change-Id: I0f9779656499942d2b78f5879a9aa7049d42c0b7
2021-05-25 06:03:06 +00:00
Betty Chang
cd5722f8a1
Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev
2021-05-25 05:46:07 +00:00
Curtis Belmonte
172eafbf32
Merge "Use Lottie animation for traffic light face education" into sc-dev am: cbac65769f am: cf27fa11f3 am: b4689a1d39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705606
Change-Id: If6261d9d36596b80a16564171f10b684d755b226
2021-05-25 05:34:16 +00:00
Curtis Belmonte
c011103f52
Merge "Update face/fingerprint consent screen UIs" into sc-dev am: aa5ae60a37 am: 86591a76cc am: 8c36515d15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705204
Change-Id: I30b3777703a9b1eeeef525b18a3696cefc309a6c
2021-05-25 05:34:08 +00:00
Curtis Belmonte
352f9a85a2
Merge "Use Lottie animation for traffic light face education" into sc-dev am: cbac65769f am: c59f112a12 am: f7bb4d2d2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705606
Change-Id: I95e7de6eeeae17c20f90971d5ab2e73cf8874a9c
2021-05-25 05:33:40 +00:00
Curtis Belmonte
e4330ca791
Merge "Update face/fingerprint consent screen UIs" into sc-dev am: aa5ae60a37 am: 6c6d8d5510 am: dbbffa8ddd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705204
Change-Id: I5a2019909553585f654310ad2b378ee91d8b5171
2021-05-25 05:33:30 +00:00
Curtis Belmonte
b4689a1d39
Merge "Use Lottie animation for traffic light face education" into sc-dev am: cbac65769f am: cf27fa11f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705606
Change-Id: I8d7e25e25b6c6a20e9bb9e18990aa722dd408a01
2021-05-25 05:12:10 +00:00
Curtis Belmonte
8c36515d15
Merge "Update face/fingerprint consent screen UIs" into sc-dev am: aa5ae60a37 am: 86591a76cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705204
Change-Id: I44e9209c547b06f17c24174721b1038deb6c58e7
2021-05-25 05:12:04 +00:00
Curtis Belmonte
f7bb4d2d2d
Merge "Use Lottie animation for traffic light face education" into sc-dev am: cbac65769f am: c59f112a12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705606
Change-Id: I73b0461470ee81c28828de4562c84323f91f5559
2021-05-25 05:10:27 +00:00
Curtis Belmonte
dbbffa8ddd
Merge "Update face/fingerprint consent screen UIs" into sc-dev am: aa5ae60a37 am: 6c6d8d5510
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705204
Change-Id: I5384f595d80eb6e79fc31258f6c4b3773538ca82
2021-05-25 05:10:03 +00:00
Curtis Belmonte
c59f112a12
Merge "Use Lottie animation for traffic light face education" into sc-dev am: cbac65769f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705606
Change-Id: I628166298727eaaf9a4ae8862ff9b2c45b8e2c2c
2021-05-25 04:38:17 +00:00
Curtis Belmonte
6c6d8d5510
Merge "Update face/fingerprint consent screen UIs" into sc-dev am: aa5ae60a37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705204
Change-Id: I55788a02cf0cb2b60c8f95d6b9f5007a3519d4fc
2021-05-25 04:38:10 +00:00
Curtis Belmonte
cf27fa11f3
Merge "Use Lottie animation for traffic light face education" into sc-dev am: cbac65769f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705606
Change-Id: I624b352bcb5b75d28d14a786f59b70f374c5f8f2
2021-05-25 04:36:32 +00:00
Curtis Belmonte
86591a76cc
Merge "Update face/fingerprint consent screen UIs" into sc-dev am: aa5ae60a37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14705204
Change-Id: I60862f2730c3e71b274f3a93ada230c2f76571f2
2021-05-25 04:36:20 +00:00
Curtis Belmonte
cbac65769f
Merge "Use Lottie animation for traffic light face education" into sc-dev
2021-05-25 04:30:30 +00:00
Curtis Belmonte
aa5ae60a37
Merge "Update face/fingerprint consent screen UIs" into sc-dev
2021-05-25 04:15:44 +00:00
Ryan Lin
09c223af88
Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96 am: e26f279d0d am: 39858120f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751
Change-Id: Iabbc47557cc3a83b13b9846685037354676e3b25
2021-05-25 02:42:26 +00:00
Ryan Lin
5d315f8642
Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96 am: e833c3681f am: c535b36b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751
Change-Id: Iaeb6498cae597841927cd54f91f98afb1748e6a3
2021-05-25 02:42:06 +00:00
Ryan Lin
39858120f7
Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96 am: e26f279d0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751
Change-Id: Ie0c4de42d0f82ece0ad57de96c4682e8f9381b21
2021-05-25 02:26:19 +00:00
Ryan Lin
c535b36b45
Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96 am: e833c3681f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751
Change-Id: Id895f277287223d69ef40a8828c7e7682f03b4d3
2021-05-25 02:24:27 +00:00
Ryan Lin
e833c3681f
Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751
Change-Id: If32d099b7591ee13a0473e11534956d3fd95c42c
2021-05-25 02:08:24 +00:00
Ryan Lin
e26f279d0d
Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751
Change-Id: Ic708aefad15b382bab47b91223732afac0c473dd
2021-05-25 02:06:30 +00:00
Ryan Lin
954389be96
Merge "Correct punctuation for inconsistency" into sc-dev
2021-05-25 01:48:30 +00:00
SongFerngWang
9478be4fa7
Add more log for NetworkProviderWorker
...
Bug: 183594909
Test: build pass
Change-Id: I0b251df79c4db7e0b7eb5ab5338d43f238a3b50e
2021-05-25 08:57:52 +08:00
Menghan Li
f258569e10
Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649 am: 0341e42c54 am: ff6ffc4727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750
Change-Id: I110fb4964a5613538d43a3836fe84dee2f054a80
2021-05-24 22:44:24 +00:00
Menghan Li
4ee9a66a64
Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649 am: 06f1a6179d am: 65de58eb41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750
Change-Id: I634ee69a84a5cb732f70416589fa9e3607f8ccdc
2021-05-24 22:43:06 +00:00
Menghan Li
ff6ffc4727
Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649 am: 0341e42c54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750
Change-Id: I0454f9cb3047d63d9925213911d2b5ec07f75735
2021-05-24 22:33:13 +00:00
Menghan Li
65de58eb41
Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649 am: 06f1a6179d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750
Change-Id: I6be87d3ef9c631df05cd0a17c7978af0f98450bd
2021-05-24 22:26:06 +00:00
Menghan Li
0341e42c54
Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750
Change-Id: Ib243220845f6b57a888eb84786806ae0422cbd4c
2021-05-24 22:10:46 +00:00
Menghan Li
06f1a6179d
Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750
Change-Id: I4ae751cf7f0be3d633d2a557cf2fdaa14a072132
2021-05-24 22:07:05 +00:00
Menghan Li
49f904c649
Merge "Apply color extraction for sub settings in SuW" into sc-dev
2021-05-24 21:48:38 +00:00
Curtis Belmonte
a543067ed9
Use Lottie animation for traffic light face education
...
Test: Manual
Bug: 182716681
Change-Id: Ia4c9dea5c900c71ec7eca7946cf090fd02b436e2
2021-05-24 14:47:19 -07:00
Curtis Belmonte
937ff332f3
Update face/fingerprint consent screen UIs
...
Makes the following UI changes to the consent screens for face and
fingerprint enrollment:
- Sets description text in XML rather than in Java
- Highlight both primary and secondary buttons
- Use extracted highlight color for all icons
Test: Manually tested SUW flow
Bug: 188922185
Bug: 187458628
Bug: 183710943
Change-Id: I39d9b990dcbb82f443515a2175766dc51ca1180c
2021-05-24 13:17:09 -07:00
Julia Reynolds
cc39abaf9f
Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d am: 7f79c1b475 am: a010ebc2d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666
Change-Id: I320d60a5c538beb3bacdcaf73a16dc7041ae2abd
2021-05-24 19:24:54 +00:00
Julia Reynolds
fff5f1d14c
Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d am: 7bff80dec9 am: c863e32a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666
Change-Id: I6480f5a28ad20edf9d6b8ed9cfb2b2636c37f3c4
2021-05-24 19:24:22 +00:00
Julia Reynolds
a010ebc2d6
Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d am: 7f79c1b475
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666
Change-Id: I23a068bba98847b99c4cec1db1257a74a183d283
2021-05-24 19:10:13 +00:00
Julia Reynolds
c863e32a64
Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d am: 7bff80dec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666
Change-Id: I112aa70b50b88e4373178784845fd5dfc189bf95
2021-05-24 19:08:23 +00:00
Julia Reynolds
7bff80dec9
Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666
Change-Id: I4a84c20a2e759b59294556a02d4f85484656274d
2021-05-24 18:52:10 +00:00
Julia Reynolds
7f79c1b475
Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666
Change-Id: Ie1a1df7b7e1d7b3a62d07754256f63424b1a495c
2021-05-24 18:50:51 +00:00
Julia Reynolds
a5b242ec3d
Merge "Improve entrance animations on convo page" into sc-dev
2021-05-24 18:32:03 +00:00
Jason Hsu
7389a32002
Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1 am: 47d51164bc am: 06029c0178
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953
Change-Id: I1f6897c67a6dcb15413c883bc3a22b0f99c85e5b
2021-05-24 18:25:24 +00:00