Commit Graph

61636 Commits

Author SHA1 Message Date
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
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
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
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
Bill Yi
a333febed9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic1ba09681a73f7f35074acdfcd16e282b4100f8d
2021-06-15 13:20:30 +00:00
TreeHugger Robot
ffe95b65ac Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-07 04:58:39 +00:00
Bill Yi
509a162ad5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7d3900e4010febbecd776f59089d71ae01456432
2021-06-07 03:22:51 +00:00
Bill Yi
3dbdb383ad Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ce0771c0f32c3419e9eba1271d11111106bfcde
2021-06-07 03:18:04 +00:00
TreeHugger Robot
37e8f3f696 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 19:26:07 +00:00
Bill Yi
79ef9e3fc8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0518e9fef6a8e2d3ed71fda6d3acd6a5f8553b2
2021-06-03 14:32:28 +00:00
Bill Yi
f79b09d2bd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id7cdf9e26a6376493b203dfb8d6eb7dd777af745
2021-06-03 14:29:03 +00:00
TreeHugger Robot
5c5e8579cf Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-31 05:04:45 +00:00
Bill Yi
db4a604c10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I14a255e902a8b9670bb8b5ce796e96c295a5fde6
2021-05-31 03:52:37 +00:00
Bill Yi
45d13dfdbb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0862f4e36f4023fd0d97074affdcef87a99d54f1
2021-05-31 03:49:16 +00:00
TreeHugger Robot
695cdae2f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-27 18:48:17 +00:00
Bill Yi
9a44ce2abe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ceb03127a48ec7405f24bcdde2cd3a8114fcea1
2021-05-26 23:16:39 +00:00
Bill Yi
a886dcf23a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0d8a1473ca1725a868d640a7b4f067b8aff0777
2021-05-26 23:13:11 +00:00
TreeHugger Robot
a75a0302cc Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-25 14:45:06 +00:00
Bill Yi
59ac543b64 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I964441336c24c244ca92aaf765945b5dfef8ce5e
2021-05-25 06:31:49 +00:00
Bill Yi
506958aa2c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifc7754e3f3dc8bb0ec41e688390e4ac8c5e6ae36
2021-05-25 06:28:30 +00:00
Bill Yi
cbfc8c9e40 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0434b33264bc49e44dd206093ebfbb32e3484cc
2021-05-22 12:32:06 +00:00
TreeHugger Robot
16b96cf63b Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-20 14:19:32 +00:00
Bill Yi
99932d0fd0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id7ed57d4aed6b801f9819e5709c117b838b5f0fc
2021-05-20 06:05:51 +00:00
Bill Yi
2098a1780e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8595270cabb005ca6a64f0c5503728ae2464f5a0
2021-05-20 06:02:34 +00:00
TreeHugger Robot
7659a826c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-18 15:09:42 +00:00
Bill Yi
9afa4248cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iad8f93395efff8ba022148339bd3f5315c34cdfa
2021-05-18 07:39:35 +00:00
Bill Yi
f44fef2834 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8d2a14d7fe038edf738a1fec382328f8a8564f67
2021-05-18 07:36:05 +00:00
Bill Yi
933340766b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6b43d54021ed1e8ecefdb22b2514125e9af47e41
2021-05-13 09:37:45 +00:00
Jakub Pawlowski
694f25b2c7 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882

Change-Id: I5c4bcf5792f7e9a5564444bb5d5c98f473e1b619
2021-05-12 20:57:33 +00:00