Treehugger Robot
fe7fea4282
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: b94d42a51a -s ours am: a0d739518b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I96f18a834847605eab9a8b5e819570843c73435e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:14:17 +00:00
Taran Singh
f4b5fcccc5
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 9f09ec9203 -s ours am: 0524d2a6ab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I849e8fb52ac7645b22a9ab18001a843b5c82675d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:14:12 +00:00
Treehugger Robot
b614f40d89
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: f87cff76ff -s ours am: 6630f7e14f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I26b5fbe6815e30c7a6314581531fa487fe0b23d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:13:16 +00:00
Taran Singh
a155a715e8
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 2ac035a723 -s ours am: fa58331cae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Ifd602d99f9e0a384eff6c12cea8802226ca424ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:13:12 +00:00
Treehugger Robot
2e44e7c58c
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: f87cff76ff -s ours am: 58c1caf910 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I2421906fdd7c6d419bdf44b321e742f75888e08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:53:49 +00:00
Taran Singh
b45737bd6c
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 2ac035a723 -s ours am: ea2893fc07 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I8c4d3c1667ab021141285dea728e0f7ee45c408e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:53:46 +00:00
Treehugger Robot
58c1caf910
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: f87cff76ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Iac2b4bfc2e421c4f32d28d9bb82651e66a9f7c14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:45 +00:00
Treehugger Robot
a0d739518b
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: b94d42a51a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Ieaaf04e3bb4ea7748a409f422939a43192bb65c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:43 +00:00
Taran Singh
ea2893fc07
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 2ac035a723 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I7b58ccb278aeee94b27d0e54e42992db0ba364df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:42 +00:00
Taran Singh
0524d2a6ab
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 9f09ec9203 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I585234b71f59a6d4b839ee51ac64b337073afaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:40 +00:00
Treehugger Robot
6630f7e14f
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: f87cff76ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I884443606fd2c28eff73ffb06385f26e0f42e988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:47:23 +00:00
Taran Singh
fa58331cae
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 2ac035a723 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Ie5c1b6b77c2f0b6b4bd597885e1062296e5a74d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:47:20 +00:00
Treehugger Robot
b94d42a51a
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I18d13f6ce7527ea530ed980b2e424a21bcc8cff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:06:18 +00:00
Taran Singh
9f09ec9203
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I8ddbba740a4dea4b6da9ee79c7f93b2ca47ab085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:06:13 +00:00
Treehugger Robot
f87cff76ff
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I7672d7a7fd2be3c0fb1b794e57b26d0e270e9dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:05:45 +00:00
Taran Singh
2ac035a723
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I840417aa2a6033b66b08c2281e31d12410b0fbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:05:43 +00:00
Treehugger Robot
faa7a8af3d
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I46d1a6d58214292929bc45c769cca4005c2aa4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:42:59 +00:00
Taran Singh
14f11e845b
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I3abe84b4918e7be076136db9abc4589bf0bd8633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:42:54 +00:00
Treehugger Robot
fbe97f1ee4
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev
2023-07-06 20:04:21 +00:00
Hao Dong
d4f621f613
Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042
Change-Id: I8a065cfc1717fbc5036573c8c46cb8eee01c0e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 19:40:14 +00:00
Hao Dong
bee02bbbe7
Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev
2023-07-06 18:45:27 +00:00
Tetiana Meronyk
70bdc38d4a
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169
Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev
2023-07-06 13:17:36 +00:00
Rhed Jao
a357341837
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782
Change-Id: I72588a3e8ff494cd31f72531ada1baef867fb7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 02:51:45 +00:00
Rhed Jao
2070808a62
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev
2023-07-06 02:36:45 +00:00
Quang Luong
e90bb0aedc
Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053
Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d
Merge "Use speed string from WifiEntry" into udc-qpr-dev
2023-07-06 01:49:56 +00:00
Michael Mikhail
1ccbd3966b
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 am: 8f88d32f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Iedb8ee79c516ebb582c27f3b6584782c6887fa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:16:59 +00:00
Michael Mikhail
b1c8541600
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: f7b82efb83 am: c2ddd3e581
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I6648eb8daf07a81653d7e5be316239a1e8cec4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:11:39 +00:00
Michael Mikhail
5e9026aa80
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 am: 1db4bc3676
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ie88d511f8c1fb4047a62425e49cd2b120062b5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:11:30 +00:00
Michael Mikhail
c2ddd3e581
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: f7b82efb83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4a9b2877ea13e7bd6ce6d187d416d233141560a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:34:28 +00:00
Michael Mikhail
8f88d32f18
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ia4c82cc1a96ab511fe58aa3747082931304fc68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:33:59 +00:00
Michael Mikhail
1db4bc3676
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Michael Mikhail
f7b82efb83
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: If9ced263d3b60723d39ec471d1e32f800334c046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:47:08 +00:00
Michael Mikhail
83c13d6563
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Treehugger Robot
721efc0ed5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I7e3bcef9a4dc00d76c934ce2c55759089179f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 09:35:31 +00:00
Treehugger Robot
b2f436f310
Merge "Fix test case failure." into udc-qpr-dev
2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c
Fix test case failure.
...
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.
Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
2023-07-05 15:43:34 +08:00
Tetiana Meronyk
b88bad678d
Fix "Allow guest to use telephony" toggle not updating its value
...
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Chaohui Wang
d4b80ec424
Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: a51e013746
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: Ibcb0a2bc04b0c19f036bcb2039cfa93663b1ec6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:46:48 +00:00
Rhed Jao
6c7e4560a2
Update strings for the repair mode lock password screen
...
Bug: 289325981
Test: build
Change-Id: I347397fa0445436a231bc82529215c6031e4d80d
2023-07-04 09:44:50 +00:00
Chaohui Wang
e76ff6ffa5
Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:41:58 +00:00
Chaohui Wang
a51e013746
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:03:56 +00:00
Chaohui Wang
eb8948e309
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2
Fix DataUsagePreferenceController ANR
...
Offload calculation work from main thread to fix.
Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Daniel Huang
0b95f9562a
Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768
Change-Id: I6360dd0b9ced21331d5e04a54ef91b7612d35c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 03:29:21 +00:00
Daniel Huang
114d068fbb
Merge "Log metrics for PK settings topics" into udc-qpr-dev
2023-07-04 02:26:13 +00:00
Hao Dong
fefda226f7
Add super call in FingerprintEnrollEnrolling onConfigurationChanged.
...
Test: N/A - fix a crash
Bug: 289458339
Change-Id: Id34b1036fe12079b14cd3aaa0a85eecc138e6b17
2023-06-30 21:29:07 +00:00
Allen Su
477102b991
Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832124
Change-Id: Ied97c0d79cbea42830b43b6a2240ac9e5b376f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 16:41:03 +00:00