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

82406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a0dff8a2c9 Merge "Update string" into sc-dev am: a1b8f78af1 am: 6a5b882836 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682960

Change-Id: I58d65df9fc7952add868e1326f85566450f7bf42
 2021-05-25 08:48:56 +00:00
Yanting Yang
6c80769a0f Merge "Remove silky flag from Sound for official release" into sc-dev am: 77c09892f9 am: 3fe9e27174 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702757

Change-Id: Ib3b701c80fd7656acb2f2cccaf2b3e15baa63079
 2021-05-25 08:48:51 +00:00
Pasty Chang
8522a1cd80 Merge "Migrate summary text in wifi QR scan page to DescriptionMixin" into sc-dev am: b15fd6233f am: 36fd7cf3c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682959

Change-Id: Ia1d8e9bde2571c2ee4539b8008c1a297faff8174
 2021-05-25 08:48:45 +00:00
Yanting Yang
77dd6bef37 Merge "Update subtext for "Network & internet"" into sc-dev am: 259b678865 am: 2d74dfc566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675090

Change-Id: I3dd642684ceb150f5bcf4947f70b733e3f380788
 2021-05-25 08:48:35 +00:00
TreeHugger Robot
6a5b882836 Merge "Update string" into sc-dev am: a1b8f78af1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682960

Change-Id: I37edb6b243c2f01069f2150920daaffb4ed306e8
 2021-05-25 08:35:40 +00:00
Yanting Yang
3fe9e27174 Merge "Remove silky flag from Sound for official release" into sc-dev am: 77c09892f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702757

Change-Id: Ibe5a3339540788196457c09dc7c54b96b6e9bb30
 2021-05-25 08:34:40 +00:00
Pasty Chang
36fd7cf3c9 Merge "Migrate summary text in wifi QR scan page to DescriptionMixin" into sc-dev am: b15fd6233f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682959

Change-Id: I07a43560b844bdf185a847ead53f3edcfa80206e
 2021-05-25 08:34:33 +00:00
Yanting Yang
2d74dfc566 Merge "Update subtext for "Network & internet"" into sc-dev am: 259b678865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675090

Change-Id: Ib8cbd8ca633494e5fc680e0491ac2d6df51af51e
 2021-05-25 08:34:28 +00:00
TreeHugger Robot
a1b8f78af1 Merge "Update string" into sc-dev 2021-05-25 08:21:56 +00:00
Yanting Yang
77c09892f9 Merge "Remove silky flag from Sound for official release" into sc-dev 2021-05-25 07:43:47 +00:00
Pasty Chang
b15fd6233f Merge "Migrate summary text in wifi QR scan page to DescriptionMixin" into sc-dev 2021-05-25 07:40:47 +00:00
Yanting Yang
259b678865 Merge "Update subtext for "Network & internet"" into sc-dev 2021-05-25 07:36:38 +00:00
SongFerng Wang
bed1b67377 Merge "Add more log for NetworkProviderWorker" into sc-dev am: 3a55bed8a1 am: 167ad73eb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702392

Change-Id: Ib0fe6c4d87695d7c572a85629ba801fde6d7ad06
 2021-05-25 07:00:10 +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
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
SongFerng Wang
167ad73eb9 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: I8e858f71e45a642afe6d4f9b15fce2faa1dbf848
 2021-05-25 06:42:31 +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
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
Hugh Chen
49a5b88336 Update string 
Make the last sentence starts with high case.

Screenshot:
https://screenshot.googleplex.com/4uekjkW5J9dGmKx.png

Bug: 188223922
Test: build pass
Change-Id: Ic43d3158c4a2b8e1f46169bebc41a88834cfc764
 2021-05-25 11:38:58 +08: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
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
Yanting Yang
beb14dbfbc Remove silky flag from Sound for official release 
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: Ica8217b3921235c9e79cf8f8b531637180552f3b
 2021-05-25 06:05:00 +08: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
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