Behnam Heydarshahi
374b417b68
PanelSlicesAdapter: load slice label safely
...
Load the slice action label string safely when action label is set, and
no longer at adapter instantiation time.
Bug: b/298571448
Test: atest PanelSlicesAdapterTest
Change-Id: I0d5b6e0b2db2fa78d3f58ae2cb96f14437923ffd
2023-09-15 14:44:33 +00:00
Elliot Sisteron
f348c2c0b6
Merge "Handle "Blocked by your IT admin" better." into main
2023-09-15 14:19:32 +00:00
Manish Singh
8cef63acc1
Merge "Remove temp workaround for feature flag" into main
2023-09-15 10:13:01 +00:00
Graciela Putri
285a139c6f
Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24757660
Change-Id: I07abbfb97702a0c96ee3f3a80d13fc167c4bf978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 09:14:58 +00:00
Graciela Putri
263126b580
Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev
2023-09-15 08:48:24 +00:00
Chaohui Wang
5b439a3f44
Fix DevelopmentSettingsTest
...
And MoreWirelessSettingsTests.testVPNMenuLoad
Bug: 290684887
Test: ui test
Change-Id: I37ef70d1f6f75cd1721ab9ba0763f7ec20be80d0
2023-09-15 12:15:39 +08:00
Treehugger Robot
51749d4418
Merge "Refresh title in the Network details header" into udc-qpr-dev am: 6aaf49dc1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755454
Change-Id: Ic692b1ad20ae7a0ba31f2dbd6bfa3aa3cbb42024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 04:04:46 +00:00
Bill Yi
15d2faa382
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours am: dc677b1dae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: Ie5e9e73ed81c804d3fa5c1eed4167a1ee2f02e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:57:23 +00:00
Bill Yi
0f7805baae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours am: 9132dea94c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: Iaf15bd4fccf1c4a02e17b45472f566a237e67da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:57:19 +00:00
Bill Yi
2d940f20b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours am: 7b008e0d30 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: Ibfcfc39a3fd99cc0ada7415e4f95d4595d156415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:57:16 +00:00
Bill Yi
bbb4689c50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours am: a092264ef6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: I2ef5e44c0be56efa8048433211d8a5561f35852b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:56:59 +00:00
Bill Yi
f3e92a07f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours am: bd60635182 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I5cbc3eda75078204b537065661cc682943c47d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:56:41 +00:00
Bill Yi
cba2a350d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 9100600fc1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I04240b35407cdcb8fe9b2951a672274e45aba61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:56:29 +00:00
Treehugger Robot
6aaf49dc1d
Merge "Refresh title in the Network details header" into udc-qpr-dev
2023-09-15 03:53:27 +00:00
Bill Yi
dc677b1dae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: Icaa56f82e0e4536a201cbab71f5832ee7504e771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:13:20 +00:00
Bill Yi
9132dea94c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: I0da6b108e5a5450a7d5be5466fb2625a7d7b756a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:13:17 +00:00
Bill Yi
7b008e0d30
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: I407333dfe67fb94ab1dcf48ec4b7d3cbf109b191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:13:11 +00:00
Bill Yi
a092264ef6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: I8935907cc03ff683a8409ead219e51cc85282134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:12:52 +00:00
Bill Yi
bd60635182
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I2896773cd2033b0004c8cf5a5c00acc0fdbb0dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:12:39 +00:00
Bill Yi
9100600fc1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I43f821e74fd69496dc8728ece3d60c6e0501a4ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 03:12:29 +00:00
Chaohui Wang
d835649147
Merge "Extract app data usage to AppDataUsageRepository" into main
2023-09-15 03:00:53 +00:00
Chaohui Wang
fc7a1e01a9
Merge "Clean up SettingsUnitTests unused dependencies" into main
2023-09-15 03:00:21 +00:00
Bill Yi
cb2ae5d9ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours am: 14a4b2ac68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: I73f17d2a6bba59694770f102d5aef02ccc722cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:55:10 +00:00
Bill Yi
52fdc92144
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours am: 17d779411a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: Ie8bb65b4e0aa8b12f18a95df9b2e767da556e48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:55:08 +00:00
Bill Yi
68059e120b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours am: 837abf9244 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: I747bc20a64992e6b4c1fe2e4ddd7af251f343986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:55:05 +00:00
Bill Yi
df130891a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours am: c66c9a3b8e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: I719f9af3174e9b9b98effc54824f9bd01a12e58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:54:48 +00:00
Bill Yi
20def9d388
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours am: 1c98d2236a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I3eabacc0048276308260e9631219c707bb1dad84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:54:33 +00:00
Bill Yi
02f11dcb34
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 1840690d24 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: Ieeaaa0c114a69476a895e4f6d6019f7d8c8856e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:54:20 +00:00
Weng Su
fafdf08535
Refresh title in the Network details header
...
- Since the title information may be updated later, it needs to be refreshed continuously to display the latest results.
Bug: 299514568
Test: manual test
atest -c WifiDetailPreferenceController2Test
Merged-In: I4634c152b550c59bd9854cde1b91da44442aa879
Change-Id: I4634c152b550c59bd9854cde1b91da44442aa879
2023-09-15 02:52:38 +00:00
Bill Yi
14a4b2ac68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: I4a5acd1b9d2386268f8e9e35a15c2049c179b89f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:16:12 +00:00
Bill Yi
17d779411a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745009
Change-Id: I3332e68de3ceb844e1468000f675b6de776dd8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:16:08 +00:00
Bill Yi
837abf9244
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: Iab26b453ac39924af98b45108272d6e7954789a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:16:03 +00:00
Bill Yi
c66c9a3b8e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007
Change-Id: I565e9ffdd96de2239fc863acc204cbf2b8b82dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:15:47 +00:00
Bill Yi
1c98d2236a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I32a2e2fa4e19f682fe4260b5dd26ce39dcb8bf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:15:31 +00:00
Bill Yi
1840690d24
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005
Change-Id: I615e552bbb37ead26fd91021e6a25f556355de02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:15:17 +00:00
Bill Yi
9b966ddf8c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 55b68c4df3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744949
Change-Id: Ib155354696cf60096c363f3117ac8e620fde6a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:12:06 +00:00
Bill Yi
05f3d4b9fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 283a8d5d40 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744949
Change-Id: I19a6cfcb1e2b3648198745a61f9f5680a26e6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 02:11:52 +00:00
Bill Yi
6601eee9a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-09-15 01:34:33 +00:00
Bill Yi
61f7c7c880
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-09-15 01:34:33 +00:00
Bill Yi
6d1533eec9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-09-15 01:34:33 +00:00
Bill Yi
55b68c4df3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-09-15 01:30:30 +00:00
Bill Yi
73b5df4147
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-09-15 01:28:22 +00:00
Bill Yi
ee8b667a13
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-09-15 01:28:22 +00:00
Bill Yi
3c7144c4a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-09-15 01:28:22 +00:00
Bill Yi
245712159f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: 49e318ce55 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: Ia76fd5f02f01cbc650ccaae6aa112bc107a22019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 01:06:24 +00:00
Bill Yi
1fd629396d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: 3cf873896e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I55453a7c21d862ecd36efe8779f7b6dc7c0ca331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 01:06:20 +00:00
Bill Yi
35d51f1fc8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: 465cf9500b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I334e6b2d5495c62412d7d0524672beee3053e354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 01:06:15 +00:00
Bill Yi
a80e2a969d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 779bd81952 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I271f5bba8be97e85960f150509adc966818d6f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 01:06:03 +00:00
Bill Yi
6f48b8c62c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: cc92c9228e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: If6d1d59024877d4fada2d1f52786b417a29b8b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 01:05:49 +00:00
Bill Yi
1d28dfd4f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: f673fe0435 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I4fe3bc9b8c59a96e895381bb315caeadbf54d77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:27:09 +00:00
