Commit Graph

122485 Commits

Author SHA1 Message Date
Austin Delgado
22f2d436d3 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 am: b8fc7e5bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I93f7be4048e867c50c3efd1aeabc33f56c1c4c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:50:44 +00:00
TreeHugger Robot
f1b268cd84 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 am: 99a75b24ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I573cc77a6f37c3be211f718a65963efd7efc1ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:44:50 +00:00
Bill Yi
e529c88a05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours am: 1b4f6059dc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Ie2f004f122a602943979c3a20da29aad484a3c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:19:35 +00:00
Julia Tuttle
8b94eddaa4 Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e0adef90bb am: 775d61dc4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: Ic76abcc25f194a7043833723db304bab14976465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:06:28 +00:00
Julia Tuttle
13e943fee5 Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: 7e3355382b am: 472a2024ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I2d1238cb238544487f1f7985b95fe793174d64fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:24:19 +00:00
Austin Delgado
ebd53855f3 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: ff7ae4123b am: ce3118d414
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: Ib5b4ee04960f36a58e83bee501f9a169f920f2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:20:51 +00:00
TreeHugger Robot
974f5ab54a Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 041d659ab7 am: e8defdd89f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I104dcd38d16961fba63285e71b7f7fe6fed4d3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:13:08 +00:00
Julia Tuttle
9781724e80 Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c am: 7edbed90aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I6907cd28338846cf47d212c8a441be77d56a21f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:08:43 +00:00
Julia Tuttle
dec7d67dcf Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13 am: e3e8b4cd02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I13c3089d7994fbea6a73cd15fea6c365087cec05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:07:28 +00:00
Austin Delgado
5511a2293e Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 am: a386dddf72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I7c656f6782bd705b4577d2880b567fc80f84086d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:05:31 +00:00
TreeHugger Robot
11400ea2f9 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 am: b24c3eae4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I0daab92fd66b0b4bd2dff774932015b5546a9a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 20:03:48 +00:00
Bill Yi
895dbb0eb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours am: 9f237dd9b5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Idd52f8cde9f9fbdd468bdcc43b146dd03065aef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:54:20 +00:00
Bill Yi
d692d89e1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: 74ee200fa2 -s ours am: 7531a1ec03 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I0c4653359316f361d0dbb7c589a443d2c857172c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:52:20 +00:00
Bill Yi
c7d87079ae [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours am: 4e09eb096c -s ours am: 72f8242715 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I01ffdc10df24a0465a52f7ff2690aee802b1c9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:39:14 +00:00
Julia Tuttle
7edbed90aa Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I8c62657c6d8d09e81dd5b6cc09c99ead2a8cb238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:23:44 +00:00
Julia Tuttle
e3e8b4cd02 Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I5561bad5f136fd8e91b8435bfb2bc93045805563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:21:39 +00:00
Austin Delgado
a386dddf72 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I2427d052f8673090d39b084d2c4364edefe8359e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:20:30 +00:00
TreeHugger Robot
b24c3eae4c Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I08488767f3779fa57fcdfcfc4a48ed21ca92406a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:19:29 +00:00
Austin Delgado
b8fc7e5bc2 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I34e2f839ec6505bccc11f03db6c69988de8674ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:14:09 +00:00
TreeHugger Robot
99a75b24ee Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: If64d6ee2186bb42b775159ddd3dd29bf03b5cf42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:11:19 +00:00
Julia Tuttle
6fb097c08c Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I26c3cc54bb1a899aae3f0e773368352573106d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:08:13 +00:00
Bill Yi
1b4f6059dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I48fb227343cfa9ba42b3c774a8db61a3a9fe646a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:07:43 +00:00
Bill Yi
9f237dd9b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Ia92d7f4befddb491341fffb797f77ea4883ddec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:07:42 +00:00
Julia Tuttle
775d61dc4e Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e0adef90bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: Id1cd6525e13254f4c738bfb1e6cec6f2cea6cc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:49:16 +00:00
Julia Tuttle
472a2024ad Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: 7e3355382b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I372d19fcd0ef394904a04e0514299139f7aa8c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:47:59 +00:00
Austin Delgado
ce3118d414 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: ff7ae4123b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I07b2d29814748641ed512b3cefddd3f4b914d959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:47:51 +00:00
Julia Tuttle
e0adef90bb Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I618fd16ea06ed6cbe5a9556d16d56af5baefd4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:47:03 +00:00
TreeHugger Robot
e8defdd89f Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 041d659ab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: Id58a8350cf29a620c498b05472999769b8025fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:46:17 +00:00
Julia Tuttle
7b3df1c080 Merge "Fix a couple compiler warnings in Settings" into udc-dev 2023-04-28 18:42:23 +00:00
Julia Tuttle
7e3355382b Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I0cd1f87310eaec55cf42347660080568b403ef71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:38:24 +00:00
Austin Delgado
ff7ae4123b Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: Ib0a993f8869f22535148be59767deb209acbdf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:36:50 +00:00
Julia Tuttle
b34c993a13 Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I515c52afec3451c1a138f04e0f45748b0197e040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:35:10 +00:00
TreeHugger Robot
041d659ab7 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I2d0c37c829c0862084a08ce7ff0b9041e4a3f945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:34:52 +00:00
Austin Delgado
f5d8437078 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I3779705d1012d4d8b7df4b68f1e9ebea9f37451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:32:30 +00:00
Bill Yi
7531a1ec03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: 74ee200fa2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Icce1e4f50355cc64a2c4ead580c8c7d5213e5587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:32:12 +00:00
TreeHugger Robot
00259adc51 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I3f9ed19a8a4f011ee47ca2afca23321d451d5f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:31:56 +00:00
Bill Yi
74ee200fa2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I8f782eb9707ea8aa7834609ccfe2c89ebb1e672b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:29:27 +00:00
Bill Yi
a4eb2b9a37 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I8b20c84b1db8f75bc08f08a053a495fb11249d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:24:57 +00:00
Bill Yi
72f8242715 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours am: 4e09eb096c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Ia90a434a59872b13640ca6e5932f23b0b264ad26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:24:45 +00:00
Julia Tuttle
75f566bce9 Fix a couple compiler warnings in Settings
Bug: 277938609
Test: builds
Change-Id: Ib5e236220dfcfddec60c9277d06ffbde9645bb73
2023-04-28 18:19:30 +00:00
Julia Tuttle
ec12caadda Merge "Optimize imports in AppNotificationSettings" into udc-dev 2023-04-28 18:18:40 +00:00
Austin Delgado
9b94905c63 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev 2023-04-28 17:42:46 +00:00
TreeHugger Robot
6e524f6244 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev 2023-04-28 17:01:39 +00:00
Bill Yi
4e09eb096c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I14a9ed4d975325a7cfb4f618ff67ad46865b9c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 16:50:19 +00:00
Bill Yi
4174b548cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Iea6d3ccd75a787447cde716ca4b027d4d5e5f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 16:48:53 +00:00
Christian Göllner
b613cc4a17 SettingsRoboTests: fix device state rotation related tests
Fixes: 280015539
Test: atest SettingsRoboTests
Change-Id: I0a3cc713f8df0477a172665a60551b456691b17c
2023-04-28 15:26:32 +02:00
Chaohui Wang
165777a935 Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: b60bb6a22f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I9ab9b70f9992ee4911d3e129def2e3e09a75ee4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 13:19:09 +00:00
Chaohui Wang
a6d606f278 Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: 6d591f5b5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: Id9c80b73953e39623dbf9ee2bdc4a670c0eb5d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 13:13:31 +00:00
Chaohui Wang
6d591f5b5c Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I162a3dd40f6cda7ccbcef87703b1c5c76843f4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 12:30:19 +00:00
Chaohui Wang
b60bb6a22f Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I62662e92f9b302be44eaebe34dc1415924a900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 12:26:45 +00:00