Commit Graph

82382 Commits

Author SHA1 Message Date
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
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
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
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
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
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
06029c0178 Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1 am: 47d51164bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: Ibf7592f8161a3c9166d140ef08f3933f0c92fe6c
2021-05-24 18:08:22 +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
5bbc6c267c 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: Ia40252fe4beb9236e1cf2cd1f6097902b8f4abd1
2021-05-24 17:52:17 +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
TreeHugger Robot
e84eb86194 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5 am: ba86da86c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

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

Change-Id: I44a8943d145e44027720feada8c4354d6587dc77
2021-05-24 16:52:34 +00:00
TreeHugger Robot
ba86da86c1 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: I642535fe4ad349182e1508a5e6e6d855f2c14dd9
2021-05-24 16:37:08 +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
c85f67085a Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: 227e400803
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I60f01e10b4af35341c135df480129e0140d64cc7
2021-05-24 12:10:02 +00:00
ryanlwlin
027aa82d46 Correct punctuation for inconsistency
Bug: 187216931
Test: manually test
Change-Id: Ibd9c81e84b5f091b6f71e18ad79342979881d8b8
2021-05-24 20:09:04 +08:00
YUKAI HUNG
5e963c6600 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: c11960a427
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: Idfb6661a1efc762417133651c86b1e913e528fbe
2021-05-24 12:08:13 +00:00
menghanli
c3ce01cdde Apply color extraction for sub settings in SuW
Bug: 183713013
Test: Run initBCTestEnv_S.sh and apply different color
Change-Id: Ia06983a8bcfa9cbf190d0c73496b5d70660ffa4e
2021-05-24 11:56:31 +00:00
YUKAI HUNG
c11960a427 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I6576ce630a72df6db5d54de460fc3fe09d6dd539
2021-05-24 11:54:29 +00:00
YUKAI HUNG
227e400803 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I6fa69766a4e8d7fb0332da7ba657a71207c24443
2021-05-24 11:52:33 +00:00
YUKAI HUNG
648f773c7c Merge "Move load battery consumer icon and label into the background" into sc-dev 2021-05-24 11:41:18 +00:00
Betty Chang
4dd0a2dbe2 Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: 2a5f886ad4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: Icddf48a98bd9c9366ea8c9767facb259f81dfd72
2021-05-24 07:12:14 +00:00