Commit Graph

105937 Commits

Author SHA1 Message Date
Bill Yi
18a81234a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours am: c5cbc6044c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I696d6497dd87d5321f3d2b71133f621b155af204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 00:00:33 +00:00
Bill Yi
7cd3cf1ac1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours am: 97f8879cff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6adaef51d30493f9139dea1bb66e3e77d68a29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 00:00:19 +00:00
Bill Yi
c5cbc6044c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie622f99dae37f0c276aad327f14964f8f03b3d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:28:39 +00:00
Bill Yi
97f8879cff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e5fe4b221792ee36b4512b421cd0a4d9c34f3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:28:32 +00:00
Bill Yi
6bfc8b38c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours am: a5ebf55708 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d839f424b0d11d9998a08bca090eb27149447f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:55:51 +00:00
Bill Yi
22b7c36582 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours am: 1f00d35c4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60400cc0cddd0f8047d161fbe8be75749d5e4207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:55:35 +00:00
TreeHugger Robot
5b2c995563 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours am: c1b2acfb3b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98e05358312b46bcba8d4f4eec92ca0da8524898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:55:26 +00:00
Bill Yi
4db24bb8c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c453a65ed2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1a2eb393dd8f83c39989e9c896cb44eb292e148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:55:25 +00:00
Bill Yi
a568e8dfae [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours am: 94a1ab304a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5988eceb2ded442bd0babd7d62cbde49143e52c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:54:45 +00:00
Bill Yi
ec31d2697d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibab132c360957a95e11a84dd1f7b88cc178a1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:53:28 +00:00
Bill Yi
9f888216b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b27088d1c07bfaf369d2da9689e2c10eb3c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:53:21 +00:00
Bill Yi
a5ebf55708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I417725150925f81370959c4acea726122359c194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:26 +00:00
Bill Yi
1f00d35c4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib32fc8b21ac7ff855eb41b010bca35b0077bcf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:20 +00:00
Bill Yi
365338b6d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38710b182545fc2b88f8c8a195ae07548dabd06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:04 +00:00
Bill Yi
e7ce899b93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2255dc24bfe7120b071b2d0eb276c7ed1eeef2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:01 +00:00
TreeHugger Robot
c1b2acfb3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e9f299fa94e9d69c778daaadc18ddacfbd51022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:00 +00:00
Bill Yi
c453a65ed2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f90f520b15abdb1fe0d6fb61158e6fdfec433a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:59 +00:00
Bill Yi
1df006f84c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib72b241a27bc95e319ab02bec34c4dd4857c79fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:58 +00:00
Bill Yi
c77e41302b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a3d96a7c13aadb307de14e0702ebe0b1896e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:55 +00:00
Bill Yi
94a1ab304a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a217f11889d90a9a51c519432d00899ef45a33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:18 +00:00
Bill Yi
0b07e79cc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id91cf446e28fb0ced0561e2be10ced8c69ab6427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:06:03 +00:00
Bill Yi
7a2a5bd916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3933eb376b11ac6d0944db6ada4c75b52ff87674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:58 +00:00
TreeHugger Robot
2a21fa1024 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5113f388898f79c43b714ec80cd73b19e75814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:01 +00:00
Bill Yi
1a4297414e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1806d21043651eccf7da31df5bc4268782bb3d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:00 +00:00
Bill Yi
52bb0b7039 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec9abc61990ce43e48934499ce7847a18f01a82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:58 +00:00
Bill Yi
4c08f33493 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3fdf81ecb5a85ea1a482ff4cfc649c4e0351114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:53 +00:00
Bill Yi
44f1eb9246 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a15d3be281479c7e29f34a2862ca9e1c0dd15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:48 +00:00
TreeHugger Robot
6c9433b31e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1109dc7c1fa291d2a19dc0b14b8facfa01a6d411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:33 +00:00
Bill Yi
e0da5747da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5099a137fe14d98967f9d055bfcd4c41d8d4f05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:27 +00:00
Bill Yi
53993399da [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d10981a2dc1b03f85c26814667640167620a5b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:19 +00:00
Bill Yi
a509cd4695 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I014dc4924b12540a4eb6c97d93fd0b4d67155879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:44 +00:00
Bill Yi
f46213941c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idccc655c084ed720a595d4a8946738fa9eecb39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:27 +00:00
Bill Yi
223d9c81f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee353b944bfcf19af8b5333daa0dfcfcbaa85cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:16 +00:00
Automerger Merge Worker
6c838385d6 Merge "Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565" into tm-d1-dev-plus-aosp am: d0d96f6703 am: b8449cd279
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I9deb71dd8ece76deed28d4e82f64b9f4f2e0a87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:49:51 +00:00
Lucas Silva
5abaaf902b Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd am: a8b6c03607 am: d6b9e333e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I18aa400c70f9a215e7f352f8fc6dd36b34106cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:49:39 +00:00
Automerger Merge Worker
b8449cd279 Merge "Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565" into tm-d1-dev-plus-aosp am: d0d96f6703
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I0aca99b6afd8884308459601df1f5dfbf43ef298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:24:45 +00:00
Lucas Silva
d6b9e333e6 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd am: a8b6c03607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I281a9ab5a8008a31dfcd2bfece4e2aeec66d484e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:24:36 +00:00
Lucas Silva
cb405a2cff Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b0bd5b21e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: Ie2b991854aafe1aba819895b6bf8c34874d0c178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:15:15 +00:00
Automerger Merge Worker
d0d96f6703 Merge "Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565" into tm-d1-dev-plus-aosp 2022-05-02 15:03:24 +00:00
Lucas Silva
a8b6c03607 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I256e53b6d9f41c7cef1ec510cbf5d85a59dd1ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:03:20 +00:00
Lucas Silva
c161b3f1e0 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: Ib864b89911a0a314471c60e1b0af6fbb1df5d96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 15:03:19 +00:00
Joshua Mccloskey
4d4246626c [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 am: 43e07e7ca8 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 b7f3001cea is already in history

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

Change-Id: If317cf4b9112ba6cc15f1b450767ba5061e0cd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:55:12 +00:00
Lucas Silva
d7e5195565 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I7ff9e34ba73ec61aa8cf75fbf23ad79afe3bcde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:45:19 +00:00
Lucas Silva
b0bd5b21e3 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: Ibd114267c5254a0eb6484c92bfb6015ddc67f69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:44:19 +00:00
Lucas Silva
b58d2ed5cd Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I9bb07c53e0dbd2f78e4d7191ebf597af3de12a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:44:00 +00:00
Lucas Silva
dc44eb1feb Merge "Update dream settings logic to keep the customize button unselected." into tm-dev 2022-05-02 14:19:22 +00:00
Joshua Mccloskey
2e3867d942 [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours am: 97ee75162c -s ours am: ca45d5ec88 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: Ie0bee6734477aa8fb1abe39680c38c8c438cf0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 12:00:36 +00:00
Joshua McCloskey
fe1862a1de [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours am: 8495275d81 -s ours am: 09c666a56a -s ours am: edc59eb835 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I95d9c51b7f144e9839a48f16f3d373144806ff93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 12:00:35 +00:00
Bonian Chen
978033c9f4 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955 am: 04a404a37a am: 501733eac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Ia9c1029a8d0d12fd913c3c2f3052dc80635a21ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 12:00:21 +00:00
Bonian Chen
8c962b581c Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e am: d35a538b3c am: e16fd40d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I9a77e35eea057af5338b0e1e98a25ca9974f0006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 12:00:14 +00:00