Joe Bolinger
24f6ac00a0
Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786
Change-Id: I249e368ccdf54d31912bde1c07ed8acee8f43f86
2021-06-18 20:43:29 +00:00
Joe Bolinger
18c58e9c11
Merge "Minor language changes for enrollment flow." into sc-dev
2021-06-18 20:31:28 +00:00
Julia Reynolds
7c5f01e560
Clean up notification settings am: 6a603e7f4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783
Change-Id: Id71b02bdc58f92e8c7cf170d1613d3bfc49c81ab
2021-06-18 19:59:09 +00:00
Joe Bolinger
f030dfe110
Minor language changes for enrollment flow.
...
Bug: 188847063
Test: manual
Change-Id: I3014255e45dbe2e07de505b3ab80258ab1903281
2021-06-18 11:57:39 -07:00
Julia Reynolds
6a603e7f4b
Clean up notification settings
...
- Reorganize settings
- Fix dividers
- Add icons
- Fix titles
- Fix colors
- Fix indentation
- Add summaries
Fixes: 190079590
Test: manual inspection, robotests
Change-Id: Ia03219575d3b0c78f9f9b088aa3cdaa29cfdf412
2021-06-18 14:36:20 -04: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
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
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
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
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
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
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
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
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
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
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
Xin Li
eb885ad642
DO NOT MERGE - Mark RQ3A.210410.001 as merged
...
Bug: 190855093
Merged-In: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
Change-Id: Ieddc2c352e9f0228d3e4c4525054fa6bad106328
2021-06-17 22:43:30 -07:00
Weng Su
98cf86b367
Add a loading progress timeout mechanism to Internet Settings
...
- The WiFi scan results may not be called back, need to add loading
progress timeout to avoid loading forever
Bug: 191336310
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I71071e7e68007cf7e16be46230eec3b01f4d2b45
2021-06-18 13:43:14 +08:00
Bill Yi
5774cb752e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48bc88cdf0
-s ours am: c562baf357
-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: I3bc71910f2a6e724662b74468ec10f870779755c
2021-06-18 05:32:03 +00:00
Bill Yi
c562baf357
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48bc88cdf0
-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: I6cfac0603271a848a27061f42c38fcac4fd2e4eb
2021-06-18 05:19:27 +00:00
TreeHugger Robot
1517558863
Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev am: 7725637ad8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021912
Change-Id: I5edfdfbae0f37c1fe2ccd79385db28782036d756
2021-06-18 04:55:55 +00:00
TreeHugger Robot
7725637ad8
Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev
2021-06-18 04:40:21 +00:00
TreeHugger Robot
821d76a0bd
Merge "Collapse app bar while doing search in app page" into sc-dev am: c330b2c4f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013110
Change-Id: I07bc60239ae17e5c03ffe82572da5d25dc09e52b
2021-06-18 04:17:08 +00:00
Menghan Li
a8f639f6df
Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135
Change-Id: I1771c20a4dc490f5cc125d78199e8cb209190924
2021-06-18 04:17:01 +00:00
TreeHugger Robot
c330b2c4f4
Merge "Collapse app bar while doing search in app page" into sc-dev
2021-06-18 04:11:27 +00:00
Menghan Li
7159bd4330
Merge "Add strings for use accessibility gesture" into sc-dev
2021-06-18 04:07:12 +00:00
Arc Wang
248970aad7
Fix negative size when size is greater than 2,147,483,647
...
Java integer max is 2,147,483,647, it's about 2GB.
Use getLong to get size from provider instead of getInt.
Bug: 190721008
Test: manual visual
Copy video files more than 2,147,483,647 bytes
and observe Videos size information.
Change-Id: Ic804db43554fdd580627faebecfe30d9ad2a9120
2021-06-18 11:30:18 +08:00
Bill Yi
48bc88cdf0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7987e83cb8ec682adf8e7ef9d8a616e35be530fe
2021-06-17 20:16:52 -07:00
menghanli
d013763aac
Add strings for use accessibility gesture
...
Bug: 190563948
Test: Manual test
Change-Id: Idbd796d3102d404341a0b75b406151e4f0bd57fd
2021-06-18 10:48:47 +08:00
TreeHugger Robot
37b855f44a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: Ieb4d0ed887b92329d03b7b2651f1936f22a69a26
2021-06-18 01:19:24 +00:00
TreeHugger Robot
8210206504
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I08bcfc57ea0a12a9b1f93cfd3ebdc450108cfcfb
2021-06-18 01:18:56 +00:00
TreeHugger Robot
a7703602b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-18 01:07:32 +00:00
TreeHugger Robot
a23758349e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-18 01:06:12 +00:00
TreeHugger Robot
3319bbdd3d
[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848
-s ours
...
am skip reason: Merged-In I1cc3796f31e7db3d8f062436ebc618d93db19822 with SHA-1 38d3b0fa18
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974612
Change-Id: Ida0de335047c2cebe9f86810c9fdd529738fdc41
2021-06-18 00:51:54 +00:00
TreeHugger Robot
d9e78dc848
Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master
2021-06-18 00:31:00 +00:00
Bill Yi
08386bd061
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f25f1144169f8b43cd6154d9e63a56f1a00823e
2021-06-17 23:57:02 +00:00
Bill Yi
1809285e19
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieae8de32be4db5d051cab939e23327b3f533cb8f
2021-06-17 23:53:26 +00:00