Commit Graph

37516 Commits

Author SHA1 Message Date
TreeHugger Robot
5740ced18e Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 40e49eafac am: 7b1e183a46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: Ibda870dd3253f9cbb0efd56deb66b00d45e19174
2021-05-25 13:23:34 +00:00
Jan Tomljanovic
8d9f0b79c2 Merge "Avoid cold start of the security hub app." into sc-dev am: d747c8db1d am: 96e110ff2f am: 32cb5149e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14683790

Change-Id: Id8bc15059bb1d1e64574cefba84f70ab96f4581d
2021-05-25 13:18:06 +00:00
TreeHugger Robot
7b1e183a46 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 40e49eafac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I07daca955f9a518bba32c5896985b674c48af3ed
2021-05-25 12:26:52 +00:00
Jan Tomljanovic
32cb5149e5 Merge "Avoid cold start of the security hub app." into sc-dev am: d747c8db1d am: 96e110ff2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14683790

Change-Id: I27674d88fc75587c97146eb20f542352ad4ea104
2021-05-25 12:26:36 +00:00
TreeHugger Robot
332ee0f374 Merge "Support different types of transitions." into sc-dev 2021-05-25 11:49:59 +00:00
Jan Tomljanovic
d747c8db1d Merge "Avoid cold start of the security hub app." into sc-dev 2021-05-25 09:46:18 +00:00
Yanting Yang
0ab68cbb80 Merge "Remove silky flag from Sound for official release" into sc-dev am: 77c09892f9 am: 3fe9e27174 am: 6c80769a0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702757

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

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

Change-Id: Idaed1124410714ee2de0b619146bffe9d4de7024
2021-05-25 09:30:04 +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
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
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
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
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
Yi-Ling Chuang
8db5cb03eb Support different types of transitions.
In Settings, some cases are not suitable to apply the shared x-axis
transition, and some pages shared with SUW may need to apply other
transitions. Hence, create a mechanism for flexibility.

Bug: 187542491
Test: robotest & navigate though settings pages
Change-Id: I041bbb5e1d9177f234860864651f618700867b96
2021-05-25 14:13:02 +08: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
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
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
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
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
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
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
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
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
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
5c5b167408 Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1 am: 5bbc6c267c am: a1b368ce6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: Ib8a51472e829e972b8d59d2a2c54fe8a759ff6f5
2021-05-24 18:24:30 +00:00
Jason Hsu
a1b368ce6a Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1 am: 5bbc6c267c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: I37d81caad81bb72d8918084f7f0bd7b0d11158a9
2021-05-24 18:06:26 +00:00
Jason Hsu
47d51164bc Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: Ie771746c7111a07f16c457b36a7b097bd346dfc2
2021-05-24 17:48:11 +00:00
Jason Hsu
9fac24c1a1 Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev 2021-05-24 17:34:46 +00:00
Yanting Yang
8b95b7a6e9 Update subtext for "Network & internet"
Remove "and" to align with the other menu items.

Fixes: 183642373
Test: robotests & visual
Change-Id: I4d48b9c5a867d7afa04b7c3f0d6495b455df6621
2021-05-25 01:09:38 +08:00
TreeHugger Robot
3592646a01 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5 am: ecfd6714d9 am: dc93fdf0c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: Iab49003e212b7a92765f1fb140d8b94f497452cb
2021-05-24 17:08:29 +00:00
TreeHugger Robot
ecfd6714d9 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: I6dafe7597559f8b9fe9b5cfbfe21a02f7ee09d95
2021-05-24 16:35:05 +00:00
TreeHugger Robot
7ca749e3a5 Merge "Fix footer issues" into sc-dev 2021-05-24 16:15:36 +00:00
jasonwshsu
ea6bb2dc4a Fix transparency seekbar in accessibility button page is backwards
Root Cause: Store value in opacity value, need to be inverted to
transparency value.

Solution: transfer to transparency value and rename related field.

Bug: 183980065
Test: atest FloatingMenuTransparencyPreferenceControllerTest
Change-Id: I763dda47854e7cf945a95f4a7d4965725cd73824
2021-05-24 21:46:40 +08:00
Julia Reynolds
05f20f44f2 Improve entrance animations on convo page
By moving loading in each controller to the same thread.
There will still be shifting as the conversation prefs are added, but it
won't be the over thte top shift up and shift down motion that existed
prior to this cl.

Test: manual
Fixes: 188734400
Change-Id: I202981b603b8f9308b2b352a0939182910869cd6
2021-05-24 09:02:24 -04:00
YUKAI HUNG
f48cf35a81 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: c11960a427 am: 5e963c6600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: Ifddb42d47191eb63a4b516e7e98bc5076bcde304
2021-05-24 12:28:44 +00:00