Commit Graph

123476 Commits

Author SHA1 Message Date
Weng Su
c95cc8f8d9 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: bfc8efc4de am: 1270d5ed43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I46e6ab5f8195cd7488b91e7219b4e67a6966d5e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:26:26 +00:00
Vincent Wang
98e4b25e7b Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 1e8948fbcb am: 2e8cba3e95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: Ibc6c1ffbf94bd6027ca67673d72ce59b30ca25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:26:20 +00:00
Chaohui Wang
39e6f88076 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: b52b6f6d46 am: 39c6a23f92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I0ee232d3ec014fbdcb7d92b753aa2fe0844103c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:26:12 +00:00
TreeHugger Robot
268af9cc53 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: e6998973d2 am: cbe5c8f504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I1e357fa6557e71e39a05177848541a5a492e2d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:26:04 +00:00
Chaohui Wang
4edb135481 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 9a96e14cc2 am: e2869f34fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: Ia5ec69909da46d3dbec74dc80459d43f5306f768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:25:56 +00:00
Vincent Wang
c2579ea39d Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: ef5aa5d985 am: 3227aed5dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I0b6be18e8b112baebd2b8d4ebb62282a0ae99455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:25:39 +00:00
Chaohui Wang
490bffa06d Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: 322234a222 am: e6866d70ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I1af006294b0fef7cc33889e14d1df583b3e7d953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:25:29 +00:00
Treehugger Robot
fac860539e Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: 0cbdd648f5 am: fe33d447f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: Ia78fea3f2ba241fc2582bed751438eab07561e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:25:23 +00:00
TreeHugger Robot
89616fea14 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: 1918f46ed1 am: beae23eca8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I16a759208298683cbcf6b45c942d0a2a21f21f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:25:13 +00:00
Weng Su
c6503d79bb Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: bfc8efc4de am: af32065193
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: Ia78c06d8881860e877610d62c433224511674a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:24:43 +00:00
Chaohui Wang
3c82ea6446 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 5e5e46833e am: 45a5b6ec69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: Iab3613c6c3c2aaa02f77165412b36e16f1cbd31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:24:15 +00:00
Treehugger Robot
9a44b0402c Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: bea756aa7e am: cbcc16ddcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: Ibeec2f373fd1a32dea549a973ec6bd773f933e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:22:02 +00:00
Weng Su
7b604ec792 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: aed54a1296 am: b6a52e9c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I0d3b241b554674f88bcd62facd4ca29f7d545b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:19:42 +00:00
Guangjie (Jerry) Shi
3b5524c869 Merge "Fix work profile issue" into udc-dev am: ece191b09f am: deff8cb5a9 am: 519ff26f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I78ea2ee9304e910548c725461f2198c62f207f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 12:03:14 +00:00
Vincent Wang
2e8cba3e95 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 1e8948fbcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I3cfeb0c4e8117e4aca83e3a0da18050210d29236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:33:29 +00:00
Chaohui Wang
39c6a23f92 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: b52b6f6d46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I133e238da705871a308265ba66ea39e28b7e559f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:33:08 +00:00
TreeHugger Robot
cbe5c8f504 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: e6998973d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I739c4c8bfe467ab16c293ddd9c738e669ea15d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:32:48 +00:00
Chaohui Wang
e2869f34fa Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 9a96e14cc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: I0084db67d3524ae8d7a3309b6c015b8ddd286bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:32:26 +00:00
Jack He
1327625fdf Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 am: ceb3ec60ee am: 9e85773279
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: I81fe3e3472a5596ed310255f1abfbb90df4289e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:32:24 +00:00
Treehugger Robot
fe33d447f9 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: 0cbdd648f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I21debfcb2a88abb3c53f5af84627cfe8694fb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:31:59 +00:00
Weng Su
1270d5ed43 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: bfc8efc4de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I8f5239ce9fe220ba2b3caff55cfe818a999afaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:31:14 +00:00
Weng Su
af32065193 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: bfc8efc4de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I6e90cce1fb6ae6907b0bd63c0e2d1421608a3f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:31:02 +00:00
Vincent Wang
1e8948fbcb Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I68350a070fd57a6358b099bd303fb37ac84bf6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:25:12 +00:00
Chaohui Wang
b52b6f6d46 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: Ifff45d0c5fb5a65681c2ad60de6d854a5dd36c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:25:01 +00:00
TreeHugger Robot
e6998973d2 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: Ie234dab67301b120466fd4b3f8b32413a320f876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:24:31 +00:00
Chaohui Wang
9a96e14cc2 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: I3fdb00cad883651e6135161c843cb119932fbb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:24:22 +00:00
Treehugger Robot
0cbdd648f5 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I7441e0e8b6ecd9aa86eb6aad936c04e7d79d4dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:15:35 +00:00
Vincent Wang
3227aed5dc Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: ef5aa5d985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I2e1da6322f2b67d05543bae011b47a157e725bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:52:44 +00:00
Chaohui Wang
e6866d70ca Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: 322234a222
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: Iaba632bea2446f9f28f88d7e11d0851a53ada043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:52:23 +00:00
TreeHugger Robot
beae23eca8 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: 1918f46ed1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I616ed702530db4a25fb65c39d88206ebfeb50d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:51:52 +00:00
Chaohui Wang
45a5b6ec69 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 5e5e46833e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: Ieeaa700a8009abf599189701119fab4848a46697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:51:45 +00:00
Treehugger Robot
cbcc16ddcd Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: bea756aa7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I48c84c02a145c206ebc4ccc0e842582aaa092bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:51:36 +00:00
Weng Su
b6a52e9c74 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: aed54a1296
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I14e04149f68092c36944d38120666bef355b1f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:51:18 +00:00
Weng Su
bfc8efc4de Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: Ic6ebc234fb721cc0f2b0cf28bfdd029755aba943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:50:45 +00:00
Vincent Wang
ef5aa5d985 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: Icc90f4d9c3bc8b5094152af16c61398e83cae448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:50:27 +00:00
Chaohui Wang
322234a222 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: Idcc55f833a72e852233f687f663addc1d1b036f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:50:17 +00:00
TreeHugger Robot
1918f46ed1 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I639c3d086404b0f8f05fb9bf48b186181e9f298d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:48:43 +00:00
Chaohui Wang
5e5e46833e Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: Ic4fdd022ef2f89f4352403c6a598d6509b1379e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:42:57 +00:00
Treehugger Robot
bea756aa7e Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I009af82ec74183ac86cefe8e76e56c9ad74f7ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:42:34 +00:00
Weng Su
aed54a1296 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I0f24aec7218eb74cac52ca31a0e9ad3ccb30d44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:42:13 +00:00
Guangjie (Jerry) Shi
519ff26f75 Merge "Fix work profile issue" into udc-dev am: ece191b09f am: deff8cb5a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I06effac54d6d0ed31b7fd0825dd8402b2d94aa6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:27:08 +00:00
Jack He
9e85773279 Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 am: ceb3ec60ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Id3cc87c60bb63f7b26213f1a1246afaa396cb14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:26:22 +00:00
Guangjie (Jerry) Shi
deff8cb5a9 Merge "Fix work profile issue" into udc-dev am: ece191b09f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I32d95d5daa4c5ad249e1e3daaae6ab42343e7893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:26:04 +00:00
Guangjie (Jerry) Shi
357e20e49f Merge "Fix work profile issue" into udc-dev am: ece191b09f am: bcd1326690 am: bb63e41746
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: Ibbfb8a25fb3a8c4430a95eb7b9c123d98b0ec29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:07:47 +00:00
Guangjie (Jerry) Shi
f0cd54a957 Merge "Fix work profile issue" into udc-dev am: ece191b09f am: bcd1326690 am: 580c493fbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I519bf85b3e1b1f38236682d927615fcd8f43efc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:07:43 +00:00
Jason Chang
0626de68ee Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev am: 5f7ffb31d2 am: 12d36b5e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050583

Change-Id: I0d6f5ba93ac9127c79fb94abc20da0ab22413314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 10:03:54 +00:00
Jack He
ceb3ec60ee Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ia9c2d8f8d19567ab3e28bddb87bbff0fe0351c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 09:56:46 +00:00
Vincent Wang
5801e98d7f Merge "Test Fix SettingRobolectricTest Fail" into udc-dev 2023-05-09 09:50:50 +00:00
Shawn Lin
ff3420bfd2 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: e601136991 am: 48cbe70a21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: I02664f74eb1bcc17c9ae1b0234d8e6118b5fd680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 09:44:13 +00:00
Treehugger Robot
51aa95656f Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 am: 7251199304 am: d8245c410e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I032c89a44ad0d3038f8770e7034bf5869585cbf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 09:42:38 +00:00