Commit Graph

23431 Commits

Author SHA1 Message Date
TreeHugger Robot
f6d3b406b4 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I29eb0e6131cb2d861b29f1f48ef749f727ef26b6
2021-06-10 02:02:16 +00:00
TreeHugger Robot
0a111093bd Merge "Adjust size/position of face education illustrations" into sc-dev 2021-06-10 01:38:21 +00:00
Curtis Belmonte
2f2acef17a Adjust size/position of face education illustrations
Increase the size of the Lottie animation and adjust the margins of both
illustrations shown on the Face Unlock enrollment education screen.

Test: Start face enroll, press accessibility button on education screen

Fixes: 189725079
Change-Id: I40fc174c2ae574ed1a2919e8fab8a62ce90c8d0e
2021-06-09 17:31:56 -07:00
Curtis Belmonte
4f9906769e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I487a6d0dd1bdfb331c765b2e75b8d784bbc22e79
2021-06-09 21:52:51 +00:00
Curtis Belmonte
ac84b879dc Merge "Remove intro text from Face Unlock Settings screen" into sc-dev 2021-06-09 21:41:19 +00:00
TreeHugger Robot
9f76510d0f Merge "Apply android accent color" into sc-dev am: 40f65961a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I1a08bc2ecf340a8a5dfe906bf19a7b35a6308587
2021-06-09 19:36:14 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Curtis Belmonte
f097ad4100 Remove intro text from Face Unlock Settings screen
Removes the intro text from the top of the Face Unlock Settings screen,
since it is now redundant with the help text shown in the footer of this
screen.

Test: Open Face Unlock Settings, ensure intro text is gone

Fixes: 190622232
Change-Id: Ie7880a2e5b1405bf1298e3b9160b7d534fabd1c2
2021-06-09 10:59:06 -07:00
TreeHugger Robot
5ccaa61a2f Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I181cc7e6385a87f40d8632db84e98f4e9b279206
2021-06-09 17:04:12 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
2021-06-09 16:45:54 +00:00
Sunny Shao
20efc0ce3e Fix button is not fully rounded corner issue am: d769667e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I5bb8d0590937d8544cc0eaf50705314d4bfdad07
2021-06-09 15:41:23 +00:00
Sunny Shao
d769667e09 Fix button is not fully rounded corner issue
Fixes: 189903078
Test: manual test
Change-Id: I498e2a9050255801c8c2613c4a933d8a713a0d55
2021-06-09 21:42:06 +08:00
Tsung-Mao Fang
27927f3cb7 Apply android accent color
We should add android accent color to get the correct color.

Test: Icons show up in screen lock page. And see correct color in SUW
flow.
Fix: 190582618

Change-Id: I0d1062288228772fa2ea45103512c8e46793ae9d
2021-06-09 19:51:15 +08:00
PETER LIANG
575ae9574e Merge changes I99fb2ed2,Iba18bfab into sc-dev am: d2c4944cbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14823310

Change-Id: I76e0436b02f078a750562f434bb28e3f81644644
2021-06-09 11:01:22 +00:00
PETER LIANG
d2c4944cbb Merge changes I99fb2ed2,Iba18bfab into sc-dev
* changes:
  Support the lottie image file for the banner in Accessibility Settings.
  Fixing the animation of drawable couldn't play automatically for the banner.
2021-06-09 10:44:10 +00:00
Peter_Liang
3ce3a93e71 Support the lottie image file for the banner in Accessibility Settings.
Action:
Currently, the ImageView component couldn’t handle the lottie image from raw resource folder,  so temporarily using the LottieAnimationView from settingsLib to support lottie image for the banner of Accessibility settings.

Bug: 186065724
Bug: 179451422
Test: atest AnimatedImagePreferenceTest
Change-Id: I99fb2ed26085c73bc262c58001de8dec3078e1d0
2021-06-09 10:11:23 +00:00
Arc Wang
bdb70b1078 Tweak UI of CardPreference and ContextualCard
- CardPreference uses settingslib_preference
  layout to fix title/summary alignment issue.

- Remove stroke for CardPreference and ContextualCard.

- Set colorSurface as default card background color.

Bug: 188599776
Test: manual visual
Change-Id: Id0ee40be60de1f7605849490ee43eae4b9420abb
2021-06-09 17:43:43 +08:00
Arc Wang
7b85f2af24 'Free up space' uses CardPreference
For material next style.

Bug: 188599776
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CardPreferenceTest
Change-Id: Ibaf4d11ab44017453498676db00cff1e49c83b9d
2021-06-09 17:35:33 +08:00
Yanting Yang
4b5b46d5fb Merge "Update homepage summary of Accessibility" into sc-dev am: 426e2cb3e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912494

