Bill Yi
|
0f29b9bc51
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: cca1e959ee -s ours am: 2e4673500f -s ours am: dc44ac77cc -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: Id4fe828d075369b73a22c96b7c3975621fafde78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-16 01:34:42 +00:00 |
|
Bill Yi
|
6a9d166bcd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 4e2f191fe5 -s ours am: df9839f6d9 -s ours am: 7e7efd0f80 -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: I9afd2275f926f7397afc643439268cf01da9d31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-16 01:34:38 +00:00 |
|
Bill Yi
|
ffaca8c1c5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 64677e15d9 -s ours am: 8f1383cba3 -s ours am: aa2ae14f84 -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: I1970b353561930c6c79f19b8ac9c53a2aad00f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-16 01:34:35 +00:00 |
|
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
|
dc44ac77cc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: cca1e959ee -s ours am: 2e4673500f -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: I3cdc84af5cc80c61263063b30c92581c7686d73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-15 00:12:25 +00:00 |
|
Bill Yi
|
7e7efd0f80
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 4e2f191fe5 -s ours am: df9839f6d9 -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: Ie4a2fd92674e6cc3623d0d5f072d88786fc3487b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-15 00:12:23 +00:00 |
|
Bill Yi
|
aa2ae14f84
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 64677e15d9 -s ours am: 8f1383cba3 -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: I88cadc37896dee9e2e6f5011fc5a38e5f9fc37c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-15 00:12:20 +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
|
2e4673500f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: cca1e959ee -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: I23cd04d07b0e762ad09a0120c7d38bbd01e7baa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-14 23:36:10 +00:00 |
|
Bill Yi
|
df9839f6d9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 4e2f191fe5 -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: I2ca8072521f3d6d4a2d63d7291fd34834f6ea80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-14 23:36:07 +00:00 |
|
Bill Yi
|
8f1383cba3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 64677e15d9 -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: I4bdd0d4530076ede0c28e4677a19bb0ee037f230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-14 23:36:04 +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
|
cca1e959ee
|
[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: If995c1c1d9eb8d5023e42ea8996fa6fdc324f8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-14 23:22:23 +00:00 |
|
Bill Yi
|
4e2f191fe5
|
[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: I24d9904d6fef76ba1efe2360858b05f2e3d8dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-14 23:22:19 +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
|
64677e15d9
|
[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: Ic39f291d6dd9e58de865f710a5d7cf3a61cbb7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-14 23:22:15 +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 |
|