Commit Graph

130042 Commits

Author SHA1 Message Date
Joanne Chung
16a3800902 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: I7dd7e11968e601d180cb928dd6dcb0803dedf523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:05:03 +00:00
Treehugger Robot
fe675b620c Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev am: 8f3679ab91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601572

Change-Id: I404c62a74fe886eb4f2d8e7c458e91237f0ce3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 07:25:53 +00:00
Joanne Chung
e7b01f0ce8 Merge "Update OWNER file to new owner" am: 6c84f9128d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 07:23:35 +00:00
Joanne Chung
6c84f9128d Merge "Update OWNER file to new owner" 2023-06-08 06:40:49 +00:00
Joanne Chung
674ae4ae93 Update OWNER file to new owner
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
2023-06-08 06:40:41 +00:00
Treehugger Robot
8f3679ab91 Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev 2023-06-08 06:16:32 +00:00
Treehugger Robot
c808dcb7fd Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 am: 9c4b3ad72b am: 4559c255a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I94ff85b12ff304b10fb3e47d38a01ac2b23216cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 03:05:42 +00:00
Treehugger Robot
8c523420a1 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c83e401444 am: 57d4410b3f am: 06b69bdc82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I4bdbb19c946f49f5dc07a34b946f6905d31b1fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 03:04:29 +00:00
Treehugger Robot
86ed9ac7d6 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 am: 24e8361e2a am: c6e0a970ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Idff7b5d6fa5d347d3bb627fe321ab993ce21c94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 03:02:50 +00:00
Treehugger Robot
4559c255a3 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 am: 9c4b3ad72b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ie70ce9a5593a4d1e59809093c9e1e6861d4ce76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 02:20:55 +00:00
Treehugger Robot
06b69bdc82 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c83e401444 am: 57d4410b3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I6cdd8c18c7baabfe81b639397e351088241f12eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 02:16:38 +00:00
Treehugger Robot
c6e0a970ba Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 am: 24e8361e2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Idd53e9fa39a7202009b974016f8d045db06ef455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 02:15:21 +00:00
Treehugger Robot
57d4410b3f Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c83e401444
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ibe991ac28d55736e530ca014ed06b548870b52e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:38:17 +00:00
Treehugger Robot
9c4b3ad72b Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ie7e71eb056a9976296dd2d6da95cc03f1e01ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:37:16 +00:00
Treehugger Robot
b164cf7111 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c334825405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I382981ba325b24696e797755eb6be07b46b01ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:34:02 +00:00
Treehugger Robot
24e8361e2a Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ibbbcddcfadfbadcc66cbf2673f34ab8a1d29e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:33:40 +00:00
Treehugger Robot
c83e401444 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I25e8ab52aa7a285e22ec067d56d1a4a2e3252ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:56 +00:00
Treehugger Robot
c334825405 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I4d882fe72b24e512d089772378cdc31d69e277e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:26 +00:00
Treehugger Robot
c0338e5dc3 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I452681812b4be6dccae36f3ec711e992a31b9924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:15 +00:00
Treehugger Robot
a34a510a40 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev 2023-06-08 00:15:18 +00:00
Aleksandar Kiridžić
aeaf52ec2a Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483 am: 1a54d94eb1 am: 9a2120768a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: Ibce63a9f12a22c48218a082c3cf3f6ec54876f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:41:50 +00:00
Aleksandar Kiridžić
b678381213 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 9b20255944 am: ed0645b380 am: 3335569442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: Ib910e4387d84f8458178a60fbd903ca781d67c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:41:08 +00:00
Aleksandar Kiridžić
ae57d26aa1 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483 am: e2d8e56c61 am: 94b8257176
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I5d50f223581c810e085b99fe872b1230a767f4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:39:41 +00:00
Aleksandar Kiridžić
9a2120768a Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483 am: 1a54d94eb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I53b7dec6fbcad4cd5cb35ea5dc8e5553fc0913a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:58:03 +00:00
Aleksandar Kiridžić
3335569442 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 9b20255944 am: ed0645b380
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I36c9b76e857c987324494dc753a733f52a327cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:54:44 +00:00
Aleksandar Kiridžić
94b8257176 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483 am: e2d8e56c61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: Ic78a3af95c49680efc5bad6e3d13e7d6abb048f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:53:07 +00:00
Hao Dong
d2f91d47ca Merge "Clean up multi window toast on FingerprintEnrollEnrolling." 2023-06-07 20:35:18 +00:00
Aleksandar Kiridžić
ed0645b380 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 9b20255944
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I0579c1c53126548e60aea7bd3f26aaf802060e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:08:14 +00:00
Aleksandar Kiridžić
1a54d94eb1 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I24fd223f7fa7e0450be675b1d5f214ef3a40fb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:08:00 +00:00
Aleksandar Kiridžić
1c249415ba Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 85bc7cf3e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I1eadf56c453c144199e8d4b7e0fdb8b4a2bf2de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:03:19 +00:00
Aleksandar Kiridžić
e2d8e56c61 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I18fd5f9209b5c7dc965ffed95751f8059eb95c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:03:18 +00:00
Oli Thompson
ab73c1a3e3 Fix low contrast on work challenge screen emergency call button
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
2023-06-07 19:25:59 +00:00
Aleksandar Kiridžić
c449423483 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I9ead6c07f3f8c8b901301a7eed9de148490b4bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:43:15 +00:00
Aleksandar Kiridžić
85bc7cf3e8 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I7067a39e91e74c5956e2301081f53f021bfdb979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:42:39 +00:00
Aleksandar Kiridžić
9b20255944 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I3b15f067f124ff17d7c540e2ca9dff5100178bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:38:59 +00:00
Hao Dong
3d81e3893e Clean up multi window toast on FingerprintEnrollEnrolling.
ag/22361082 and ag/22460413 have added a dialog preventing entering
FingerprintEnrollEnrolling. So showing toast and early return in
onCreate() will never be reached. This CL cleans up this obsolete code
block.

