PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,480 Commits 1 Branch 0 Tags
adc7eb052460d5d25a2684d08520019fb99b278f
Commit Graph

127480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Weng Su
a88270a0b1 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: aed54a1296 am: b6a52e9c74 am: 7b604ec792 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

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

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

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

Change-Id: I1ce3f1036aa46978205dbe4a961849acaf946358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:59:43 +00:00
Treehugger Robot
f4939a4bda Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev 2023-05-09 15:59:32 +00:00
Guangjie (Jerry) Shi
2e7a0fdd7d Merge "Fix work profile issue" into udc-dev am: ece191b09f am: bcd1326690 am: 580c493fbb am: f0cd54a957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I22d3add23eccf2eb8f3abd77dc58dcf0208e5130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:57:53 +00:00
Nan Wu
3916147ecf 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I74a2fa05e95d1f71134909de50e47b198f1c14b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:56:59 +00:00
Evan Laird
145caf7d4e Merge "Set default value of battery percent preference" 2023-05-09 15:53:08 +00:00
Jason Chang
e24518bf35 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev am: 5f7ffb31d2 am: 12d36b5e36 am: 0626de68ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050583

Change-Id: Ieb90fab6cc326d60a4dba89a7f114ae299446c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:48:47 +00:00
Nan Wu
a1454b1c99 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I90a48c85869640be7f4d817d10c7d5f2b072963c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:47:42 +00:00
Nan Wu
c0dc0e24ab 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I6e87cb403a35e1177177400d36c05f1154e8baa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:47:16 +00:00
Shawn Lin
8a65021a8d Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: e601136991 am: 48cbe70a21 am: ff3420bfd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

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

Change-Id: I410329e0b4a09ff198ef45991164d7bde495322c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:44:21 +00:00
Jack He
c913d88417 Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 am: 7d96f185ee am: 191fe2ab6f am: 53268d7f99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

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

Change-Id: Ic658aa451e8e776e380fe673b4b8ef9ba7c0c73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:36:01 +00:00
Jack He
6b607fb82a Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 am: 7d96f185ee am: d6476ad161 am: 111445454b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ia6d4414f6452b7ffe3cc32ad20a1f640aa16ccd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:27:38 +00:00
Shawn Lin
bb99dd0062 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: 01a434865f am: 2576ca80ba am: 573f2324f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: I3f7e7306248bc5ee325ebee4c3b75ae8a5834412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:24:29 +00:00
Shawn Lin
bf83409de1 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: 01a434865f am: 5a62b289e9 am: c567c8f9e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

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

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

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

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

Change-Id: Ie3e738285db754e30aa447a501debaeaa72b6f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:09:36 +00:00
Becca Hughes
cf481e39c6 Merge "Disable all providers if none selected" into udc-dev am: 762691c365 am: 1d31a84b3d am: d04cc5eec6 am: 4c35572e8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

Change-Id: I27a1c64cc6b54109d80427b9c09b6ceae1cc0421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:59:59 +00:00
Treehugger Robot
657083cb48 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 am: 25115c82a4 am: a46d251e01 am: b478b8230b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

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

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

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

Change-Id: I8e5f2a5a2d4d44fb54d43a952c9a30b429791b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:25:11 +00:00
Treehugger Robot
a0a3a39c68 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 am: 25115c82a4 am: 310871ca38 am: 34fdd5c8eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I467276b3309d5fc18bfdd72166527e2a3ba3c80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:14:45 +00:00
Nan Wu
38b99012f4 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev 2023-05-09 13:49:06 +00:00
Austin Delgado
a596fcb1ae Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 7246a93bd3 am: d8a0b91e1a am: 9f3b87b51f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

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

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

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

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

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

Change-Id: I1aa58e8a57922ee1e63ac60dd19fae4db213baf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:26:50 +00:00
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