Treehugger Robot
62c6c859fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434423
Change-Id: Ie338e611aa5e9840b9572c809b84fb34d8586575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:59 +00:00
Bill Yi
1b8cdb3c54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434423
Change-Id: I86b440f3d30c85fe51b77d1bc4af2da06fe35d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:55 +00:00
Treehugger Robot
b04d88f081
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: I3a5703f75f3763d05931c8d7abc992e365aada7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:46 +00:00
Bill Yi
f7a1f6301c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: Iff2068755443b1941a128c323904c6cd6c20067c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:37 +00:00
Bill Yi
0d737ffce4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433951
Change-Id: I098b4bfef9981e6ed0a1a46271b46e124bcec7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:18 +00:00
Treehugger Robot
c3cd16d5b8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434423
Change-Id: Id1c88f7c13af19bc90c820557247edca68f09c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:17 +00:00
Bill Yi
08e62ded38
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434423
Change-Id: I0e48c4206df34b472661b249063f243bf62a98f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:14 +00:00
Treehugger Robot
1b931db3c4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: I623269600f38f18cb354966ee0780a4e4cd11d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:04 +00:00
Bill Yi
7046a1bc58
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: I3a207fb250e57fa20cb490003460e2f6984a67ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:27:58 +00:00
Bill Yi
dd6b25ed95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433951
Change-Id: I25f6d8a8a8299b8fc9cf52e3babe1b682c6bc1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:27:36 +00:00
Treehugger Robot
42e15a0ff5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-16 17:20:12 +00:00
Treehugger Robot
eb5aef41ff
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-16 17:20:12 +00:00
Bill Yi
bc4a81b5bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b210245d52
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24436825
Change-Id: I9e37890208a6e8a4024c484a54d353b0dc8c8bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 16:57:09 +00:00
Treehugger Robot
4585b13c9a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-08-16 16:33:50 +00:00
Treehugger Robot
7de409b834
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-08-16 16:33:50 +00:00
Joshua McCloskey
5ee142b3c4
Adding owners file for biometric settings.
...
Test: N/A
Change-Id: Ib28a1a589fe0fa0e39499decb268a83e40e273c4
2023-08-16 16:31:23 +00:00
Andreas Miko
05514d0f4d
Change nullability of inheriting function of PinPrivacyPreferenceController
...
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
(cherry picked from commit a7d7eb9a16
)
(cherry picked from commit 4ca80e6013
)
2023-08-16 15:45:00 +00:00
Joshua McCloskey
2e0244e323
Modifying FingerprintSettingsV2 structure
...
Test: Verified manually enrollment skeleton works.
Test: atest FingerprintSettingsNavigationViewModelTest
Test: atest FingerprintSettingsViewModelTest
Change-Id: Ifcb8f0bbb2fa83144101661d66772be1434044c9
2023-08-16 15:21:35 +00:00
Vania Januar
d8ee6665f7
Listen to USB_STATE events in the StylusUsbFirmwareController.
...
Test: UsbStylusBroadcastReceiverTest
Bug: 288850921
Change-Id: I415e5ca04d371a235eff31327b086d568bcc00f0
2023-08-16 15:18:40 +00:00
Joshua Mccloskey
9163a5db6d
Merge "Basic structure for fingerprint enrollment." into main
2023-08-16 15:10:55 +00:00
Chaohui Wang
54d8bbcaf5
Merge "Use resource processor for SettingsRoboTestStub" into main
2023-08-16 11:09:09 +00:00
Tetiana Meronyk
3e6c31951c
Merge "Disable multiuser toggle when more than 1 user is created" into main
2023-08-16 10:16:48 +00:00
mxyyiyi
af8fdee7e3
Update power_anomaly_event proto fields
...
- add enum PowerAnomalyType/PowerAnomalyKey
- update the func to get anomaly index
Test: manual
Bug: 291689623
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:356be9109080bc54232ff801b739ec10cab4fdfa )
Change-Id: If4e6684c8169dfa3edd4e18a11d518737a3b2840
2023-08-16 08:56:36 +00:00
Zaiyue Xue
50da7feeb9
Battery usage page latency improvement (1-8)
...
Save battery slot diff data into database in hourly job. Then read the
saved diff data and only calculate the remaining data. This could speed
up the battery usage loading.
Bug: 261163071
Fix: 261163071
Test: manual
Change-Id: Icd4868ca9326b64b17ddbccdb0311e755dc68026
2023-08-16 15:12:04 +08:00
Graciela Putri
ab7f57b17c
Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd
am: 725efb1a5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274
Change-Id: I5cdb28b8929b0ab8dba829ee6e12d880ca6cc27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 07:04:50 +00:00
Graciela Putri
725efb1a5a
Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274
Change-Id: Ic2222519338f30df3d6dd5fea2df5b99bc4eb931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 06:20:48 +00:00
Graciela Putri
83c8f47ddd
Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev
2023-08-16 05:31:44 +00:00
Chaohui Wang
f5335790bb
Use resource processor for SettingsRoboTestStub
...
Bug: 293810334
Test: m RunSettingsRoboTests
Change-Id: Ie063a19695e54619ef511b86e0bbed2c2db45a3e
2023-08-16 13:28:02 +08:00
Bill Yi
7f1150a448
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a89870f9adf166a5ea4730b9c99c9adae7b704f
2023-08-15 17:42:02 -07:00
Bill Yi
1846501072
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9df571068061bffe477823871216b34915a56065
2023-08-15 17:40:45 -07:00
Bill Yi
f2db4ba3b4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f5da554a8b2bbffb823c9bf1bcba9f3acf71675
2023-08-15 17:26:51 -07:00
Bill Yi
ca875c1273
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If776a5183b839dc0eaee9602839f238fec089bf7
2023-08-15 17:24:27 -07:00
Bill Yi
55bf4eab3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib467e8e41149b3f7535b421d2c83e7725d9a62e3
2023-08-15 17:18:40 -07:00
Bill Yi
fcc86e4d40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7c6ef64387f2e216af86bdda01b9a0de9826b79f
2023-08-15 17:17:23 -07:00
Bill Yi
b210245d52
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I48a799093cbcd9bde0aec05fce89b1ede1f2234c
2023-08-15 17:15:09 -07:00
Bill Yi
e04caacadf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice181fffb6bcebdc1afbde4304bc76dba8d1d24f
2023-08-15 17:13:07 -07:00
Justin McClain
5c739de558
Remote authenticator enrollment enrolling layout.
...
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.
Bug: b/293908453
Test: atest RemoteAuthEnrollEnrollingTest
Change-Id: I56c7fb2481ace359813c27e7538bec0baceffced
2023-08-15 20:11:31 +00:00
Justin McClain
3b56d1fca5
Merge "Remote authenticator settings layout." into main
2023-08-15 19:40:49 +00:00
Alex Salo
bab62119e8
Merge "Add oxford comma to passwords & accounts settings page" into main
2023-08-15 18:56:38 +00:00
Anvesh Renikindi
7b93594b7f
[automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-qpr-dev-plus-aosp am: fde4c5d8c0
-s ours
...
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 a7d7eb9a16
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24421669
Change-Id: If05c5aa2a8797be34742f4a9c978cab84f02d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 18:51:10 +00:00
Andreas Miko
7df8aebceb
[automerger skipped] Change nullability of inheriting function of PinPrivacyPreferenceController am: 4ca80e6013
-s ours
...
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 a7d7eb9a16
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24421669
Change-Id: I912cb8c717c8236c4cd3d899680ce045b84acb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 18:51:03 +00:00
Bill Yi
33cf2a3dd6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I80e4d42c270ba65b724a78e18899c2e12082f1e1
2023-08-15 11:07:44 -07:00
Bill Yi
863f3e3a35
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a1b6861b7c389c2c52f63226366510a36ac4987
2023-08-15 11:06:44 -07:00
Anvesh Renikindi
fde4c5d8c0
Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-qpr-dev-plus-aosp
2023-08-15 18:06:08 +00:00
Bill Yi
3c382e6941
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I107e068adba06990b1ce150bfcd4b29841220b23
2023-08-15 11:04:13 -07:00
Bill Yi
55c45ed419
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib12eb53f2344147d55bbd56093f1fa8a945bb1d6
2023-08-15 11:02:18 -07:00
Bill Yi
cf2c3e9981
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7e2f5d483c30a6f1e841534bf2fde598ecd4986
2023-08-15 11:00:29 -07:00
Bill Yi
f67ff302c5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia7d1f3378e7ac754e78e12a4d7b71c67f0899fe1
2023-08-15 10:59:35 -07:00
Alex Salo
f55c4bfb2a
Add oxford comma to passwords & accounts settings page
...
Bug: 295534240
Change-Id: Ic424c243e68aa58304f85ad68798c4c915bd05f7
2023-08-15 17:33:31 +00:00
Joshua Mccloskey
12bf914caf
Merge "Adding more tests for FingerprintSettingsV2" into main
2023-08-15 17:30:37 +00:00