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

127302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
81ac516705 Merge "Fix string" into udc-dev 2023-05-11 19:21:54 +00:00
Hao Dong
09362ab430 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours am: f99b22505b -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: Ia23d8f6fdf72bb36ae0bfd52fde36d0b4be36146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:12:39 +00:00
Hao Dong
4172ed9816 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 4762df7e21 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I0cdef07f3901b531f78f50a4a25bd3fc55e5535d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:08:09 +00:00
Hao Dong
119012dd06 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 3d52ce0a95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I6825102c105e5e0c9a7302c9b696d44a885ad120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:03:44 +00:00
Hao Dong
f99b22505b [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I43bfbe506a4a65e3867c865ad028b6c8c8a3c97b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:42:18 +00:00
Hao Dong
4762df7e21 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I8f0423bba882ed4d2ba3c84fb99dbb38aef0683f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:41:24 +00:00
Hao Dong
f4cb747372 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: a17d706d89 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 968c5fb6f0 is already in history

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

Change-Id: I4685547d1294607e4ffe0bd0cd078dc80d50ac94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:39:06 +00:00
Hao Dong
3d52ce0a95 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I6436874a454da9870a6e872e67334a5432c77635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:39:04 +00:00
Yuxin Hu
715a70603c Add AndroidJUnitTest for developer option switch 
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
 2023-05-11 17:59:21 +00:00
Hao Dong
51554eb9a1 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I0fe97397b725927263ef4bf4e550199911c64217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:57:59 +00:00
Hao Dong
a17d706d89 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: Iedba9fd97c7657ac860276f7a0a19e0a89c4541b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:56:56 +00:00
Hao Dong
0ff2d2b2af Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: Iaaab846636e37e82b01d0a11881083be760a482a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:54:13 +00:00
Becca Hughes
f7c4d9c903 Fix string 
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
 2023-05-11 17:45:30 +00:00
Hao Dong
cddf296c82 Hide description text view if there is overlap. 
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code.
2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag.
3. If description text view has overlap with udfps progress view, hide the description text view.

Test: atest FingerprintEnrollEnrollingTest
Test: manually test by setting both display and text largest size and
start enrolling fingerprint; the description is hidden if it's too long.
Bug: 260970216
Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
 2023-05-11 17:34:07 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
tom hsu
5e2862f2e3 [Settings] Avoid to unregister wrong observer 
Bug: 262345047
Test: atest passed.
Change-Id: If324e8f35c15053b48320f86ff22759a6a68a62f
 2023-05-12 01:10:19 +08:00
Treehugger Robot
5fc321c413 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 90456a7140 am: 842e51e19d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Ie0120c0e32be0a39b131e0d6bd6409af9c95061c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:26 +00:00
Treehugger Robot
2e1e70037b Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: 65ef6d0f2f am: ff7d516eec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Ibf1377932e3f12097ad524d91ad83a086c2a253b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:18 +00:00
TreeHugger Robot
a2a4337891 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: 2f0c6e89a4 am: e45f5fff74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I1a090e19124dbbed5dd7c37296a180c10a152452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:10 +00:00
Treehugger Robot
13c33b4a74 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: e2ff838b0c am: 06661db1fa am: 98d872d0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Ibe080f921e3ccbeb7c2154e624f4436124764444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:00 +00:00
Treehugger Robot
a2898730ae Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 1fa9e9fac5 am: 02237bf13d am: 46d938dec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I941baadd9fe48fef0ad3c3137f0fc3a6c7200f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:59:51 +00:00
TreeHugger Robot
fbae65eadf Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: c639d6fd91 am: f178365e07 am: fe62fa5583 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Ib34345dba25e5382b51a0fe804cd6388d0221cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:55:18 +00:00
Treehugger Robot
2d20a1dc38 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 3a788f845e am: 89ac7e108d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I0dc4bceccd15a4fd84085dc499630cdab2425790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:54:40 +00:00
Treehugger Robot
d4b0197c44 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: ce0a356845 am: 8b32e6f12f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I3502b0c415c03a760cba0a4a0fe25b79b025de0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:54:14 +00:00
TreeHugger Robot
66c61a3335 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: c4ee326ee9 am: 72269bf6d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Ie9d10a396df739950bfaf118e4ae5345f51a2ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:53:14 +00:00
Treehugger Robot
842e51e19d Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 90456a7140 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I1bef49554c966ec58026eacea7654023c03f75a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:12:21 +00:00
Treehugger Robot
ff7d516eec Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: 65ef6d0f2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I875b53a2d8fb092c5a1b8bf86f36ce1daf0bda95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:12:13 +00:00
TreeHugger Robot
e45f5fff74 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: 2f0c6e89a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Id8cd60c784e30b960dfa6e4b3db9675f8e6ffde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:11:37 +00:00
Treehugger Robot
98d872d0fb Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: e2ff838b0c am: 06661db1fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: If8c20aa74befdae56f87169c7a8decacd0c570a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:37 +00:00
Treehugger Robot
46d938dec9 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 1fa9e9fac5 am: 02237bf13d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I68211855e3ca0323120cb2e0565bf3b10aa415aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:30 +00:00
TreeHugger Robot
fe62fa5583 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: c639d6fd91 am: f178365e07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I54577ef4b89af465349d679fb2b635bc0abd9726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:22 +00:00
Treehugger Robot
89ac7e108d Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 3a788f845e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Icb2e2b017265008b4267440c6fd62bd539497009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:14 +00:00
Treehugger Robot
8b32e6f12f Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: ce0a356845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I17ddbe34bb2c9414e2efc33117ed449d40bd4d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:06:41 +00:00
TreeHugger Robot
72269bf6d4 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: c4ee326ee9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I83bee5495540f133c57d53b2a7dffac28d4b300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:06:01 +00:00
Treehugger Robot
90456a7140 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I75aafba2b90ce316476ae5f6f6603a1a8566fe53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:42 +00:00
Treehugger Robot
65ef6d0f2f Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I36817d0dfa5b91e10541569cbfa264720867e498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:34 +00:00
Treehugger Robot
06661db1fa Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: e2ff838b0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I2da8d5d7ba24bca4e9aa253806606c4100dfd0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:11 +00:00
Treehugger Robot
02237bf13d Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 1fa9e9fac5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I3dd0a9ec59cdbf5f21ef6780a4c205474fee614e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:03 +00:00
TreeHugger Robot
f178365e07 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: c639d6fd91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Icfe9b872290c8941e9f284e6d18c13071bbbc270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:29:44 +00:00
TreeHugger Robot
2f0c6e89a4 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Ibebf1635ffe9275e01f2b4d8a54648dfd877b1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:29:07 +00:00
Treehugger Robot
7df8049f61 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: b55a258d8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I720a344078a84c8ed16ebe8acc5f531d66556942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:26:09 +00:00
Treehugger Robot
010b90575a Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 4a0370c783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Iabcb051daff6ed0cffad1280b68c263d2c4f05ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:26:00 +00:00
TreeHugger Robot
d44a69b9fb Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: 341ec2f35f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Id5314e4a70ba4d0261ced8ede394090a6505aeb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:49 +00:00
Treehugger Robot
3a788f845e Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Id4948f9511ce543ccad9256c20a58f9d4f9e9603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:45 +00:00
Treehugger Robot
ce0a356845 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Icf3daafbfbc03063ef2ff6474373e826e5b48590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:37 +00:00
Treehugger Robot
e2ff838b0c Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I2b2bbe36980949ff99d36f18013c2be2d3767e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:02 +00:00
TreeHugger Robot
c4ee326ee9 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I49e1d3e8b32d7ead14abcf4bf3ee27b26cfec233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:24:58 +00:00
Treehugger Robot
b55a258d8f Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Ib9a230f8ce28b728f4d060eb0fcd8b98259ad436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:07:11 +00:00
Treehugger Robot
9799b0bfdb Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I6ca26dce7454098b492e6016936c6091e89106f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:07:08 +00:00
Treehugger Robot
59ec10b05a Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev 2023-05-11 14:52:04 +00:00