Bill Yi
674f6bde06
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours am: ebedb167fc
-s ours am: 28743336b7
-s ours am: 73006ce3e3
-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: Id0f95a1174cae3739e3a3fd1ff87af646ba76fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-16 01:34:19 +00:00
Bill Yi
b8ce7243d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours am: b1e0ae99ce
-s ours am: 8c3f41b3f7
-s ours am: 588c5b7c9d
-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: I359eb5189e7433e612e23a384865050031f2a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-16 01:34:02 +00:00
Joshua Mccloskey
48621c5aea
Merge changes If2fc46b1,Ib54da7a8 into main
...
* changes:
Add enroll() in FingerprintManagerInteractor.
Fix SettingsV2 tests.
2023-09-15 16:03:04 +00:00
Chaohui Wang
14655b03fb
Merge "Fix AppInstallerInfoPreferenceTest flakiness" into main
2023-09-15 15:57:50 +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
Chaohui Wang
5b439a3f44
Fix DevelopmentSettingsTest
...
And MoreWirelessSettingsTests.testVPNMenuLoad
Bug: 290684887
Test: ui test
Change-Id: I37ef70d1f6f75cd1721ab9ba0763f7ec20be80d0
2023-09-15 12:15:39 +08: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
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
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
73006ce3e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours am: ebedb167fc
-s ours am: 28743336b7
-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: Iaf3b7edef07c39562659b3ab37a4588c179c5fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:12:11 +00:00
Bill Yi
588c5b7c9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours am: b1e0ae99ce
-s ours am: 8c3f41b3f7
-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: Ia14824711e4943950481e0731942b62befefda5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:11:55 +00:00
Bill Yi
28743336b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours am: ebedb167fc
-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: I713e7bf989f8d69d7c30b525cb646a51c54d3976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:35:54 +00:00
Bill Yi
8c3f41b3f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours am: b1e0ae99ce
-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: I0a17d2096360a573d9a044e4ee73e2985bf0f163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:35:40 +00:00
Bill Yi
f5ebe7f8e9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours am: 1212bc0c65
-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: I5870549fe1b12e908ad467135bd4f458619171d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:32:32 +00:00
Bill Yi
8937db25c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours am: 7809f23d86
-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: I0fb0f237085c669fecf26d507dd96e49cb9e5093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:32:28 +00:00
Bill Yi
b37b105e4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours am: 28fe5a73b4
-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: Ifb6f196d2b1467a2112281f5795cdf3d942e1e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:32:23 +00:00
Bill Yi
bd629e582a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours am: 2d60426351
-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: Ied2188f4ac9b53f1856e59c0e0daaa8cf50113d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:32:14 +00:00
Bill Yi
b914d8de80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours am: 64f57c51d1
-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: I9a9b7409c83002a01365e5160cf9ad3221a52642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:59 +00:00
Graciela Putri
45f0ffec68
Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev am: 7cf5bb509e
am: ae170b7970
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24742814
Change-Id: I6884fdba3d78097dc56af63076e8b0cc3a1c7e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:02 +00:00
Bill Yi
1212bc0c65
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-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: Icc714d5abd066bb0388561dee81a0af14608298b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:39 +00:00
Bill Yi
7809f23d86
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-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: I79b99983394d20a324171cb04446917013e32813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:34 +00:00
Bill Yi
28fe5a73b4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-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: I2f66b8fcf09b63c913f202d037f62fa22a9628ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:31 +00:00
Bill Yi
2d60426351
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-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: I0d9782dbcb97645ec87269968e1e411e33917648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:19 +00:00
Bill Yi
64f57c51d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-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: I79377d8dc3c4978d05d15929d0df425307d85ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:07 +00:00
Bill Yi
ebedb167fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-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: I348161b5db4874cb2e47bdc560351db4d73ea36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:03 +00:00
Bill Yi
b1e0ae99ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-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: I896f371b555159556a070588bbdc504a10976fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:21:49 +00:00
Hao Dong
2200f55ffe
Add enroll() in FingerprintManagerInteractor.
...
Test: atest FingerprintManagerInteractorTest
Bug: 295206773
Change-Id: If2fc46b1c952c3e55c698a18e125e194efe5ffb6
2023-09-14 23:08:33 +00:00
Bill Yi
880a595859
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Bill Yi
eaa3838179
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Graciela Putri
ae170b7970
Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev am: 7cf5bb509e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24742814
Change-Id: I1f559828d5ab7ce517b231df8bd0f7e92541b677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 22:32:52 +00:00
Treehugger Robot
40265208e5
Merge "Refresh title in the Network details header" into main
2023-09-14 22:08:05 +00:00
Graciela Putri
7cf5bb509e
Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev
2023-09-14 21:25:52 +00:00
Weng Su
54d0709409
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
Change-Id: I4634c152b550c59bd9854cde1b91da44442aa879
2023-09-15 04:45:25 +08:00
Becca Hughes
8a416501d2
Merge "Add a couple of guards to make sure crash doesn't happen" into main
2023-09-14 18:16:16 +00:00
Graciela Putri
033c33e287
Merge "Add aspect ratio title strings for translation" into udc-qpr-dev am: c7757a00d3
am: 5faa0d8d2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24733894
Change-Id: I6b06c715428abeed6400f99eb1b8f1b6d3b03410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 12:37:35 +00:00
Graciela Putri
5faa0d8d2f
Merge "Add aspect ratio title strings for translation" into udc-qpr-dev am: c7757a00d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24733894
Change-Id: Iea368681c3021e23f33ba8ea5e61de4e5618360d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 11:45:48 +00:00
Graciela Putri
c7757a00d3
Merge "Add aspect ratio title strings for translation" into udc-qpr-dev
2023-09-14 11:06:09 +00:00
Charlotte Lu
6cace3a05f
Merge "Add flag to change to the new APN page." into main
2023-09-14 10:46:11 +00:00
Graciela Wissen Putri
392a811294
Add accessible sequence for aspect ratio options
...
Fix: 297293566
Test: Manual
Change-Id: I12b61ccd0330b80e027af7a9eb1693b8d94cc262
2023-09-14 10:35:05 +00:00
Chaohui Wang
c31474c02c
Extract app data usage to AppDataUsageRepository
...
From DataUsageList for better organization and testing.
Bug: 290856342
Test: manual - on DataUsageList
Test: unit test
Change-Id: I97e327a220d40942b9345ec7f1f8c466ac1fc9da
2023-09-14 16:48:29 +08:00
Graciela Wissen Putri
57816e8cf6
Add aspect ratio title strings for translation
...
For the purpose of translation, we are adding all possible permutations
of aspect ratio titles/labels.
Bug: 300219974
Test: Manual
Change-Id: Id0a63098f773ed7cd5e3bdf043633e7ea4a9202f
2023-09-14 08:45:30 +00:00
Chaohui Wang
e4f5ac6b24
Clean up SettingsUnitTests unused dependencies
...
Bug: 290856342
Test: atest SettingsUnitTests
Change-Id: Ifcec968b3dfca965c8cd5b897bbdf84dfe220fd5
2023-09-14 15:59:59 +08:00
Milton Wu
2c114331aa
Merge "[BiometricsV2] Ignore ui tests" into main
2023-09-14 05:59:41 +00:00
Bill Yi
18b2309d22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a9dafd684c
-s ours am: 0d72215c72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010
Change-Id: Ib7fb15ac5fe5a7b8ecf8cf919037ba7cb4b25b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 03:19:51 +00:00