Bill Yi
1605dfab0b
[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: Id3cece510886a8139e78f9c3b61247922bd59ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:30:57 +00:00
Bill Yi
02cdab0a91
[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: I26b465cbee66b582976f57f7374d4c953d409648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:30:44 +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
Holly Sun
9fa69928d5
Use launcher namespace instead of settings-ui namespace.
...
Bug: 294858168
Test: manual + unit
Change-Id: I5820ba86686584b7bc4a2ad695e5b5c0cf46b297
2023-09-14 23:06:58 +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 Wissen Putri
7889f55f3d
Remove moreOptions in aspect ratio settings
...
System apps that are not visible in Home/Launcher are already excluded
by default.
Fix: 299924064
Test: Manual
Change-Id: Ia5972f23b1a9dd2f6dda65fb02784fe722e7a63a
2023-09-14 13:23:09 +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
Bill Yi
7ab2411d9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67f2c30f07
-s ours am: 69621a6507
-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: I26161f99596ae9fc6161f90aa3ef5f7be1b8c83d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 03:19:49 +00:00
Bill Yi
4cb885ae3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 547444fcf9
-s ours am: 3a0e0371be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008
Change-Id: I0e1a35b2c0fb47277371e1a94b662f0d7d7d7c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 03:19:46 +00:00
Bill Yi
46dc4918d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f77fcdcc19
-s ours am: 93d3c81dd7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008
Change-Id: Iab325c8730c1ef8b9b22484cc95c83969989d715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 03:19:44 +00:00
Bill Yi
c09d1d9d50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 77e9b3e439
-s ours am: 37b524bcb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006
Change-Id: I9c5f01c842f7cfbe37338d2e1c4a958fcfeb5a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 03:19:33 +00:00
Bill Yi
4a6b08e671
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51f5fc71d9
-s ours am: 61b3d62e5f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006
Change-Id: Iad71b02322bfeb43c1a4689a9b6ec2b129341d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 03:19:18 +00:00
Hao Dong
26cd19552b
Fix SettingsV2 tests.
...
Test: atest FingerprintSettingsViewModelTest
Test: atest FingerprintSettingsNavigationViewModelTest
Bug: 300343752
Change-Id: Ib54da7a8839cecb16de65d20fce56248e6c60384
2023-09-14 02:50:10 +00:00
Bill Yi
0d72215c72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a9dafd684c
-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: Ib3396c59242d2f582af9138cf6085184b910eb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:36:05 +00:00
Bill Yi
69621a6507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67f2c30f07
-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: I29c132ad2c05640318f6175c9baead62becb75dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:36:01 +00:00
Bill Yi
3a0e0371be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 547444fcf9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008
Change-Id: Ib91f69c00f3175ad5c2233e412dd52248dc0f75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:57 +00:00
Bill Yi
93d3c81dd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f77fcdcc19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008
Change-Id: I7ffe65ac35a4f3953b6f2a424c20845a55adac41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:42 +00:00
Bill Yi
37b524bcb4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 77e9b3e439
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006
Change-Id: I3a4b81212c98c11bb4026a5da1b6249c457f8758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:32 +00:00
Bill Yi
61b3d62e5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51f5fc71d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006
Change-Id: I26489bb2b17f0059a07bb4dbd1efbf3074ec733b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:18 +00:00
Bill Yi
a9dafd684c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-14 02:07:40 +00:00
Bill Yi
547444fcf9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-14 02:07:40 +00:00
Bill Yi
77e9b3e439
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-14 02:07:40 +00:00
Bill Yi
2127868ff7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 460579f2b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744948
Change-Id: If966cd91ed1743fee821b507f1977179fcda5208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 22:15:15 +00:00
Hao Dong
eea9199c9d
Merge "Use FingerprintSensorType in shared lib." into main
2023-09-13 22:09:34 +00:00
Anvesh Renikindi
dc37fd1c99
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours am: d783537f9f
-s ours am: a5a031f98b
-s ours am: a73a6376ea
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I71ed1d60155b4118ccb3b4606d2fa2938260b9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 19:45:30 +00:00