Bill Yi
c68321c696
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: If6d5d2926bf2bd268a832ec8f05fa718967d3de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:24 +00:00
Treehugger Robot
059773bd86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I03d8e31c1ab27742b95e0a528a135aa15db4e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:46:16 +00:00
Bill Yi
284d320abb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I4e9438ad10906e729a3eafbb69410fa4ce011c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:46:11 +00:00
Treehugger Robot
763b15231f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I67802f22ec2b6c9181294a2bede4a125f59d9514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:36 +00:00
Bill Yi
32fce5403f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I635434e235c73d3db56a56183e0c9b442f2da8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:29 +00:00
Treehugger Robot
ba4dc8f0bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
d8d85a8485
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
f996cfceba
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-06 14:19:16 +00:00
George
d41299016e
Correct typo in the launch via NFC bottom string
...
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
2023-06-06 21:39:01 +08:00
Aleksandar Kiridzic
a882fd268d
speech: On-device recognition settings profile selector
...
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.
Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
2023-06-06 14:10:34 +01:00
Treehugger Robot
ae50f4d0e6
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Ia2d93b574bf5a744d129558e92f19fa5229486a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 06:33:51 +00:00
Treehugger Robot
185244f43d
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev
2023-06-06 05:49:40 +00:00
Android Build Coastguard Worker
7fec249ee9
Snap for 10262100 from 89e829e3dc
to udc-release
...
Change-Id: Ib6bcd88a07bf542bd33712b7109ba28a897ee924
2023-06-05 23:19:34 +00:00
Alejandro Nijamkin
6f9f3a4594
Fixes nav stack issue.
...
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.
Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.
Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
TreeHugger Robot
9c6d0441b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f
-s ours am: 8f5a0bc281
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: Idbb679e9c56cecd3dea45cb69b9f68c4c9aba78a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:23:18 +00:00
Bill Yi
0db4720d61
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0
-s ours am: a18807d9ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I8521caed27b053c675fd82a49345b861cda629be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:23:16 +00:00
Treehugger Robot
58ccdb7f48
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6cb0b2c68e
-s ours am: fc0e5b8a0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: Ia1e4dabac09959ad377738c2955a0bfa8a3a27e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:03:42 +00:00
Bill Yi
0a3eb6c5ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cb99dd3e3
-s ours am: eabe8621e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: I3ab4a26ef994ba284cdbc9a401eeeaab58790848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:03:27 +00:00
Bill Yi
63067fce6e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14
-s ours am: e68afc2727
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: I3fefad6e2b7a6b38e4fda12ab345bf17823a0a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:03:08 +00:00
Automerger Merge Worker
df0a3a6534
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours am: aeacaaee64
-s ours" into udc-dev-plus-aosp
2023-06-05 20:59:18 +00:00
Bill Yi
9789ce21f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours am: aeacaaee64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: Ie3ac1bef85aecede1be8673730dfc5c4ea51538e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:58:58 +00:00
Bill Yi
9ef2618eca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours am: f108c63394
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I653c865636253df6b60d89b18965dbd4ac54fc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:58:53 +00:00
Bill Yi
a9bc102471
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours am: 0a31322199
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I9a0d68e98124579ee8f4ae7fea209960abc73282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:58:43 +00:00
Treehugger Robot
fc0e5b8a0c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6cb0b2c68e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: If8ea7a60b6773ba33f29bc9a1dfba0ad5bf013ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:30:02 +00:00
Bill Yi
eabe8621e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cb99dd3e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: I1d37a0e038be918b973722f7ef5496a3fd08aa3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:29:42 +00:00
Bill Yi
e68afc2727
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: Ib4c87cb28adc652f306b2101984d13301242b1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:29:21 +00:00
TreeHugger Robot
8f5a0bc281
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: Ie20278858c925933506dbd5bc6d71e486d45e89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:19:27 +00:00
Bill Yi
a18807d9ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I9c3201ad1377bc074940b211483a7c0f76630d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:19:23 +00:00
Bill Yi
aeacaaee64
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: Ie42f1d09d6218ba3350b6971370fd554ea10f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:18:41 +00:00
Bill Yi
f108c63394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I2e93a216a570bf7cd685e691e593ba8163089f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:13:06 +00:00
Bill Yi
0a31322199
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: Iaf4243052f0b3cf46d02ca11aa64f9e48e8c9a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:11:33 +00:00
Treehugger Robot
6cb0b2c68e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-06-05 19:36:58 +00:00
TreeHugger Robot
719a4c645f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-05 19:35:48 +00:00
Justin Gross
5e2768327a
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I17069f20447108b5346fc7246288e8ba93b35f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:37:33 +00:00
Justin Gross
89e829e3dc
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev
2023-06-05 18:00:15 +00:00
Matías Hernández
173cc267e0
DO NOT MERGE Don't hide approved NLSes in Settings
...
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.
Bug: 282932362
Test: manual
Change-Id: Iccfe7b53d643d6c9f9516f91d3cee3309b11551e
2023-06-05 17:16:48 +00:00
Bill Yi
a80c569b36
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2ded1221447056932b184fad3f13750d46103fc0
2023-06-04 19:33:29 -07:00
Bill Yi
5dcde1cfde
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icd41c34edf3b72e7b66044b7f772ba15c85f85ec
2023-06-04 19:31:56 -07:00
Bill Yi
ea2e6b3670
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7229c084aa7704cde5a57d7635bd0fb2113fca6
2023-06-04 18:46:55 -07:00
Bill Yi
1b5824f6c9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
2023-06-04 18:44:23 -07:00
Bill Yi
d152c7b1bf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4fe08ee7dc7f803451ff0389a2587a5c99d1023e
2023-06-04 18:40:52 -07:00
Bill Yi
506e105fdb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I61f515a3a5cd45df467240ef7cc38e098fd184ae
2023-06-04 18:39:29 -07:00
Bill Yi
7d99401b8e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I855db4675b33516b1bd38cb58406a9daa8ca188e
2023-06-04 18:37:48 -07:00
Bill Yi
fe27600237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I00c2c563b2687f49c85e0774c1a8b279e8781ede
2023-06-04 18:36:19 -07:00
Bill Yi
b80d56cfc0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I359de73314ea608d66cdc8dc77fd3396a104dc02
2023-06-04 18:34:48 -07:00
Bill Yi
8cb99dd3e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8d72c85deddd4bbb0a4fb49b71c6c929bf253db
2023-06-04 12:26:25 -07:00
Bill Yi
59cfc8ae14
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib2c29e2e9c358a14b63738fba13a296d7d49f9ed
2023-06-04 12:24:22 -07:00
Android Build Coastguard Worker
73e13e79eb
Snap for 10252918 from 25d24e0cf0
to udc-release
...
Change-Id: Ia40a637e52a5d74066a784aec04257a4cf20346e
2023-06-03 02:23:12 +00:00
Taran Singh
9260c67352
DO NOT MERGE: Prevent non-system IME from becoming device admin
...
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.
This CL ensures KeyEvent on "Activate" button can only come from system
apps.
Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e
)
2023-06-02 22:20:30 +00:00