Commit Graph

84934 Commits

Author SHA1 Message Date
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
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
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
Peter Wang
307c47eb16 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801

Change-Id: Iff4a24436e5ffa001f0ece1b85e90be55eb6ceab
2021-06-17 22:27:19 +00:00
Peter Wang
2c5788b533 Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev 2021-06-17 22:14:50 +00:00
Bill Yi
d2b3465c91 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie592748281a9b71c92a89a4051249a1e1960d21f
2021-06-17 15:07:01 -07:00
Bill Yi
5cc770aba5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63596bc5b219e1992b38afcb6ebdfdf5e28d3ae0
2021-06-17 15:03:16 -07:00
Joe Bolinger
4af5a3644d Update strings for parental consent flow in setup wizard.
Bug: 188847063
Test: manual
Change-Id: I044be874818f6563a47c3f7c8c5011b3cab31ae9
2021-06-17 14:53:56 -07:00
Julia Reynolds
495245e692 Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760

Change-Id: I54dc9d7abf5836a19778a60c8ef2cfbf530a9b4e
2021-06-17 19:43:00 +00:00
Julia Reynolds
fb359d18ff Merge "Validate config activities with their rule owners" into sc-dev 2021-06-17 19:34:43 +00:00
Julia Reynolds
bd8cdf25af Merge "Add a11y text for disappearing preference" into sc-dev am: 848f7a8796
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013597

Change-Id: I838ff3a20e5a21ec1098dffff986715966176e8e
2021-06-17 16:21:26 +00:00
Julia Reynolds
848f7a8796 Merge "Add a11y text for disappearing preference" into sc-dev 2021-06-17 16:03:25 +00:00
Sally Yuen
a1c3689199 Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

Change-Id: Ia280ab95851152cd5756c26891b9bb0187588204
2021-06-17 15:51:43 +00:00
Sally Yuen
afd77763b9 Merge "Add labels to intensity slider and flip labels" into sc-dev 2021-06-17 15:37:32 +00:00
Julia Reynolds
0d937afbb8 Add a11y text for disappearing preference
Test: Talkback
Fixes: 182241259
Change-Id: I99c1ce635c5717e22ee28bc86b51bd3be4b83d91
2021-06-17 14:28:35 +00:00
Jason Chang
dfbb68eb56 Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev am: 55d7d938bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001651

Change-Id: I09d1a8cd67b17fdb81ca24514e592046fa4a6274
2021-06-17 13:18:47 +00:00
Jason Chang
55d7d938bb Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev 2021-06-17 13:00:52 +00:00
Tsung-Mao Fang
c9ffe47342 Collapse app bar while doing search in app page
Prior to this cl, user can see a large space on app bar
while user is doing search on app bar.

In this cl, we enforce to collapse the tool bar in
search case, and we don't allow user can scroll app bar as well.

Fix: 187016306
Test: Play around the search behavior in app page.
Change-Id: I25ba3ef24949cc43989fec4a80f75a24a8d92c07
2021-06-17 20:10:33 +08:00
Tom Hsu
fb7cc99138 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: I84e3e0898d3208b07c2f6057c53e45a412f617d4
2021-06-17 11:34:03 +00:00
Tsung-Mao Fang
232b3ac12a Disable the scrollable ability on app bar area
As title, we do not allow user can scroll app bar while
the search menu is expanding.
So, we can ignore all drag events on app bar.

Test: Can not scroll on the app bar area
Fix: 181741353
Change-Id: I20c0b69059cdc4d13a15abd810a725d4591f6396
2021-06-17 19:29:25 +08:00
Tom Hsu
0279a99e43 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev 2021-06-17 11:23:12 +00:00
TreeHugger Robot
352b6e1b24 Merge "Fix dialog color problem in night mode." into sc-dev am: f026108de5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008367

Change-Id: I8ec160e37a81afd50b9436f1cb7afb3ea0b8d7ca
2021-06-17 11:15:55 +00:00
TreeHugger Robot
f026108de5 Merge "Fix dialog color problem in night mode." into sc-dev 2021-06-17 11:13:33 +00:00
TreeHugger Robot
5ac056d786 Merge "Add click tile event for tracking" into sc-dev am: a5556a6e9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980885

Change-Id: I92163ce5a04cbbc5c3d7e75b0c92fbeb995310a9
2021-06-17 11:06:23 +00:00
TreeHugger Robot
a5556a6e9c Merge "Add click tile event for tracking" into sc-dev 2021-06-17 11:02:55 +00:00
TreeHugger Robot
890f113ca4 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 152a82ebb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008365

Change-Id: I68671d763de39a3a56071752af5f8307e9b616de
2021-06-17 11:00:38 +00:00