Treehugger Robot
d3b8f7769f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours am: a1b3c500fd
-s ours am: e46c4e5a87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I1ea20159399647ef0b7c0414b2a732f3607b0cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:12:53 +00:00
Treehugger Robot
ade779e66a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours am: a1b3c500fd
-s ours am: ddb36c89f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I7779f2e646746911fb3c239034cfc6cc15ca678e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:12:28 +00:00
Treehugger Robot
820e4bf1cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours am: f9e3b286f3
-s ours am: 08d728c8f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: I04f9c0fccc939ca07dc91d9592e0d78a6e7fc551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:05:45 +00:00
Bill Yi
7922024c20
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-s ours am: 77e56766c3
-s ours am: 81a9f0e818
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Ic130abcb06c94263697653059db2ded4090bb855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:05:34 +00:00
Treehugger Robot
cfaa877732
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours am: a1b3c500fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I37ea2d6ace89cf4a09ef6ccc220ee538e9261a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:59:55 +00:00
Lin Yuan
ae2dd3d513
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:53:38 +00:00
Lin Yuan
eb3be1fa5b
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Iff01dd3f1528b2ded54b281c1f810293093f2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:52:56 +00:00
Hiroki Sato
c72e8c1eda
Merge "Don't show bubble settings when framework doesn't support it"
2023-05-04 00:44:43 +00:00
Treehugger Robot
e46c4e5a87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours am: a1b3c500fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Ie8baab558556cc4ed06ffcb8b79caa3779990aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:28:23 +00:00
Treehugger Robot
ddb36c89f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours am: a1b3c500fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I65d76144eb2ddd9894a5a769d7524ac6f2e8b5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:28:07 +00:00
Lin Yuan
d8321f5df7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:02:52 +00:00
Treehugger Robot
a1b3c500fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I17e41ec494a5893cb8eb1f3b8dfbeb46e28d7310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:46:47 +00:00
TreeHugger Robot
47e542d48a
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
am: 61f1af73e6
am: 9cdbbc334e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Id7b67eb39d5a2bce83b484160b16c2040b41a9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:45:19 +00:00
Bill Yi
9b1094e52a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-s ours am: 44d28ab6f5
-s ours am: cc1284d1e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Iad84abbf9995a56084b9d65e186bf0c11b4c8869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:45:12 +00:00
Treehugger Robot
8df2ac3f94
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
am: 48f8eecbd1
am: 089c61b6ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I39bdb03d3524f53e458c58ff3273176179567f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:44:20 +00:00
Bill Yi
3e9797b743
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours am: 20a33c9bdd
-s ours am: ca3c627645
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I331e674dea1946f09e799d8aac728a3d3373dc55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:44:14 +00:00
Bill Yi
6ec725b107
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-s ours am: 4417b47eea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Id296aa3cbedf1b2c84c62315ff240a28ea1e33e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:43:23 +00:00
Treehugger Robot
ef44b8dbc2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-s ours am: f2fa6d46d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: Ib09f30709c0a73646a6015d08cd4b750c8f70c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:42:55 +00:00
Bill Yi
bdbf0a7532
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours am: a67463b464
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I2801e0e2cc2e72ba36faa87d9011777695e96057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:42:46 +00:00
Treehugger Robot
3cfa15c482
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours am: f84817da57
-s ours am: 989436c29a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Iec5c08c6778cee03c7686aa9f27e515351243654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:24:05 +00:00
Bill Yi
9733ac707a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours am: cf281ffe95
-s ours am: c8907529e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Ia82db568b2fd92eb38e53d31497afec461011bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:53 +00:00
Lin Yuan
f86d507407
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:36 +00:00
Treehugger Robot
21d4e58d35
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours am: 71f2e23696
-s ours am: 8cf712a373
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Ia7f4d150cb74891f849fcb64a73676a2ef739832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:21 +00:00
Bill Yi
cc4d07a9fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-s ours am: c2df5abd3c
-s ours am: 7bfa543a7d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Ia25b03431846dae4584a2782f93a5ad01b17a816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:07 +00:00
Bill Yi
b3ebd4610a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-s ours am: c4204c0ef5
-s ours am: 537989bfa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Ib5964f8f53fbf4f104246ea07823491eeeb64211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:14:10 +00:00
Treehugger Robot
89bfd3431d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d2605f6f6a
-s ours am: 5a4e475544
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976162
Change-Id: Ia2fb71bd7d684288a51f4647b8ff5dc67ad523aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:06:00 +00:00
Bill Yi
b78714ae57
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 099996c255
-s ours am: a610cb95e9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976162
Change-Id: Id3149607c4992173fd5d0a0cec0f58bf930766c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:05:49 +00:00
Treehugger Robot
6cd538d7f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-s ours am: 4195ac4a28
-s ours am: 38ea3da507
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I9aa3b6e9b8ead82c4c60b3a633336d4771cac629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:03:47 +00:00
Bill Yi
3ae0aaafe7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours am: 56cb3df78d
-s ours am: b4ab4fd7f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I5686e60ad505ce6e04ab36b78441896646a528b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:03:40 +00:00
TreeHugger Robot
10227c4435
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
am: 178d880667
am: 5062c59bc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I2c862ea538ebe3ba21cfa2af873fdef06732291c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:02:42 +00:00
Bill Yi
8ce699b2c3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-s ours am: cdfa21f8d7
-s ours am: fd5b639bbc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I4b34c69875a3f1a2fd3de7fce7fc84e0edbeaf77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:02:30 +00:00
TreeHugger Robot
348ae12d39
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b5773f95c7
-s ours am: 253cad32fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976156
Change-Id: I11f8607b894d33fde32a65aafc403f9b7865c7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:54:09 +00:00
Bill Yi
a33f42d837
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd75f93c7
-s ours am: af79004271
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976156
Change-Id: I6d90d4f1f65a0ae22d05cf0b911293969bd60a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:54:03 +00:00
Treehugger Robot
7ec4bf411a
Merge changes from topic "tc_change_23050307_54" into udc-dev-plus-aosp am: 03d406e123
am: 99cd07508a
am: cf29e7c9d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I0bab5d7bba64a377888cdd4ca23e98d8e9d47c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:53:21 +00:00
Bill Yi
f826544fd7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
2p: e28505b1f9
am: e6d51e5378
-s ours am: 991f9a595e
-s ours am: b48860772d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I5aae35d333c862fc9c8f7944c88bb5e61dd1dfbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:53:12 +00:00
Treehugger Robot
0cc072fd82
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: 0624c88484
am: 64c4207014
am: fa5e90216c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I770f3688f12d7f6dae775e1c4475f29df07050e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:52:57 +00:00
Treehugger Robot
87d8fccd06
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: c3d6820ffd
am: 80bbca1866
am: 50460b3467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I97fb517be7dc3bbc683c6fb0698a40584270a331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:52:45 +00:00
Treehugger Robot
af35c8651e
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
am: 79c090dd85
am: 9147bf15e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I63330d42fd946e7ef7779d4bfcdb4bf59a67a5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:44:34 +00:00
Bill Yi
54c9b46e5d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours am: 2658b9338f
-s ours am: c8076ba7b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I2f3c047623eb40c8059baf599170b8b4c984e0ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:44:29 +00:00
Treehugger Robot
7f69c0af96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours am: d25d75be91
-s ours am: 20bbc6456c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Ib6893e259f098e208bd19c159fb3dbd3d178a471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:44:12 +00:00
Bill Yi
89a060700a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours am: afc79889f6
-s ours am: 8cef29d5c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I50f38d54ff4bc2bce8fad6d169f00257a7e5957b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:44:10 +00:00
Bill Yi
4417b47eea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I65d3f08825319157056700fe4772e40d57b04efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:38:21 +00:00
Treehugger Robot
f2fa6d46d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I76a13454b9220e1abf2e48818020d5c4d5a63585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:37:01 +00:00
Bill Yi
a67463b464
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I0462300af2ab83e0f16b0aecadc5fb5da91791b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:36:59 +00:00
Bill Yi
a1c234d03e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-s ours am: 17b8ec6606
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I99059f890f1913b3c531ff7db45ab134243eecc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:34:27 +00:00
Treehugger Robot
2518f03959
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-s ours am: d3bacd3b3f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I45900a6fe1f079dea3c358dfc4fc0d7d7a93c98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:32:51 +00:00
Bill Yi
24c478ef42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours am: 2563f766bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I41d728c5ee69ff9338a723a14281d887c3b0bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:32:43 +00:00
Lucas Silva
ccabc4e880
Update DreamAdapter to set icon tint colors in xml
...
Setting in xml makes it easier to customize the colors in the SUW vs
normal views.
Bug: 279914654
Test: opened dream settings and verified colors
Change-Id: I367677426b8b538cca19dfdc5d343f66b8f89dba
2023-05-03 18:22:58 -04:00
Bill Yi
9df92aeffe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-s ours am: c4204c0ef5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I552214f103390535a7970f605523481532a2b6c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:19:57 +00:00
Treehugger Robot
228bcb551f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-s ours am: 4195ac4a28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: Ic05ab2f96849a334909110975e9829e1676187ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:18:43 +00:00