Change-Id: Ib269cc85aa72efdbbbd71fef2bb5d82eac80312f
2021-06-09 05:47:50 +00:00
Yanting Yang
426e2cb3e3 Merge "Update homepage summary of Accessibility" into sc-dev 2021-06-09 05:44:49 +00:00
Yanting Yang
b458c1d4ab Update homepage summary of Accessibility
Fixes: 190015037
Test: robotests & visual
Change-Id: Iab001452ae240aee3d3d1ebe9d58c96bda66a50d
2021-06-09 12:04:31 +08:00
Edgar Wang
7e4e3c0bfb Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: I8b2fa2bfea2c1b775e3b249020a53a58363f435b
2021-06-09 04:01:48 +00:00
Edgar Wang
b62dedf9c8 Merge "Move Power menu from Gesture to System Settings" into sc-dev 2021-06-09 03:42:44 +00:00
Chen Xu
665c496449 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Ia51097c7d0144d8eb7aba9ee31339ecd81ded445
2021-06-08 20:21:59 +00:00
Chen Xu
35e1f0d189 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Ia624be832a8e3f2764db2f8f5529b64a91e5b2a2
2021-06-08 20:06:21 +00:00
Chen Xu
3bdcdae23f Merge "UK emergency alert app rename" into rvc-qpr-dev 2021-06-08 19:50:39 +00:00
Curtis Belmonte
539ded515c Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: I22bb5932933f71c20417b267c1cad3841bed7652
2021-06-08 19:42:14 +00:00
Curtis Belmonte
99faae35fc Merge "Fix color and asset name for large face enroll icon" into sc-dev 2021-06-08 19:36:05 +00:00
Chen Xu
3b8c6118c1 UK emergency alert app rename
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
(cherry picked from commit f7e3d57023)
Merged-in: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
2021-06-08 18:09:46 +00:00
Edgar Wang
ad973331ea Move Power menu from Gesture to System Settings
- Add icon for Power menu
- Remove from Gesture Settings
- Add to System Settings

Bug: 168176408
Test: manual
Change-Id: Ie7d5530d7e4e32a6db5ce43717131018944bbe28
2021-06-08 17:22:43 +00:00
Giuliano Procida
13ba3ea00d Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: I528cb33907aab069a37fecf24c39de614b5bc0f2
2021-06-08 10:02:19 +00:00
Giuliano Procida
ef0e09f7a3 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev 2021-06-08 09:55:58 +00:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings"
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
2021-06-08 09:47:51 +00:00
Zoey Chen
45e7dcb29d Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439

Change-Id: Ifac9eb03629115f8793b162a7601c019db06f7f9
2021-06-08 09:15:09 +00:00
Zoey Chen
bef9945917 Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev 2021-06-08 09:03:42 +00:00
Tsung-Mao Fang
31c24b9c2f Merge "Apply accent color for password icon" into sc-dev am: d7a35d95c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880639

Change-Id: Ie7eb60996f7e2d23dde0031a1afbfc33771b98b7
2021-06-08 08:33:59 +00:00
Tsung-Mao Fang
d7a35d95c6 Merge "Apply accent color for password icon" into sc-dev 2021-06-08 08:21:04 +00:00
Edgar Wang
58c5ee8f12 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: Iae60c211cd69c771e754f729f2bfb0374c15ca61
2021-06-08 07:36:34 +00:00
Edgar Wang
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00
SongFerng Wang
392b17bca2 Merge "data usage are not left align other item at Network & internet page" into sc-dev am: 5fd29ebeab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880630

Change-Id: I2e56aeaf55a9e66339fa46b9d82e0cc78cca04f1
2021-06-08 06:50:15 +00:00
changbetty
fdd280489b Reordering the network provider UI for mobile and wifi network item am: a47c2b94fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831308

Change-Id: Ic01796f61fe416cba828ead543869446039f0ef6
2021-06-08 06:50:06 +00:00
SongFerng Wang
5fd29ebeab Merge "data usage are not left align other item at Network & internet page" into sc-dev 2021-06-08 06:43:17 +00:00
Zoey Chen
3c4ad08086 [Provider Model] Should not show WiFi call if all sims do not support it.
Bug: 186587557
Test: atest -c NetworkProviderWifiCallingForSubTest
Change-Id: I56c580a7576f162aca5050e090c324b1d7fdb982
2021-06-08 14:39:41 +08:00
changbetty
a47c2b94fa Reordering the network provider UI for mobile and wifi network item
- Reordering the UI option
  - Move the Mobile data network on the top

- Add the divider back (ag/14716097)

Bug: 189912933
Test: Manaul test
Change-Id: I2ebb6429c3d4b5514e18e24f2953917254aa2048
2021-06-08 11:24:30 +08:00
TreeHugger Robot
a96f90a882 Merge "Update string reference" into sc-dev am: df0a84f08a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831291

Change-Id: I20a77c12b58c4c91945ca488780bcb8307050070
2021-06-08 02:54:01 +00:00
Tsung-Mao Fang
fb589448ff Apply accent color for password icon
We should apply accent color for password icons so that
it can adopt the adpative color from system level.

Test: See the screen, and make sure icons apply accent color
Fix: 189717028
Change-Id: I756e5afad2f3dab53ad096d8f5b05e5fc3a1a064
2021-06-08 10:51:13 +08:00
TreeHugger Robot
df0a84f08a Merge "Update string reference" into sc-dev 2021-06-08 02:49:07 +00:00
Betty Chang
bf23b43c87 Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev am: e07e36f609
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841815

Change-Id: I5ddb7cc46b87cc038f7f1d603d7eaf5688a9e701
2021-06-08 02:48:31 +00:00
Betty Chang
e07e36f609 Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev 2021-06-08 02:31:52 +00:00
Quang Luong
bd79d37bdf Merge changes from topic "StaleWifiEntries" into sc-dev am: 08e42fa917
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14882873

Change-Id: I3f1dfc689e63c0401c9ebcc76d3a4e347a9bb2f0
2021-06-08 00:32:37 +00:00