Commit Graph

85219 Commits

Author SHA1 Message Date
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
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
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
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
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
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
622d85ba04 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5 am: ba86da86c1 am: e84eb86194
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: Ie25c8c61923b6c1728b1f1989ae6a24d90d0fc24
2021-05-24 17:08:53 +00: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
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
81ad70c1ea Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: 227e400803 am: c85f67085a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I0e4f9434f53ee7db28d755f18e3772ab7968cca0
2021-05-24 12:28:54 +00: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
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