Commit Graph

84414 Commits

Author SHA1 Message Date
Joe Bolinger
b41e6f1891 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: I2ba11356af233c13224f4f3113a90e7c68520962
2021-06-18 16:42:52 +00:00
Joe Bolinger
d1935d9166 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: If0c6901245d3d99af5c16dd3f1304222f6fd1e82
2021-06-18 16:42:03 +00:00
Joe Bolinger
d93f9c0df3 Add plumbing and placeholder screens for parental consent flow. am: a8808f7368
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939648

Change-Id: Ic145a1ccf5f1655d60832c740cfb14112fa4dd58
2021-06-18 16:42:01 +00:00
Joe Bolinger
0fcac8bf0d Merge changes from topic "unicorn-1" into sc-dev
* changes:
  Update strings for parental consent flow in setup wizard.
  Add plumbing and placeholder screens for parental consent flow.
2021-06-18 16:28:27 +00:00
Xin Li
9ee53d896a [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e774cf9cd3 -s ours am: 8fb9108c37 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15024196

Change-Id: Ib4a0331d977f8ffa744767388a5367a746385bfe
2021-06-18 11:54:22 +00:00
Xin Li
8fb9108c37 [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e774cf9cd3 -s ours
am skip reason: Merged-In I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15024196

Change-Id: I6f8d81d2fa7d313ea79e1433a2c16a3145e4f2a9
2021-06-18 11:42:23 +00:00
TreeHugger Robot
5a3395ec74 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: 0c0bc06511
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: I3ff14d29f5a30c15f00e495aa8ddcc57f91a6682
2021-06-18 11:17:38 +00:00
TreeHugger Robot
36e5af8c6c Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: 3fbade73be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: I8aeb029eaa5d75a958222bc558d603b223627f29
2021-06-18 11:17:18 +00:00
TreeHugger Robot
3fbade73be Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: If71cfd75f2d09effdad8125e6b9df196343017fa
2021-06-18 11:04:03 +00:00
TreeHugger Robot
0c0bc06511 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: If8255a8b6cda0aa6c1b6c479dc68693e3c125d77
2021-06-18 11:03:15 +00:00
TreeHugger Robot
d6b3885ef5 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev 2021-06-18 10:45:20 +00:00
Yi-Ling Chuang
357b08a63e Revert "Disable RecyclerView animation to fix the broken UI"
This reverts commit 5b219a34ab.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I47ceb8d043e3b02a59e43a1ae021c3c7855cbe57
2021-06-18 10:45:13 +00:00
Edgar Wang
39e68c5839 Move ic_info_outline_24 from SettingsLib to Settings
- we share info icon with FooterPreference and some widgets in Settings
  But we may update FooterPreference icon when UX guideline update, so
  we should seprate this icon from FooterPreference and Settings.

Bug: 191267392
Test: manual
Change-Id: I200b0cc4f4a04bd8950d4cac9683930a473ffe3e
2021-06-18 10:22:58 +00:00
SongFerng Wang
0117964ae2 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: 3bfb649c29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: Iab86f12a981d5779e71bb91aef0bad578f93ee45
2021-06-18 09:59:28 +00:00
SongFerng Wang
001395533a Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I53b5181da7fb682b00ad628b5df0b4e71d13a64f
2021-06-18 09:49:55 +00:00
Jason Chiu
8baa79302f Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba am: 41ead280bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: Ic1997cd8a692b0fcc3e49b3a13d723eda6eabb17
2021-06-18 09:49:50 +00:00
SongFerng Wang
3bfb649c29 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I572b167d39ebce9442821578c048ad6c9ddb5b06
2021-06-18 09:49:10 +00:00
Jason Chiu
8de7ebb3af Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba am: 36fca1dc05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: I25f71f7147bceed23612d283dbb204ae5989fd2f
2021-06-18 09:45:47 +00:00
SongFerng Wang
efcce7f70f Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: Id7c7674718446ae42f0280d7632d7a05a7d93ebb
2021-06-18 09:40:56 +00:00
SongFerng Wang
7e4b664df0 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev 2021-06-18 09:38:18 +00:00
Jason Chiu
41ead280bf Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: I3ec8756ad36a8119bfcc94395eba82586fbc3787
2021-06-18 09:35:28 +00:00
Jason Chiu
36fca1dc05 Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: I380be32fc134da04e336ee2d7c9c05aad44a236c
2021-06-18 09:34:39 +00:00
Jason Chiu
3ab404c6ba Merge "Support category changed mechanism in homepage" into sc-dev 2021-06-18 09:25:46 +00:00
TreeHugger Robot
69d3789dd8 Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf am: 51ec7c2a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361

Change-Id: Ie5ab0a5057ddfd3036bb26e2cfc8d38432f164ce
2021-06-18 09:04:20 +00:00
PETER LIANG
b481ecd0ea Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf am: d412e4f1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: Idd05fd2e8b209831b12d2bc3c022be6014e405b3
2021-06-18 09:02:27 +00:00
TreeHugger Robot
9b26d320f0 Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf am: 6c93652bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361

Change-Id: Ice5b097765d119bad403e318dd2f150c196c8db4
2021-06-18 08:57:14 +00:00
PETER LIANG
0bcad0e03d Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf am: 5883cbebdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I899056c00c74002ecea1cba94d67105362985ea4
2021-06-18 08:57:10 +00:00
TreeHugger Robot
51ec7c2a4f Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361

Change-Id: I0f7ef9188b0e551cbf7c9c1f7d4e26ca43a4bcb4
2021-06-18 08:48:06 +00:00
PETER LIANG
d412e4f1bf Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I469b93b326f939cc6d9e8e299b8f58666514feeb
2021-06-18 08:48:00 +00:00
TreeHugger Robot
6c93652bad Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361

Change-Id: Ief30f3156932454ff799cb32e2529ccf13f7c4b7
2021-06-18 08:47:22 +00:00
PETER LIANG
5883cbebdb Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: Iba20a0eb36026c2f72070ad22d2fed3c382b9453
2021-06-18 08:47:13 +00:00
TreeHugger Robot
e89c4fa82c Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe am: d9776becdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I4c3a84b25706cac2ec726897d92be2b2af4c50dc
2021-06-18 08:39:11 +00:00
TreeHugger Robot
86a3084cdf Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev 2021-06-18 08:35:19 +00:00
PETER LIANG
909e3bbccf Merge "Update the Lottie images for Accessibility features." into sc-dev 2021-06-18 08:32:55 +00:00
TreeHugger Robot
0a420d07a9 Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe am: 56be44e4b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I829f8115a84cb631688b28e7f2aad7093bf7008c
2021-06-18 08:27:37 +00:00
TreeHugger Robot
d9776becdb Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: Ieb5db408bea40602e72924dfc35869c6681ff87a
2021-06-18 08:18:48 +00:00
TreeHugger Robot
56be44e4b9 Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I102131cb18a9538c5ee5e17deda7336f899af1f3
2021-06-18 08:18:15 +00:00
TreeHugger Robot
0781c52dfe Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev 2021-06-18 08:08:19 +00:00
Jason Chiu
c713c3e8ea Support category changed mechanism in homepage
- Homepage cannot referesh UI whenever an injected component is changed
- Extract categories related codes to a mixin

Test: manual, robotest
Fixes: 179792445
Change-Id: I1c13c541ce07b9c36fe984a035623985b5603560
2021-06-18 16:00:29 +08:00
SongFerngWang
c9a9faf5b8 Add the confirmation dialog when user disable mobile data at first time
Bug: 189983549
Test: atest ProviderModelSliceTest
Change-Id: I83fcadb07e4f8dff5d07bc4015c0c6004c4f5de5
2021-06-18 15:58:58 +08:00
Xin Li
a826a1f9dc [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: eb885ad642 -s ours am: 13850fbe4d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15023961

Change-Id: Icbc36e581876fea32ec022f50d76a6f929225dfd
2021-06-18 06:34:14 +00:00
TreeHugger Robot
de1c41a989 Merge "Disable the scrollable ability on app bar area" into sc-dev am: 4dc80769d5 am: a95c1f9119
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15012271

Change-Id: Ib6704f3dcfe3e4e5bc9d4e8bd0da52b8290f0705
2021-06-18 06:29:27 +00:00
TreeHugger Robot
5c75d8665c Merge "Disable the scrollable ability on app bar area" into sc-dev am: 4dc80769d5 am: a2dc03d7a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15012271

Change-Id: Ic46bba3427eff25ecce6c854dda7022c81780849
2021-06-18 06:26:39 +00:00
Xin Li
13850fbe4d [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: eb885ad642 -s ours
am skip reason: Merged-In I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b with SHA-1 7d73dec24c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15023961

Change-Id: I74c60e7cb052baf6f85e387d9737ec3a401a5020
2021-06-18 06:18:42 +00:00
Xin Li
e774cf9cd3 DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
Change-Id: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
2021-06-17 23:16:37 -07:00
TreeHugger Robot
a2dc03d7a1 Merge "Disable the scrollable ability on app bar area" into sc-dev am: 4dc80769d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15012271

Change-Id: Ib92560a29d449d0f841e1e2d0716d50378bc6b26
2021-06-18 06:15:48 +00:00
TreeHugger Robot
a95c1f9119 Merge "Disable the scrollable ability on app bar area" into sc-dev am: 4dc80769d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15012271

Change-Id: I3bd0ec26d8082cd3259c3ad76e27f866a1b96441
2021-06-18 06:13:48 +00:00
Peter_Liang
3d1f4eab3f Update the Lottie images for Accessibility features.
Features:
1.Time to take action
2.Extra dim

Bug: 186065724
Test: manual test
Change-Id: Ia1a6dbd703545ce70310d8c076e6ac4079a08daa
2021-06-18 14:01:49 +08:00
TreeHugger Robot
4dc80769d5 Merge "Disable the scrollable ability on app bar area" into sc-dev 2021-06-18 06:00:51 +00:00
Bill Yi
ab92847ffe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48bc88cdf0 -s ours am: c562baf357 -s ours am: 5774cb752e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15023091

Change-Id: I9a63f74076422d50a7b102b3475b18b945ce470c
2021-06-18 05:44:49 +00:00