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
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
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
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
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
Peter Wang
70fec74fe6
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: Id08d349c376211cb3530009945c58cdcd31b0f46
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
Xin Li
7d73dec24c
DO NOT MERGE - Merge ab/7272582
...
Bug: 190855093
Merged-In: I1cc3796f31e7db3d8f062436ebc618d93db19822
Change-Id: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
2021-06-17 21:56:04 +00: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
bfe49de437
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: Id0f8925693cf961f46d41bc7d8cbb25fccae82b8
2021-06-17 19:42:05 +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
35e339f6e3
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: I15a1e3ca1492a82605db85d030548ed64865ab34
2021-06-17 16:21:23 +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
9281ab108a
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: I94773c1e42aedeaad78cd8b539cdccb43591e336
2021-06-17 15:51:41 +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
f920a39c43
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: Ica8c8aacb4dd5124d7e19338814a30fc70d08294
2021-06-17 13:18:28 +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
d332493def
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: If5720ff1bd460f7a311a5c87d0366282a51cf8fc
2021-06-17 11:33:21 +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