Bug: 283244022
Test: N/A

Change-Id: Ifc5f3d909a275c735035146e44f70d2b5d5b51e3
2023-06-07 18:19:13 +00:00
Aleksandar Kiridžić
b5b15a6689 Merge "speech: On-device recognition settings profile selector" into udc-dev 2023-06-07 17:53:38 +00:00
TreeHugger Robot
83e44f83ae Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 am: 060250ded2 am: 90f0f3ef3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I58f09525a2723d60b1eb67570d8441ad79c4bd82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 15:56:51 +00:00
TreeHugger Robot
4ef7f9f272 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 5943e14bc3 am: d60ff26d9f am: 0a14afb258
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ida0466e3b4c3dd96199120bc5cf08e43bdb4f5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 15:54:45 +00:00
TreeHugger Robot
f3a71d884d Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 am: 99c0145565 am: 734d68d694
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I9c5016527f86260da591f4826acf6c141d9d4e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 15:11:54 +00:00
TreeHugger Robot
90f0f3ef3d Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 am: 060250ded2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I059a3d8a8ff10ce547cab0e453c024f0d59d8e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 14:29:20 +00:00
TreeHugger Robot
0a14afb258 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 5943e14bc3 am: d60ff26d9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Icad930081c90a9fd6fdce582d6e293e38ea45a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 14:24:36 +00:00
TreeHugger Robot
734d68d694 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 am: 99c0145565
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Id1dacaca9b06530ae9431faaf8a36783e2280576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 14:24:22 +00:00
TreeHugger Robot
d60ff26d9f Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 5943e14bc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I2b2a2671f43ada1de08c5c766dfbbc4cf38b6e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:45:47 +00:00
TreeHugger Robot
060250ded2 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ie63476cbbc3efc7d3d00a7b9bcc0c1772d33e327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:44:52 +00:00
TreeHugger Robot
9f8053aac4 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 19f1707fda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I2e1fe66bd5a0672c8b8a20bd2c389cdba826b6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:40:51 +00:00
TreeHugger Robot
99c0145565 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ie47f1d1d909d7f753619ff91041e24d58ae934fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:40:42 +00:00
TreeHugger Robot
19f1707fda Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ia5b21af9f18c286c5f8cdb480209db5859e53e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:03:24 +00:00
TreeHugger Robot
9b68c3c9c1 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I5f9975f49ec0793eabf171c5dba0791683ab0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:03:22 +00:00
TreeHugger Robot
5943e14bc3 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I31a51edc4d856fab0127545e6e6acdf547c027c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 12:59:49 +00:00