PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,966 Commits 1 Branch 0 Tags
b24d773173f24e8d28fe34c1c94d2366ea490a9c
Commit Graph

126966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Jedral
422b397988 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: a711dc3a06 am: d08083bc1a am: caddd6aea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: Ie5034e9eaf1509e2e4b88d16361bc976fbe26f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:10 +00:00
Florian Mayer
8512191c33 Fix mistake in test 
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=DevelopmentMemtagPageTest
Bug: 280021647
Change-Id: I74aa8764933d2abe9ae9dfd47c9f010411a3efee
 2023-05-09 12:25:20 -07:00
Derek Jedral
0863849a36 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: fff41e6aa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I1ae494fdf01a9aa5e7a0f5a84ece9f1136f558a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:23:51 +00:00
Evan Laird
4c0fb53033 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 am: ff6f9337c8 am: 930bee6167 am: 2785a8410d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I451f665460e8892671dedeb504db3692c507e53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:04:29 +00:00
Derek Jedral
caddd6aea6 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: a711dc3a06 am: d08083bc1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: Id037011863899b15ed080bc44874509a130e5682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:03:28 +00:00
Evan Laird
2785a8410d Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 am: ff6f9337c8 am: 930bee6167 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: Ic3dd3167fac3cc4a3fd82e1caeddc104db871899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:46:43 +00:00
Derek Jedral
d08083bc1a Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: a711dc3a06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I1cc88d80c7cf2cbca9a54fe5b4ca2a044b135973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:46:30 +00:00
Derek Jedral
6b96b8fc4f Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: fff41e6aa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I31a9c9a6a2b2fb1578f57f8b701dd1abcd6e0deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:45:48 +00:00
Derek Jedral
cb9ddfe658 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: 1f01e15499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I8c7ad9ce82f2418932672ff591b5de108340aa91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:42:26 +00:00
Treehugger Robot
69fc0a4ef2 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 am: 870face978 am: 681a85f7d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I11ad7a109cd1394d6a468f6ee7c2e2780094a18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:28:07 +00:00
Treehugger Robot
cd36175992 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 am: 9eb3053b30 am: 13b09784cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I55f089acccda53676306293bc004915006001cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:27:05 +00:00
Treehugger Robot
4d1d170b99 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 0c592cd8a7 am: 84d7ca0e35 am: c37d7456da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: Ib44138fd7896154d7edc70f62f3862bb55536d0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:06 +00:00
Treehugger Robot
681a85f7d8 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 am: 870face978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I636004b3bb282013b6a3277935500271cf79ba2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:04:24 +00:00
Derek Jedral
fff41e6aa3 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I7aaeed6ad5967a88b04583b19f8b35e2551a3b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:04:09 +00:00
Evan Laird
930bee6167 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 am: ff6f9337c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I6af1354602e15a80f8c101ccad9b84cb89ba8131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:03:25 +00:00
Derek Jedral
1f01e15499 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I8f09f30f1961e46abe77fa45229a89d40b55f05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:03:23 +00:00
Derek Jedral
a711dc3a06 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: Iede1c8c33c9c3999952f363625687482e5980b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:59:27 +00:00
Treehugger Robot
13b09784cb Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 am: 9eb3053b30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I0b2f85a83863d501b4a0837fe7d8ce75b4b52a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:39:12 +00:00
Treehugger Robot
c37d7456da Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 0c592cd8a7 am: 84d7ca0e35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I30cf8bd2b496eb020b29b315dfece5849d4e6e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:38:21 +00:00
Treehugger Robot
870face978 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: Ie03385ba50efc467c69fa51f63facaff559bf3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:21:10 +00:00
Treehugger Robot
9eb3053b30 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I02fb643894b84834bd9b39362f7dc117274c0a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:40 +00:00
Treehugger Robot
fc4c046def Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: aae0bf1fdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I3d3fd31958ef0ee04a108d349f7b1e27abad3f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:27 +00:00
Evan Laird
ff6f9337c8 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: Ifd81c0ea3c845d9f48b5eef143357960f21a66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:25 +00:00
Derek Jedral
9c67ee1eb1 Merge "Remove feature flag for active unlock" into udc-dev 2023-05-09 17:17:11 +00:00
Treehugger Robot
84d7ca0e35 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 0c592cd8a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I4c6cbbcbb316fed1c6ec22cd4674494cd333a745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:57:56 +00:00
Angela Wang
53a8cc0326 Disabled state UI of Flash Notifications preview button 
When both the camera flash and screen flash toggles are turned off, tapping on the preview button will have no effect and may confuse users. To avoid this, the appearance of the preview button should be updated to clearly indicated that its current state is disabled. This wil help users better understand the situation and prevent confusion.

Bug: 276494146
Test: checks the UI manually
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceTest
Change-Id: I55b11188fde6e551921a9b0f7c89daa20a8b766b
 2023-05-09 16:48:35 +00:00
Treehugger Robot
6dd01a2ef9 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I71ec2340aaa88c8f6b2404a967b9876735af6121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:41:55 +00:00
Treehugger Robot
aae0bf1fdc Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I9f691058174ed6ab89b364a9ab0e67c0dd64d22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:40:15 +00:00
Evan Laird
b4d2e7da30 Merge "Set default value of battery percent preference" am: 145caf7d4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:37:47 +00:00
Treehugger Robot
0c592cd8a7 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I0965eeedb82446b8e50721e6618310221e37fa83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:35:03 +00:00
Nan Wu
ca05afe127 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: cd6d1d53ca am: 3407bb7611 am: 3916147ecf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: Id1e6d16200d2bf4d667f23e800965426c1b48ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:20:25 +00:00
Nan Wu
24c94a79f5 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: 1acff65bc3 am: 497a436d22 am: a1454b1c99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I0f80382214ceb9fe5ecb7683841ce0cc54b63258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:20:15 +00:00
Nan Wu
d8298e3255 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: cd6d1d53ca am: 5bbe972498 am: c0dc0e24ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I25382edaa318afb0f0ae8f30f31c6d9760da44cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:20:06 +00:00
Vincent Wang
739245efa0 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 1e8948fbcb am: 65856e78af am: 210df9e107 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I9360599e968ef0feaacb9d5514be1a6f5b649c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:03:33 +00:00