Commit Graph

123393 Commits

Author SHA1 Message Date
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
e6d4fa7daa 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: I94b718ca2dfebe1a704e558efb9e4dcf1c9cb200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 06:38:26 +00:00
Treehugger Robot
185244f43d Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev 2023-06-06 05:49:40 +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
af27dd5a9f [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: Ic7fdceab7eb4cb84db6b34477cd2125e8b3cbf7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:58:52 +00:00
Bill Yi
1f4d5cbba3 [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: I84d4d5393cdef7a87e4e3f73805ccfe6800895e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:58:49 +00:00
Bill Yi
8d90146056 [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: If5fac238b3d37f5da6fbbf6c0dd5468af3114a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:37:11 +00:00
Bill Yi
5594e824f4 [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: Ia2c186f557f166d12ff47738012089698b80249e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:36:54 +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
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
a28a3df494 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-05 19:38:55 +00:00
TreeHugger Robot
719a4c645f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-06-05 19:35:48 +00:00
Treehugger Robot
276d663000 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-05 19:34:58 +00:00
Justin Gross
7dd84f9399 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: If1323ef60c7743c767b06d4d88cde121d0e9ca0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 18:36:45 +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
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
2d58a22db6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I75a0bb2c27d7210e330c99ad2469f4d3b99bb32f
2023-06-04 11:18:03 -07:00
Bill Yi
c81c5c7a5d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7ea895d963097c08fc7bd7af1c182c5a96dad5d
2023-06-04 11:16:08 -07:00
Taran Singh
0976cd789d 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:58:09 +00:00
Taran Singh
f753a3c8df 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:56:57 +00:00
Taran Singh
cb2b753094 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:37:11 +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
Taran Singh
0ee3b96e59 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 21:58:54 +00:00
TreeHugger Robot
ac91d63f00 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I924f88568e39e4dd6fe8be4bbced5c69d72cac0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 21:36:43 +00:00
TreeHugger Robot
25d24e0cf0 Merge "Restrict SimDialogActivity" into udc-dev 2023-06-02 20:41:47 +00:00
Jason Chiu
809d641517 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Iaf7c1b916134b9602985d4545378bc291a74fe4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 11:06:46 +00:00
Jason Chiu
b2ed35b2ae Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev 2023-06-02 10:27:14 +00:00
Chaohui Wang
3f05e59982 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I9edc0a5310147ad385df5e7fab30136fb01f94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:00:16 +00:00
Chaohui Wang
122ba16792 Merge "Hide Show System on SPA version App languages" into udc-dev 2023-06-02 06:41:54 +00:00
Chaohui Wang
d381b663ba Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: Ib51fa7a659803d4afa3c1193060f29295fca4255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 06:37:09 +00:00
Chaohui Wang
68995792c2 Merge "Fix padding issue on Scan QR code screen" into udc-dev 2023-06-02 05:52:16 +00:00
Treehugger Robot
88a51ef8be Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: If1842f2868204899a343487ac8469c0d4a283df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 04:24:55 +00:00
Yanli Wan
0ca7d94e3c Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: Ice9e893d2adbcf98f0728992e7696ebe807afae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 04:24:47 +00:00
Treehugger Robot
47d3cfe635 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev 2023-06-02 04:19:22 +00:00
Yanli Wan
7cc3625678 Merge "Update the string of Settings preference for device lock" into udc-dev 2023-06-02 03:52:00 +00:00
TreeHugger Robot
502e6d6e5b Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324

Change-Id: I3432fc6d54519f74dad00feccfbd047cbbd18d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:23:24 +00:00
YK Hung
466e7c56b2 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I31562e4f787130bbb460030cc3cb7ad78604f21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:22:04 +00:00
TreeHugger Robot
641d07244e Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev 2023-06-02 01:15:00 +00:00
Chun-Ku Lin
7a8602dce9 Set textDirection=locale and layoutDirection=locale for alert dialog
It's strongly recommended by internationalization team to set
android:textDirection="locale" and android:layoutDirection="locale" to
tackle a text that consists of RTL and LTR characters.

Bug: 279491415
Bug: 283608580
Bug: 283608637
Test: manual

Merged-In: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
Change-Id: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
(cherry picked from commit 219d4e6ca1)
2023-06-02 01:07:11 +00:00
YK Hung
bfc4637d09 Merge "Update incompatible charger checking rule" into udc-dev 2023-06-02 00:50:17 +00:00