TreeHugger Robot
6d90f29df6
Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev am: 7725637ad8 am: 8f68f5c3db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021912
Change-Id: Ifa97f7d954838b95de373e7f6010edd4bfa74c6a
2021-06-18 05:10:47 +00:00
TreeHugger Robot
1e64e35a33
Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev am: 7725637ad8 am: 1517558863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021912
Change-Id: I1b4e3540d0aef4d5a6acfd922da883aad6871fc0
2021-06-18 05:07:08 +00:00
TreeHugger Robot
8f68f5c3db
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: Ic670866dad4fd6916199c1a7ca147794708bdfa6
2021-06-18 04:57:40 +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
df71236e35
Merge "Collapse app bar while doing search in app page" into sc-dev am: c330b2c4f4 am: 821d76a0bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013110
Change-Id: I8b33c496aa2c076f4de86331ca668a643deead74
2021-06-18 04:30:46 +00:00
Menghan Li
10e95e92a4
Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330 am: a8f639f6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135
Change-Id: I5d08bb915a01bb516b3c2401dbfe8ea869036ba0
2021-06-18 04:30:42 +00:00
TreeHugger Robot
6f4ac7e883
Merge "Collapse app bar while doing search in app page" into sc-dev am: c330b2c4f4 am: 916772daa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15013110
Change-Id: Ifcd27fca762a3581a2633409a72d96e1a1595787
2021-06-18 04:30:35 +00:00
Menghan Li
6e70ad1bcd
Merge "Add strings for use accessibility gesture" into sc-dev am: 7159bd4330 am: add465f4b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016135
Change-Id: Ifb11bb87fbc6c89aee66f4c4d0d68d58c33a5e04
2021-06-18 04:30:21 +00:00
TreeHugger Robot
916772daa8
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: Ifa823bbb7d43f8c60c02e0ea0caf97ff5bc848fd
2021-06-18 04:17:56 +00:00
Menghan Li
add465f4b1
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: I39e921d220af9a3c9029fd717910ad48865fa58b
2021-06-18 04:17:45 +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
14b6ec062d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours am: 37b855f44a -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: I048db91b450a46f856b40177b998ba64eee99e0e
2021-06-18 01:35:45 +00:00
TreeHugger Robot
db0301401a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours am: 8210206504 -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: Ieab624bef71be48b50d2ab898894f8cc47351380
2021-06-18 01:35:22 +00:00
TreeHugger Robot
ae96d77bde
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0 -s ours am: 69d0cef2ab -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: I0ce0bb227a13ebd53991eb393023a1eef7fd48e1
2021-06-18 01:35:11 +00:00
TreeHugger Robot
c7e159134e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e -s ours am: 8180908fe4 -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: I8c10831ee52d4e970b3d7513c12318d5236d946b
2021-06-18 01:34:58 +00:00
TreeHugger Robot
69d0cef2ab
[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: I5c531a2ebbd17246d09489c7e3e89d4cabe4b837
2021-06-18 01:19:55 +00:00
TreeHugger Robot
8180908fe4
[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: I73f0d13a61be33c110d1b757c8e5f1ea5952d31d
2021-06-18 01:19:40 +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
7fad2b79b2
[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848 -s ours am: 3319bbdd3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974612
Change-Id: I2651afe3d3db826c1b46982ff017f32db2087d68
2021-06-18 00:57:11 +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
1286161dff
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 70fec74fe6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: I8009fa916422e825b0e96b11ba5edb5ea7894e57
2021-06-17 22:47:46 +00:00
Peter Wang
c0b5a210ab
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533 am: 4a17c2ce85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: Ic5bc3e0e75a09683a9506a349d8a23299bfc150a
2021-06-17 22:47:27 +00:00
Peter Wang
4a17c2ce85
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: Iafb5583a51966b5620cdf383885765cdeb0d8284
2021-06-17 22:28:10 +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