Lucas Silva
4b3131bbf6
Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3 am: caa3d0c437
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262
Change-Id: Ibe10e8d116d4caf3ccb898559b7477132d4cd5a3
2022-02-24 23:57:01 +00:00
TreeHugger Robot
c7892b961c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours am: 8838e249ac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Id6c5820b652d33fb6f670ac7ce5d4c36529b29f0
2022-02-24 23:56:42 +00:00
Bill Yi
b3c16ac91c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours am: 9e11adf975 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I5417ce9116f4ee21949c5d5b0e85676318ac367c
2022-02-24 23:56:39 +00:00
Bill Yi
a0c48f5bdc
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours am: 9e6d0e191d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I162b0d639d94fc029cab9911bb28fa02d024d8ff
2022-02-24 23:56:20 +00:00
Bill Yi
764f371b4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours am: 95cc19bcdc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ibe4f09e898f5d910c341d5b6405c23e22998ce3f
2022-02-24 23:56:05 +00:00
TreeHugger Robot
67af9ce371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours am: a56f67de96 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I845397d94e1a891a06640b725c0a61ff8385ba51
2022-02-24 23:20:44 +00:00
Bill Yi
b1222f4557
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours am: 5d831202b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I79e721bc9eaadff461c5f606e9a6d7e18e330c60
2022-02-24 23:20:41 +00:00
Lucas Silva
bafbbf4fdc
Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262
Change-Id: I2dac154f7a7b45dd1c7843193c4a22880a596b7a
2022-02-24 20:39:52 +00:00
Bill Yi
421f150b35
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours am: 49b531be9c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I4987c04b9325a3d09bd49863dde79a9a37ab94fa
2022-02-24 19:44:17 +00:00
Lucas Silva
caa3d0c437
Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262
Change-Id: I6c6e86c6812de1dee8b0219d5ef3cded2865093a
2022-02-24 19:43:47 +00:00
Lucas Silva
4b6efee1a3
Merge "Add dream descriptions to dream settings UI." into tm-dev
2022-02-24 19:34:55 +00:00
TreeHugger Robot
8838e249ac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Iec013bc7a1f4f67cea08b5fc3337bed05f3dcab0
2022-02-24 19:31:48 +00:00
Bill Yi
9e11adf975
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I334a3b40973fcc36153a74306fcea05ad248ed43
2022-02-24 19:31:48 +00:00
Bill Yi
9e6d0e191d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I904adb3ee1853f44c2aca82c5f28f10301638a25
2022-02-24 19:31:39 +00:00
Bill Yi
95cc19bcdc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ic3562f9803108f9cda6532ef76d1cbabbb79d7ff
2022-02-24 19:31:32 +00:00
TreeHugger Robot
68ad2ce621
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I512ae908011164f188a28a8befb50542e2f69b38
2022-02-24 19:05:22 +00:00
Bill Yi
5cb4595be4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I9988feb70308f562bd93496325e5544f183c54c5
2022-02-24 19:05:21 +00:00
Bill Yi
f446b700a2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: If993d229eae2f3820b4e25f53ac5f846d296334b
2022-02-24 19:05:14 +00:00
Bill Yi
91859b0853
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ifff0716f27d23fc78d64a09a54b52770ea511a2e
2022-02-24 19:04:33 +00:00
TreeHugger Robot
637ff8a720
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I7ed14fd6f982b4570fe15cf296aa85485f229bd3
2022-02-24 19:04:16 +00:00
Bill Yi
9d87ccd670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: Ibe351b4744fee6ca004f488266f50b482f49a94f
2022-02-24 19:04:15 +00:00
Bill Yi
f4a111cdcf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: Iacb71005a26e2918a715925d4f739412e5319b8d
2022-02-24 19:03:33 +00:00
TreeHugger Robot
950a131827
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ieca92a3de4bf92b268b37408689821d3e2291a5b
2022-02-24 19:03:23 +00:00
Bill Yi
8b2c75107f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: If46ab67657eddcf52094c39690d5267795c21697
2022-02-24 19:03:21 +00:00
Bill Yi
91c6687b8d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I98aeb0a1043ebf20c998e2d59d30600b4e795142
2022-02-24 19:02:42 +00:00
Bill Yi
b4fb92af4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ic09273a1108e7c9942dea93c8b8800d4d3c7417a
2022-02-24 19:01:27 +00:00
TreeHugger Robot
a56f67de96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: Ie4594afe0eb4a0585fc8ee9cb44e2f4cebbf9c9e
2022-02-24 18:50:49 +00:00
Bill Yi
5d831202b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I40a67e26671680aa33c5f48c48f16c5025067ee9
2022-02-24 18:50:47 +00:00
Bill Yi
49b531be9c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I047034a51ff408c903e9932170f468d635a81094
2022-02-24 18:49:05 +00:00
TreeHugger Robot
50b53a1c58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ic1f4c1cb5357a491c77bdf93d340d98d59e059b4
2022-02-24 18:38:40 +00:00
Bill Yi
340aa20e39
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ie1a4136bce85ad506e47f66f8806f6af86a4918e
2022-02-24 18:38:38 +00:00
Bill Yi
30a5c5bf0a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I4bfb833ef6a25a62bdabc4aa251d0a8930bf22e4
2022-02-24 18:38:22 +00:00
Bill Yi
8bcdd557ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ica0ed6810627f1fd0d72ca966f1096285ef2e40e
2022-02-24 18:37:13 +00:00
TreeHugger Robot
7b4af603b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: I08953b72649f22b940aa71035fd74d5f168143c9
2022-02-24 18:26:32 +00:00
Bill Yi
4c23b861ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16985985
Change-Id: Idec4de9dc19f222445eb564a4ddaf75425f96f14
2022-02-24 18:26:30 +00:00
TreeHugger Robot
b3efaa654e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
2022-02-24 18:26:27 +00:00
Bill Yi
3d349c1688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ia0f31cd384cdea4944f63a73a0ec8793a21b11f9
2022-02-24 18:26:24 +00:00
Bill Yi
1f54a37763
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I7933a10f4846837ef65d4cb98a0e896bef9db840
2022-02-24 18:26:06 +00:00
Bill Yi
31a5b89eef
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: Id72c779f290a0e76622bc5dda67dca65c5c63998
2022-02-24 18:26:06 +00:00
Bill Yi
dc4656cb7c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-02-24 18:05:43 +00:00
TreeHugger Robot
a18ff15076
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-02-24 18:05:30 +00:00
TreeHugger Robot
e79968b58b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-02-24 18:02:28 +00:00
TreeHugger Robot
24bd47eda7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-02-24 18:00:29 +00:00
TreeHugger Robot
139331e47f
Merge "[Panlingual] Adds log and have small refactor."
2022-02-24 17:08:44 +00:00
Julia Reynolds
6a663c3dff
Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2 am: 9d01ed5377
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592
Change-Id: Ia62d904084968418387dd231bbd58430afb98977
2022-02-24 16:43:23 +00:00
Lucas Silva
c7709aebb3
Add dream descriptions to dream settings UI.
...
The dream descriptions will now be shown underneath the title, if the
dream has provided one.
We also cleaned up the icon view, instead merging it with the title view
to ensure proper alignment between the icon and title.
Bug: 221078654
Test: locally on device
Test: atest DreamPickerControllerTest
Change-Id: I00fd69c294f1a5fbcbc5392eba342f2896f6d9ed
2022-02-24 16:25:24 +00:00
Julia Reynolds
9d01ed5377
Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592
Change-Id: I748563c902ee32443596e6e95a5784dfdcbd6b9d
2022-02-24 15:46:23 +00:00
Julia Reynolds
1d15b24da2
Merge "Remove unnecessary async" into tm-dev
2022-02-24 15:30:02 +00:00
TreeHugger Robot
4257b0e1e8
Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633 am: 606488fea8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I244fdc314d97d6a5ce4a87293689735326ee8af1
2022-02-24 14:52:48 +00:00
Bill Yi
c6def3b1bf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours am: 548359ddf9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I4719d2d642a7d6fc6ea521454c4c2b95b13ae530
2022-02-24 14:52:46 +00:00
