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
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
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
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
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
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
7b6ac5b5f9
Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e am: 82b402fb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092
Change-Id: Iccd1b99438004e133e83f78f216d37e67fba0396
2021-05-24 07:25:57 +00:00
Alex Li
73c1067444
Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76 am: f54063e13b am: cd5efe2f6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091
Change-Id: I441dcb7c793909a9a1f9fef3cd2acd6550913166
2021-05-24 07:25:31 +00:00
Betty Chang
82b402fb4c
Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092
Change-Id: I13b9036bc456124600a2917656000aadd8d26e25
2021-05-24 07:11:07 +00:00
Alex Li
cd5efe2f6d
Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76 am: f54063e13b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091
Change-Id: I2badb3cffc24031ad6e095b7f022de71917cc84d
2021-05-24 07:10:55 +00:00
Edgar Wang
080bb2840e
Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe am: f81739cdc6 am: b26f5cc21d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956
Change-Id: I373b24691226d79449a358fb07cf6492c901f2e8
2021-05-24 06:52:26 +00:00
Betty Chang
2a5f886ad4
Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092
Change-Id: I2f2c5e24384f5302fa61c7682f0fd961dfdde2ab
2021-05-24 06:51:05 +00:00
Alex Li
84e503f57f
Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091
Change-Id: Ie266b69270ab3c64659ce9df4ea80a1bb0a4bc81
2021-05-24 06:50:51 +00:00
Betty Chang
4246049c7c
Merge "Remove the Network rating provider item" into sc-dev
2021-05-24 06:42:10 +00:00
Alex Li
d647dece76
Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev
2021-05-24 06:32:09 +00:00
Edgar Wang
f81739cdc6
Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956
Change-Id: Ib728b7f4de24832630c8e28fe0b43d9a2cb45411
2021-05-24 06:20:39 +00:00
Edgar Wang
54aacf80fe
Merge "Align the items in account sync page to the start border" into sc-dev
2021-05-24 06:08:30 +00:00
ykhung
3ad391b0de
Move load battery consumer icon and label into the background
...
move high latency icon and label loading into the background thread to
improve the performance and first frame response time, which is also the
pre-work for checking whether a item is tappable or not feature (will
work this on the next patch)
Bug: 188751551
Test: make SettingsgRoboTests
Change-Id: I4e5712e995fce055d2735135c28be60fb70e5796
2021-05-24 13:57:14 +08:00
Ryan Lin
807915722e
Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: f8688671f7 am: 09f73edb4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928
Change-Id: I511e04cbf7f32ae3ef061dc2ba5391296bf5bd78
2021-05-24 04:15:35 +00:00
TreeHugger Robot
86947a85a9
Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: e250b21c41 am: bbb887c51b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951
Change-Id: Ib9e275c4fe7defe4564ba73066488327e706e399
2021-05-24 04:15:24 +00:00
Ryan Lin
09f73edb4e
Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: f8688671f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928
Change-Id: I81e7cbc3fb7249c073fc854236bfc2c5e198f1e9
2021-05-24 03:59:00 +00:00
TreeHugger Robot
bbb887c51b
Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: e250b21c41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951
Change-Id: I20a03bc69fb7ae990b1af8d2ff8676adf159b3d7
2021-05-24 03:58:55 +00:00
Ryan Lin
0753ba3e8b
Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928
Change-Id: I9c98831688f1fd743723bb54e672ee99d1fd0b5b
2021-05-24 03:49:17 +00:00
Ryan Lin
31389702ad
Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev
2021-05-24 03:41:39 +00:00
TreeHugger Robot
14c2dfadb0
Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951
Change-Id: Ib26fc131216d2c423c176be6a0ec2a3e7de20f27
2021-05-24 03:40:15 +00:00
TreeHugger Robot
9081a2e67d
Merge "Update Policy transparency dialog to new style" into sc-dev
2021-05-24 03:28:04 +00:00
Jason Chiu
4b1d1e21d5
Align the items in account sync page to the start border
...
The prefernces haven't been applied to the SettingsLib preference theme
which sets iconSpaceReserved false.
Fixes: 187670431
Test: visual, robotest
Change-Id: Ifa797fbec4f207248fd0254e26d456b8889e25d8
2021-05-24 10:13:53 +08:00