Joe Bolinger
fb515ed608
Add handoff activity to parental consent flow.
...
Bug: 188847063
Test: manual
Change-Id: Ib6f38aae487a536fb8e85d608a22378a17c1bc64
2021-06-18 10:35:35 -07:00
Joe Bolinger
30c3003696
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: I717e9492acf3f3ba054c79f0d807606e7c294e98
2021-06-18 16:41:58 +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
TreeHugger Robot
d92fc0a863
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: Ia5610c79ed70036c0ba4cb7d5f1439c30f317309
2021-06-18 11:03:17 +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
952e1e83d9
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: I52d174530009f6f90fb15d4348291f2a6311fcd5
2021-06-18 09:50:52 +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
7aa152e9f4
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: I5d2da23082f0f4578403688c97593c76f3731653
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
225c690b63
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: Ib7f271ee3a04cf2f30b2eceffb8e1d08148d098f
2021-06-18 08:47:15 +00:00
PETER LIANG
07300f7a0f
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: I556deb4f2a13894af669750d4d77214c52ed6cfc
2021-06-18 08:46:53 +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
159b877d6c
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: I51b498f5ecddff016dc8442fff60f6a0dd4b42a2
2021-06-18 08:18:16 +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
TreeHugger Robot
daa419ff47
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: I0aea93e68267bf2590b17e00a2f1bbbd0d69d54a
2021-06-18 06:14:47 +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
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
3af8b8e678
[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: I8a8c42279a747646bb5c1af212ba3d532809c077
2021-06-18 05:32:16 +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
e800516d76
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: I280791a7273131f5571b494eb61eba29d2276eac
2021-06-18 04:56:54 +00:00
Tim Peng
9aaa97d5d9
Not support group volume control
...
-Disable in Sound Settings
-Remove from Volume Panel
Bug: 189270378
Test: make -j50 RunSettingsRoboTests
Change-Id: Ie4f8be8d694b3c69dd2596a1f88fcb68789eab45
2021-06-18 12:44:22 +08: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
112d5c5a10
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: I1d511fcfa501a45c8ddf29c22a06c3fabdf1a306
2021-06-18 04:17:04 +00:00
Menghan Li
09f24b05a5
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: Ic731068c14a32bf3acbf4c746bd992c49752b0af
2021-06-18 04:16:57 +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
Hugh Chen
8fe8e0fc21
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219
)
2021-06-18 04:02:52 +00:00
Hugh Chen
3d6641a468
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 04:02:42 +00:00
Hugh Chen
65e3c68e6f
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219
)
2021-06-18 03:50:33 +00:00
Hugh Chen
79ae54ca2d
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 03:50:24 +00:00
Hugh Chen
fa504b8e01
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219
)
2021-06-18 03:34:32 +00:00
Hugh Chen
7ce80425ee
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 03:34:00 +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
Hugh Chen
a5046f219a
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219
)
2021-06-18 03:16:31 +00:00
Hugh Chen
80d8b03d02
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219
)
2021-06-18 03:14:41 +00:00
Hugh Chen
f4f2fae306
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 03:14:31 +00: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
Jeremy Goldman
300d35062e
Null check added when updating the roaming status.
...
If the serviceState is null, calling getRoaming will cause a crash.
Instead of calling this method, set the string to not-roaming if the
value is null.
Test: atest -c SettingsUnitTest
Bug: 184334050
Change-Id: Ifa8a006838ea17f7d098c1b83bb6ab0349e7d569
2021-06-18 10:46:30 +08:00
Hugh Chen
9356205dfc
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 02:46:16 +00:00
TreeHugger Robot
0e809b8b40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-18 01:25:06 +00:00
TreeHugger Robot
77e40459d7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-18 01:19:50 +00:00
TreeHugger Robot
c690bdb912
[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: Id3f637814c44c98d682b4364831d5e6c01d6b665
2021-06-18 01:19:07 +00:00
TreeHugger Robot
3820dcdd6e
[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: I1df194c74c60db01f65beecf9964395152f91fe9
2021-06-18 01:18:49 +00:00