Commit Graph

126907 Commits

Author SHA1 Message Date
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
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
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
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
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
Treehugger Robot
0acfbaefbd Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

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

Change-Id: I820b9037229c62403f275e5ab0ca35142f57c22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:48:25 +00:00
Treehugger Robot
427d02c584 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f am: 52414ae87d am: 35f8f17484
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

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

Change-Id: I949b2253f091d0cbb1797572a9f9d34ece27e9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:48:19 +00:00
Jason Hsu
19b2291bb7 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b am: b9f0489c01 am: 75b9499364
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I37b74d4cbd3906360e4a3a140d7a8d04ced66884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:48:14 +00:00
Treehugger Robot
ae9c230eba Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: a0c32784ea am: b86e027c88 am: 8b3c2ea963
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: Ibae5bd569b6e6b6c83153e680843db8a3d280e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:48:04 +00:00
Jason Hsu
687922f840 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: db3a350e4d am: d7b99e5b12 am: f6dae369c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I3e0419e382471fe42421b503a1f7842d5248ef64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:47:55 +00:00
Treehugger Robot
e26854e52f Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f am: 52e2ee66ac am: a500781d67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I553de416e42880e2c1054593c2498c3d5273337a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:47:44 +00:00
Jason Hsu
92c900091b Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b am: 013fc5a1ed am: 4f715ffa7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

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

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

Change-Id: I8065f98bd78eb7529427906611bccdc4c860cd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:42:25 +00:00
Treehugger Robot
643b51c42e Merge "[Settings] Remove redundant code." into udc-dev 2023-05-11 14:28:30 +00:00
Treehugger Robot
35f8f17484 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f am: 52414ae87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I8f342fcd9991a7dd530f15659002bb1000a7f1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:26:00 +00:00
Jason Hsu
75b9499364 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b am: b9f0489c01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: Icd7fb0e5cdc9599aa92e71b120b91fb6aa55382f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:25:51 +00:00
Treehugger Robot
8b3c2ea963 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: a0c32784ea am: b86e027c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I2325a3abafa665c56a25cdb0acedafadf4ba9956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:20:58 +00:00
Jason Hsu
f6dae369c5 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: db3a350e4d am: d7b99e5b12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I518895b65b3eb52a010d47b08ff414c3da20adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:20:49 +00:00
Treehugger Robot
a500781d67 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f am: 52e2ee66ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: If6c5231df1d4e4c8c9b2511d0b612180a6c4f733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:20:38 +00:00
Jason Hsu
4f715ffa7a Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b am: 013fc5a1ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: If8e7ba3aa15256770069fe19b37bdd8df24b2b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:20:17 +00:00
TreeHugger Robot
c271732a85 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev 2023-05-11 14:01:25 +00:00
Treehugger Robot
b86e027c88 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: a0c32784ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I9b16af70557443d118dfbbb05a5b67f31717e1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:43:54 +00:00
Jason Hsu
d7b99e5b12 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: db3a350e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: Ied21dcde49a87a2a7ea13032be9708793f40969e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:43:46 +00:00
Treehugger Robot
52414ae87d Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I25f361e28b334ab7bc13d6604d92124e513b153e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:43:16 +00:00
Jason Hsu
b9f0489c01 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I1e01ac445a7fb2f704d6c210f2783feeeee418e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:43:10 +00:00
Treehugger Robot
d85207f595 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: a4d821961a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I5dd3d4e199abdc7af47abd63b5066b29da9a8d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:39:42 +00:00
Treehugger Robot
52e2ee66ac Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I7004df1ab07821273a6bf459528cac71450951e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:39:24 +00:00
Jason Hsu
013fc5a1ed Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: Id7c9ecf428c2cc3bb8e51d940733e9ac65ba2928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:39:16 +00:00
Jason Hsu
763f430eba Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 08b309dd75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I33cdfb6cfa411354110f4ca9a0d4635d212652d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:39:07 +00:00
Treehugger Robot
9d62e08249 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 8bf8d0b1eb am: d22d3ff4eb am: 4833f8e853
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Ie4b02b232e48396a6b5b5838ea63989afb0db079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:26:15 +00:00
Treehugger Robot
4047d82651 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: cb9d74cea2 am: 5acc7def5e am: f439fe8423
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Ifdf7ba74080888e08198f48c3a38aaa8a59952d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:25:26 +00:00
Treehugger Robot
5a808d419b Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 8bf8d0b1eb am: c75b598d0c am: de4e33dc52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: I77db65af62d159539cdec03ea5586fd164ae17df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:23:23 +00:00
tom hsu
75b24e421e [Settings] Remove redundant code.
Bug: 280236099
Test: make passed
Change-Id: I34e0632887ac38658761abd7d6a7e9f1e0f84bf1
2023-05-11 21:12:29 +08:00
Treehugger Robot
4833f8e853 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 8bf8d0b1eb am: d22d3ff4eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

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