TreeHugger Robot
|
a69ea45cf7
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-07-03 03:32:18 +00:00 |
|
Bill Yi
|
d1c91f40f0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1503e7f3d4e33f27c52e28f9327bc258b3531281
|
2021-07-03 00:16:19 +00:00 |
|
Bill Yi
|
ba970ea415
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id5f86f1661d49b0f77deb46f241c947a7a3de59a
|
2021-07-03 00:11:33 +00:00 |
|
Hugh Chen
|
346b049fb1
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I9c044bc08439ecd3132b3bacd0d47eddd9ccebb0
|
2021-06-28 07:07:01 +00:00 |
|
Hugh Chen
|
c91f8b0991
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I0b6e2fe7b4b98afe4f5eb906b515177f09621946
|
2021-06-28 07:06:57 +00:00 |
|
Hugh Chen
|
2a2a81dea5
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I7d2147f3fc8860e58a4d8cb4e15eb4b09d000c9c
|
2021-06-28 06:57:36 +00:00 |
|
Hugh Chen
|
064bf9dd81
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I92ba93b2dccd7fd440b303c241c564af03721944
|
2021-06-28 06:57:32 +00:00 |
|
Hugh Chen
|
b8aa9ad04d
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Id2fe388de56c84cd91effebf9b47e376fcf85e2f
|
2021-06-28 06:47:52 +00:00 |
|
Hugh Chen
|
d9fc75875e
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I389f623a1ac3a900c6c896ce363d3db1ca8a03d7
|
2021-06-28 06:47:48 +00:00 |
|
Hugh Chen
|
c6362e92e8
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ia9b38945171dae15032adfce0b20756aa32c478b
|
2021-06-28 06:37:13 +00:00 |
|
Hugh Chen
|
e849d212b7
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I607bc56a88f50087d9e466eaad9a67d0f016463d
|
2021-06-28 06:37:12 +00:00 |
|
Hugh Chen
|
368ba20c95
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I3967969e09f69542cc461ca818d5024e7fe33f48
|
2021-06-28 06:37:08 +00:00 |
|
Hugh Chen
|
3f2394bbc7
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I810f4769b8a1c55306af2d8fbda1da427a06f48b
|
2021-06-28 06:37:08 +00:00 |
|
Hugh Chen
|
a539c36421
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
|
2021-06-28 06:37:04 +00:00 |
|
Hugh Chen
|
dbcebc42bf
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
|
2021-06-28 06:37:00 +00:00 |
|
Hugh Chen
|
0cfe42b287
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ibf35314504458240ec753c062f284225508701bd
|
2021-06-28 06:19:08 +00:00 |
|
Hugh Chen
|
367921a80d
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I315047b2c175ac29474ad3b0a261d26d2745e4d8
|
2021-06-28 06:19:04 +00:00 |
|
Hugh Chen
|
499cfe303f
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I3a2ddb2b2f8a2050dc017d2e3b4d9cf840d3a7dc
|
2021-06-28 06:18:59 +00:00 |
|
Hugh Chen
|
87426af532
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I8d89f0ac05df88cd680a15e8c64c2133b1619e53
|
2021-06-28 06:18:56 +00:00 |
|
Hugh Chen
|
c551f39977
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Ifef9d53b072a081c2c78437e4bc77e511024092a
|
2021-06-28 06:14:41 +00:00 |
|
Hugh Chen
|
9316df9560
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Ic3ca73d1126a07c955e10b7871b9ccec0038b60d
|
2021-06-28 06:14:38 +00:00 |
|
Hugh Chen
|
3fcb9c9811
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: I265d8d2c13c97463ba2d9449e68925199b90be3c
|
2021-06-28 06:14:35 +00:00 |
|
Hugh Chen
|
9f4308daa2
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: Ia1ad9ee7da0a972a3a97aca68d2fb8b6f3061d24
|
2021-06-28 06:14:30 +00:00 |
|
Hugh Chen
|
505cc44596
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ic4237a93471f2064896492eb607447620c0fc21a
|
2021-06-28 06:07:26 +00:00 |
|
Hugh Chen
|
1fe494db11
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: If38bb4a7880b0771648410c2dc11285e07008b34
|
2021-06-28 06:07:20 +00:00 |
|
Hugh Chen
|
a11ed686d4
|
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I66e622edb04b797035548be5e8e5bff1585d44a1
|
2021-06-28 06:07:14 +00:00 |
|
Hugh Chen
|
91d5f08e39
|
RESTRICT AUTOMERGE Update string am: 9356205dfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: I39be0753d272bcde0b4ade53ae3afc74a67155f8
|
2021-06-28 06:07:09 +00:00 |
|
Hugh Chen
|
d351303e36
|
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I311472b1f9d27cc4a7da875150741f0eb51e573f
|
2021-06-28 06:06:01 +00:00 |
|
Hugh Chen
|
3f493a3078
|
RESTRICT AUTOMERGE Update string am: 7ce80425ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I9c8fabb01ea2cf69b2714523b361f50a5a597561
|
2021-06-28 06:05:58 +00:00 |
|
TreeHugger Robot
|
28dbcbf459
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-06-26 05:13:39 +00:00 |
|
Bill Yi
|
aa649a6fe5
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1b011f8ce25dbc3fdb374eddf0b9c13015907427
|
2021-06-26 03:07:35 +00:00 |
|
Bill Yi
|
ef757416ab
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I35a2f4eb8cce153bb6829fefd265c2f9251fca8b
|
2021-06-26 03:02:32 +00:00 |
|
TreeHugger Robot
|
483f978ba7
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-06-24 20:02:41 +00:00 |
|
Bill Yi
|
8198514a9f
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I94d39b7145cec9ac42f49e6debb051cfe5fa59c6
|
2021-06-24 15:20:40 +00:00 |
|
Bill Yi
|
a6df60ab6b
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifff56e70e67db8993c9fd789cdb86c471172329e
|
2021-06-24 15:15:22 +00:00 |
|
TreeHugger Robot
|
d768d1b3b1
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-06-20 18:11:44 +00:00 |
|
Bill Yi
|
e1e77e7c1f
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib780c3fa72b2f9e7f50c0e99a3be71e857c99419
|
2021-06-20 10:21:37 +00:00 |
|
Bill Yi
|
57bd12b969
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id369ce159e6764a4709384de39ccebb780fe0d8f
|
2021-06-20 10:16:43 +00:00 |
|
Bill Yi
|
e4491f38fe
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibbd38194fc7cd9d2de7c28a8dc424b54e912904a
|
2021-06-19 20:55:30 +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 |
|
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
|
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
|
33ddf7c74d
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-06-15 15:14:44 +00:00 |
|
Bill Yi
|
e2b8fbafa3
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I38b2b159f3e0003a8ad9702a5b24c88cf8b5d7cc
|
2021-06-15 13:25:35 +00:00 |
|
