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

127052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tetiana Meronyk
9c790ec917 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 43835107e7 am: 6dcb9fca35 am: 8d8d0ea09e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: Ie6017fbdfda625f55f86f464761cbc079ced1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:21:53 +00:00
Tetiana Meronyk
babc8f58f2 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 53d32efa48 am: 683d219f70 am: d8a45b01a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I78b267f1201c8e9469841c8f8721b3a65b52c61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:17:48 +00:00
Hao Dong
d201209ae1 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5 am: c5b3f62935 am: 472f3774fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ifa6842cdb1c252a03ed522c746b49a44c37529f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:11:40 +00:00
Hao Dong
c6b1b3cc95 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: 2386847a2f am: 836ee2bade am: 7640937cbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I4d779600edbb9f63747c62b650abf0b81f915a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:11:31 +00:00
Hao Dong
51e4d88b19 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5 am: 6832a32430 am: 172c9ffa49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I9e8226f2331a05a503dc8abf4a668accd22f6569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:11:11 +00:00
Yuxin Hu
a265f8512e Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 am: 470d81c0d1 am: c988b3a119 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I9b754606ac0652672c5c03d3f0e823740a6af72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:53:31 +00:00
TreeHugger Robot
d98494ea88 Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e am: 8fa511ea87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: I7a1a8a8f9830f0cf09d5dc3a6d276baabe05dd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:48:46 +00:00
Fangqiu Su
bc1c10055b Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a am: 1cc65c8dce am: 3c36f4c88e am: 0c341aed7c am: c62dae5635 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: Ifd85a779196889f79486f7ae008bcc918aa03b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:31:15 +00:00
Yuxin Hu
d7d11bcf00 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 37dc9f703c am: 2757a63fb3 am: e88a36a7a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I261b4f73b32b2e2f8f2281bd7dc90977f1b0f966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:13:47 +00:00
TreeHugger Robot
8fa511ea87 Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: I5154c4cb123dd15a2c58a006a690b616de40adf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:09:43 +00:00
TreeHugger Robot
b7b444896e Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev 2023-05-12 01:34:00 +00:00
Tetiana Meronyk
8d8d0ea09e Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 43835107e7 am: 6dcb9fca35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I34badd86a7d39006fbe9a8a16e2ca14914dcae3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 01:27:03 +00:00
Tetiana Meronyk
d8a45b01a1 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 53d32efa48 am: 683d219f70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I0430f70ca8877fa1b25f5e3b75e9709583237ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 01:25:38 +00:00
Yuxin Hu
0c6531e42e Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 am: 2c1cbacb84 am: 8aea1f673f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I49e95c3d440229f80ff20b282a87bc9f226e6c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 01:05:56 +00:00
Tetiana Meronyk
6dcb9fca35 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 43835107e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I636ad860c7fe5ed48c5c037a3f7fb0e2283f748d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:51:32 +00:00
Tetiana Meronyk
683d219f70 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 53d32efa48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I5105c8b7b683d83ad2f7287bac1e1aed2868200d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:42:44 +00:00
Tetiana Meronyk
a71361096a Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 0967e63d43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I1eb61c2ddb41804cc3beb7077756f961824a0f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:39:07 +00:00
Tetiana Meronyk
43835107e7 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I816af33e0e4e6006234f76e58a1dbcf287a45606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:21:52 +00:00
Tetiana Meronyk
0967e63d43 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: Ic50866d1ba9461a805a93a39770cab85dda8ffdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:21:30 +00:00
Hao Dong
472f3774fb Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5 am: c5b3f62935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I72c068b20078a233060dfb0becf07058aa0c9954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:20:18 +00:00
Tetiana Meronyk
53d32efa48 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: Ica48008946e313cf559f08fd1c4a79ebaf29c0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:16:52 +00:00
Hao Dong
7640937cbb Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: 2386847a2f am: 836ee2bade 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I554f3dd4d5f9c44a3390f2e68c392c0576521b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:15:36 +00:00
Hao Dong
172c9ffa49 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5 am: 6832a32430 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I3afa69c7bd29ade0009574dc3442cd9d19f6ace8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:14:53 +00:00
Tetiana Meronyk
66dba214e6 Merge "Make user creation flow in a single dialog" into udc-dev 2023-05-11 23:43:05 +00:00
Hao Dong
836ee2bade Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: 2386847a2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I504d49a7601e00a8491635deb7b0bf6f5c9c8c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:35:08 +00:00
Hao Dong
c5b3f62935 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Icffc3a12145527dcb8c9873719c1c4a3adc8f1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:34:09 +00:00
Hao Dong
2c3346a4e6 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: 771df2f4a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I19309051047d2b5f504ba8c8f6a9f9e591ddd4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:32:18 +00:00
Hao Dong
6832a32430 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I1da1719b323d55674ed01bfe12e9afa52e62075a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:31:44 +00:00
Yuxin Hu
c988b3a119 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 am: 470d81c0d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: Ic08d5a93d03405da9c056e1a4df94ca66f8c051b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:17:04 +00:00
Fangqiu Su
c62dae5635 Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a am: 1cc65c8dce am: 3c36f4c88e am: 0c341aed7c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I63784d88129cb4ba1aabcece9aec9daf18517929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:16:17 +00:00
Yuxin Hu
e88a36a7a4 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 37dc9f703c am: 2757a63fb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I58bc3abcbf2c6d60dbb52a3a37bce2e1f20dd440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:14:58 +00:00
Yuxin Hu
8aea1f673f Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 am: 2c1cbacb84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: If18084611b8683b96f8cb19ff183443d2e879602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 23:13:22 +00:00
Hao Dong
771df2f4a6 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I2a41cd67710f34cd74123e6979806a15d07783b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:56:23 +00:00
Hao Dong
dd373e10e5 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ie5214e9c1dafbbc9fbadcf1cbbdb653a43afc581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:52:55 +00:00
Hao Dong
2386847a2f Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ibbea1584e774a5249bfb73d8f3e98b175b963225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:51:36 +00:00
Treehugger Robot
90a7d17b1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: 2e7fb61869 -s ours am: 08d5877e30 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I5666ca50ebddf911422e842514506bd702423539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:39:09 +00:00
Treehugger Robot
ae6edd2174 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: 8f031b5e6a am: ee1b84d713 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iac649fe074f613e5cd3b9d62b223bffb94f0d160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:35:19 +00:00
Bill Yi
d760dbf11d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 177f3dbdaf -s ours am: 9bc2e74019 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Idfc2704a675bc261da0e910a382b6e58d85163cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:35:15 +00:00
Fangqiu Su
0c341aed7c Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a am: 1cc65c8dce am: 3c36f4c88e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: Ib6f02f00ecd19ac04a596ef5ba5afde397141275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:34:28 +00:00
Treehugger Robot
d72436e40a Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: ec9917069a am: c461c065f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I83a4ad173bcd2d915d54087548d29029ad6be36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:33 +00:00
Treehugger Robot
6f57d59f7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: cadb7815c6 -s ours am: 0e0826cf07 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I40a86f942d4f97b94362358d8390139202d30c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:24 +00:00
Treehugger Robot
5f58017c7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours am: ad626ab75b -s ours am: 1064cb569a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iabf62405ede89f2bf35e193e28defd4f985f1cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:13 +00:00
Yuxin Hu
470d81c0d1 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I2499798672736c36d2ce629145813e039c741a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:08 +00:00
Yuxin Hu
2757a63fb3 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 37dc9f703c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: Iea42221dfd0db85468936e2e3a6bf8a2d11f27a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:32:18 +00:00
Yuxin Hu
2c1cbacb84 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: If6fa7f6813163fc7f96b15c553cc680be580e08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:28:28 +00:00
Treehugger Robot
c937e75faf Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: b92621d8b4 am: a68274aaa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I7b9f518d823f792a1e30dd8dd9b68d12ad9e2604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:11:56 +00:00
Bill Yi
5635061844 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 5cdd88f054 -s ours am: ed55540bb3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: If721ef2b92df1364155530eed818573ee91164c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:11:49 +00:00
Hao Dong
1eb3724e1f Merge "Hide description text view if there is overlap." into udc-dev 2023-05-11 22:10:55 +00:00
Yuxin Hu
4235638174 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: e58d73a958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I9741ceb39a659056384baebd1577c0ae142ef084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:06:31 +00:00
Treehugger Robot
2effabe658 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: 0355076954 am: 21febf068d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I0d270ed604de78d4813489bf418e1182a14c37f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:02:21 +00:00