Treehugger Robot
64a6ffd904
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff
-s ours am: 3838cd44da
-s ours am: 08d6c6baee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: Ic92a82c945ab285b35bbbf7d92a5f772434ab9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:06:34 +00:00
Bill Yi
5ded0e8848
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941
-s ours am: 891a483a94
-s ours am: 665f49b670
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I7d3cf75c563eb2e525b6eafa96991c252b948cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:06:19 +00:00
Bill Yi
0fdc38f010
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981
-s ours am: c7762b5610
-s ours am: ee4c57c11c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433950
Change-Id: If229ee3636c9ff3d3d6ed9ee951e7d072fc3ad0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:06:00 +00:00
Treehugger Robot
59b0d816e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 960d04f4fe
-s ours am: 3fedf9ec23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438749
Change-Id: I11342d78b3cf02dbc84e33b38e7eb9e2ba3774ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 01:57:42 +00:00
Bill Yi
93b5773b58
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f1150a448
-s ours am: 819bdb380d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438749
Change-Id: Ia0190e914569f7965aeb4a130708205c54b949a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 01:57:40 +00:00
Treehugger Robot
9c7ab77ad4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b9e13e44d8
-s ours am: dfa01168ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438647
Change-Id: I03a601090941c64d08c7d9332e16b18fe217599b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 01:57:37 +00:00
Bill Yi
dcb771d7dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55bf4eab3c
-s ours am: 5a87ee3132
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438647
Change-Id: I4a5c48cb336950defbd707520c9f165a17be6c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 01:57:28 +00:00
Treehugger Robot
88cd6004e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5ea61f6900
-s ours am: 0f8ac3a82b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437726
Change-Id: Ibec89ebc49161d4509f5a54069f278bfefb1230c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 01:57:12 +00:00
Bill Yi
7fe4f7aa4c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4
-s ours am: 1a8d90b337
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437726
Change-Id: I5eb07b9d873a74f10464f9ba40f0bd8ec3fbc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 01:56:54 +00:00
Bill Yi
a9ac8645fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 0da3cedcc0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437723
Change-Id: Ic06029241cde83e605423998553179948ba838bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 00:25:52 +00:00
Bill Yi
5a16ea8c50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e04caacadf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437723
Change-Id: Idf051e3e6395b6339ff349297abcbba1c54c6941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 00:25:39 +00:00
Bill Yi
c76d273cef
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-16 23:43:22 +00:00
Bill Yi
8bb5edf23c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-16 23:43:22 +00:00
Bill Yi
d3176987b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-16 23:43:22 +00:00
Bill Yi
0da3cedcc0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-08-16 23:42:56 +00:00
Treehugger Robot
5329b06ae7
Merge "Fixing RemoteAuth Tests breakage" into main
2023-08-16 19:43:10 +00:00
Treehugger Robot
08d6c6baee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff
-s ours am: 3838cd44da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I602dfab48db1ea812c2db606f9510a6382b7dcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:42 +00:00
Bill Yi
665f49b670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941
-s ours am: 891a483a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I2918c9daa28c1beda0567ad56534b2c4e4b48290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:25 +00:00
Bill Yi
ee4c57c11c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981
-s ours am: c7762b5610
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433950
Change-Id: Id47a02c432d6bc2f352971d2658d3d8f4494bdae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:08 +00:00
Justin McClain
d971817112
Fixing RemoteAuth Tests breakage
...
Fixing RemoteAuthEnrollFinishTest, RemoteAuthEnrollEnrollingTest, and
RemoteAuthSettingsTest by changing `isDisplayed()` check to the intended
`withEffectiveVisibility()`.
Bug: b/296191086
Test: make RunSettingsRoboTests -j40
Change-Id: I3405fd2709c83a966b83106c804880d00fc4bbf4
2023-08-16 18:45:09 +00:00
Treehugger Robot
3838cd44da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: Ieb3af1080163c88583ef6eef2ae685b54a4bcf04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:33:28 +00:00
Bill Yi
891a483a94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I1589f5d9786458283f477b96a91e17e0479fbc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:33:12 +00:00
Bill Yi
c7762b5610
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433950
Change-Id: I19410e5ca48c700e7c2747d31f572db6f843ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:32:57 +00:00
Treehugger Robot
4f78ce0418
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a
-s ours am: 317931b506
-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: I47012aa59ad737e04fecf7c940e430c5e9358548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:31:11 +00:00
Bill Yi
f2f9fb014f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5
-s ours am: 3c43f53a65
-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: I6b516a63ccb59a028fc8044367c14c844b0dd508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:31:03 +00:00
Treehugger Robot
a842ed7c47
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834
-s ours am: 094103da6d
-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: Iae8313d431005a96887a68c310865c6a8c804bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:30:59 +00:00
Bill Yi
cd9465109b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours am: 1f4e5b2024
-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: I284895f2abfedb0e2d54556d2568d8a3dcb49d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:30:47 +00:00
Bill Yi
44bc24bb32
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419
-s ours am: 721d30309e
-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: If425a587f6dc0eecf5e5f63dc86f1f0be26fc057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:30:34 +00:00
Treehugger Robot
3fedf9ec23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 960d04f4fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438749
Change-Id: Ib2c0c1f0d21d9232a1fc2b48212ae20633cc799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:16 +00:00
Bill Yi
819bdb380d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f1150a448
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438749
Change-Id: I6e2c9549775a2f0a8639104b428a5489b50e603e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:13 +00:00
Treehugger Robot
dfa01168ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b9e13e44d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438647
Change-Id: I67d6c789a12d1b01a7ba3b2a9ca5839148af6996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:10 +00:00
Bill Yi
5a87ee3132
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55bf4eab3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438647
Change-Id: Ib800197d9a8b8c9a42aa7e2ead7a273f63477cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:06 +00:00
Treehugger Robot
0f8ac3a82b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5ea61f6900
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437726
Change-Id: I01e3fef35540addc4fd54551563c93e592da6b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:14:55 +00:00
Bill Yi
1a8d90b337
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437726
Change-Id: Ib286ba6cf5549565b8c080debab8e03084f72f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:14:26 +00:00
Treehugger Robot
960d04f4fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-16 17:29:50 +00:00
Treehugger Robot
b9e13e44d8
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-16 17:29:50 +00:00
Treehugger Robot
5ea61f6900
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-16 17:29:50 +00:00
Treehugger Robot
317931b506
[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: Ieace9704187dae85ede838fb8f2976b57ceeb465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:29:49 +00:00
Bill Yi
3c43f53a65
[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: If6b538c0aebb36aed4840dad43695b9b3fe669f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:29:41 +00:00
Treehugger Robot
094103da6d
[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: Iaa7f5bf0ac48811d5202ed362e6718b053d9a431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:29:32 +00:00
Bill Yi
1f4e5b2024
[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: I8018d49e5fc8aa6f828c7a7ff399ab6fe5a910b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:29:17 +00:00
Bill Yi
721d30309e
[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: Iec109478a187687646c43ae05f50ab72a7ad2f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:29:11 +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
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
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