PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,714 Commits 1 Branch 0 Tags
c71f1a2fcefd20b5647d395eeec3d13b02b5df89
Commit Graph

61714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jakub Pawlowski
72cda9d96c Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ic9497921a93fb77c05f2d396503f0b3764734586
 2021-05-12 20:57:26 +00:00
Jakub Pawlowski
8ae86914d6 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -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: I1cd894a5924c4afc52256d85f9a19da5a2cede22
 2021-05-12 20:36:51 +00:00
Jakub Pawlowski
c714533fd2 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I47b6e2b3de493030adfd49bfeb4aabaf16046771
 2021-05-12 20:36:41 +00:00
Jakub Pawlowski
31c29a0791 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -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: I145082eccf613bb5729b67a7f58a34f3c913184e
 2021-05-12 20:19:24 +00:00
Jakub Pawlowski
52ea712e3b Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ied144c16d607921281d10783a77ae0d46885d757
 2021-05-12 20:19:16 +00:00
Jakub Pawlowski
8797825bc1 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -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: I65f86808c2d2455c98c022ad52680597c58ff148
 2021-05-12 20:04:53 +00:00
Jakub Pawlowski
d6ed1528cb Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882

Change-Id: Iddc0d74ef10d404f8463544683cc913656346a34
 2021-05-12 19:47:21 +00:00
Jakub Pawlowski
9d99e0b3ff Prevent drawing on top of DevicePickerActivity 
Bug: 182584940
Merged-In: I8b27b397bce1708a42b96b1b647c64e23142c468
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
 2021-05-12 19:27:32 +00:00
Jakub Pawlowski
3a2ab54f36 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev 2021-05-12 19:27:19 +00:00
TreeHugger Robot
e81db4e2f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-11 14:35:46 +00:00
TreeHugger Robot
860318bab8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-11 14:31:55 +00:00
Bill Yi
1049f62bbc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia2f4a6a4eae5398fa27312f5791430b3e5f69e09
 2021-05-11 08:51:33 +00:00
Bill Yi
3cb47bf569 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I78ee3396d3507915233d96c294a22077a1c196bf
 2021-05-11 08:48:18 +00:00
TreeHugger Robot
8b76d88e55 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I65aef0c493f78d5befdbf2f7dba3455d646c9381
 2021-05-11 06:51:54 +00:00
Hugh Chen
68f4157827 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I69ea5188cea5989c20262a29e446672ffbc2ad49
 2021-05-11 06:51:54 +00:00
TreeHugger Robot
b2c3b4f4cb Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: Ifbb726ed6d30422a7dcade197553740a32f11da0
 2021-05-11 06:51:45 +00:00
Hugh Chen
0248e7b7cf [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I2dd1a71af29c8f1f680d0d7339a1b29cb7c75240
 2021-05-11 06:51:44 +00:00
TreeHugger Robot
85410254c7 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I84c496c66f968a2d4efac98aa2db61723db228b9
 2021-05-11 06:51:36 +00:00
Hugh Chen
ac30bfef8c [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I6e234e32dc4c51a3fd4bccdf8bce71a0fe65577d
 2021-05-11 06:51:35 +00:00
TreeHugger Robot
045aa65893 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I3a7d52f4c65391196464641f9cf20436b58762c1
 2021-05-11 06:32:20 +00:00
Hugh Chen
8dbc94fcbe [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31dde5548cb9ae735e8f342548b8e6fb799b0104
 2021-05-11 06:32:19 +00:00
TreeHugger Robot
e5e19dd41a Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I8cc36a74ea8abdaa25bc0876e4e4ce9218808d3b
 2021-05-11 06:32:12 +00:00