Commit Graph

36850 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Pasty Chang
fbf5506b86 Migrate summary text in wifi QR scan page to DescriptionMixin
The description in the setup flow would follow the new style to align to the left.

Bug: 188593594
Test: atest & manual
Change-Id: Idfc00f51710d725d5c653396902446f29861cb88
2021-05-24 03:24:26 +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
Curtis Belmonte
502a18ddc9 Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880

Change-Id: Id98a29e882fad49d4629bf34f8b1ada75e288b1f
2021-05-21 23:52:36 +00:00
TreeHugger Robot
2392ac66e1 Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085

Change-Id: I6526b369a98d59f31788d3bc02357947cb43d646
2021-05-21 23:52:07 +00:00
Chen Xu
569a14d0d9 Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209

Change-Id: Iace3a9e910d0b623f571d51f9b505f4878f69ce7
2021-05-21 23:51:57 +00:00
Curtis Belmonte
0327293c3c Merge "Update Face Unlock strings to the latest versions" into sc-dev 2021-05-21 23:40:40 +00:00
TreeHugger Robot
c8b025cc7f Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev 2021-05-21 23:34:55 +00:00