Commit Graph

122119 Commits

Author SHA1 Message Date
TreeHugger Robot
9fc39c6d13 Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266 am: 97b345aac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200382

Change-Id: I5b998e506cc7b7e13c2030cda3f4c07c18d35d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:36:02 +00:00
TreeHugger Robot
97b345aac8 Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200382

Change-Id: I764c81c0ad6175de4e6b6462755bf0a873563aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:07:56 +00:00
TreeHugger Robot
e2eb822266 Merge "Imporve UI of system langauge list" into udc-dev 2023-03-24 07:37:05 +00:00
TreeHugger Robot
6d9f2cf637 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-24 07:24:21 +00:00
Automerger Merge Worker
8555fd9608 Merge "Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff am: 5dcd468056" 2023-03-24 03:54:25 +00:00
Treehugger Robot
0fbecd70f1 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff am: 5dcd468056
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I47321f6d29597518a9b29cb63a1781878f12d6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:54:06 +00:00
Treehugger Robot
549c0f3575 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff am: 07d355dcba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I094da08c629a555f28a1cc01fcda81e5491cbf1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:54:04 +00:00
Treehugger Robot
5dcd468056 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ifc947954755bcb7e97fbfa994a0965ba101909c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:26:51 +00:00
Treehugger Robot
07d355dcba Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Idc887c5bbfb7881d812d2d3415e85f72f0cbc1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:26:39 +00:00
Treehugger Robot
caea0d9aff Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ic7ad166567137761143322e108fd66854caa9edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:54:13 +00:00
Treehugger Robot
9145d7e6ce Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I0eac72eb5e473771f4792916fb5ae2211aae1e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:24:11 +00:00
Treehugger Robot
9526a60e6b Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ic2fb8afdd80cd3892aeccb45fafec6b65de1e68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 01:55:21 +00:00
Treehugger Robot
ca3aa2a557 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" 2023-03-24 01:24:50 +00:00
Rahul Sabnis
b1e25950b8 Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously
connected on the same device

Removes the classic audio toggles for dual mode audio devices.

Bug: 257881495
Test: Manual
Change-Id: Ie6794b4d904c74a7c5137ad141172c10188a99f9
2023-03-23 16:51:49 -07:00
Bill Yi
cf289a551f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours am: 02009efec2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80afa6950dee4689e75d309c7c6ca94e5a5a50d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:31:41 +00:00
Bill Yi
9fb728596e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours am: 1dbb0068e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifceb9fd8f30703956aaf4fb50bdd1ee532740d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:31:16 +00:00
William Loh
f24007cf38 [automerger skipped] Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b am: 84b6862b46 -s ours
am skip reason: Merged-In I3b8639c5530782375d0b26c9a65c1662eced5493 with SHA-1 5d2420d493 is already in history

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

Change-Id: Ice497525bc9871ab042b4fd1b269ce10e189c010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:24:19 +00:00
Bill Yi
02009efec2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If40857846ae4833a221f5fb2bdff01451617940d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:13:23 +00:00
Bill Yi
1dbb0068e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id83ac3d55a381d87f464b0c28e1909116171b120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:12:43 +00:00
TreeHugger Robot
df9e3e04b1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-23 20:08:13 +00:00
TreeHugger Robot
20659e265f Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-23 20:08:13 +00:00
William Loh
84b6862b46 Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22212986

Change-Id: I859465aa15851d7028f724d1a014c10c3f54550b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:07:45 +00:00
Automerger Merge Worker
840cb32efb Merge changes from topic "am-ae5f7f5b98a34069a8b49bcfb641d65b"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours am: e5e9d6ec2e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours am: a336abaeaf -s ours
2023-03-23 19:47:23 +00:00
Ioana Alexandru
d1d014a927 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 am: d376093e8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I2db145ce99e32d3475c307b81ca425bb3296c1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:45:01 +00:00
Bill Yi
59bf2b0eeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours am: e5e9d6ec2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8f0f8bdecd139f80cad1c00a2a031a42c83b2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:43:53 +00:00
Bill Yi
a8a36e068a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours am: a336abaeaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I739aa6ae1b19be5f5aea405804cc65b867d74eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:43:41 +00:00
Bill Yi
e5e9d6ec2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00caeabbc091d5e00a27b136328e6e4b64e17f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:36:40 +00:00
Bill Yi
a336abaeaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie888fa2400dfb751d6ca0aff6d0de36b20ee967f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:36:29 +00:00
William Loh
980ebb0ab2 [automerger skipped] Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b am: baa16cfefc -s ours
am skip reason: Merged-In I3b8639c5530782375d0b26c9a65c1662eced5493 with SHA-1 acab1045f3 is already in history

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

Change-Id: I40967c8119de689f59d972f91a487a33bf18ae39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:32:57 +00:00
Bill Yi
734c886f4d Merge changes from topic "tc_change_23032218_17" into udc-dev am: 8e1e45468b am: 63c695b4f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22202160

Change-Id: Ib68e0cf2b77f508355ca0a0635cbb22f2c007416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:10:42 +00:00
Bill Yi
36ddcb571c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de am: 2433e07070 -s ours am: 4cadc97b04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie418787a3a4be6b66f5208a0ccf1b4bc84850d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:10:19 +00:00
Daniel Norman
4b8495251b Merge "Update Settings animation to use new slide style when in SUW." into udc-dev am: c76b568914 am: 00e3fb513b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163924

Change-Id: I86dd0d6a6f0c478b799678fde82096277f8a7975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:09:20 +00:00
Becca Hughes
789ab032fd [automerger skipped] Merge "Add settings intent dialog" into udc-dev am: cbbab3632c am: a149e67785 -s ours
am skip reason: Merged-In Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32 with SHA-1 b5f8ba6945 is already in history

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

Change-Id: I6ca241386462842fb8114723b8072711165942d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:09:07 +00:00
YK Hung
c8563f3228 Merge "Update battery settings page footer string" into udc-dev am: 72690c6844 am: 1e9a296069
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Ifd7b638c0fa096c75a3e541fb0907600d611e9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:08:57 +00:00
Treehugger Robot
040238a5d2 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38 am: 0bf3e6c9a4 am: 565cf7dc72
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I0f4a09a732f2e97fb78fc248e448ab6ea300386d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:08:46 +00:00
Alexander Milantev
1bed9d09bc Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2 am: 179d3d41aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Ie203aba50b016c3fb6f84714cd1be89cd97737a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:08:32 +00:00
Josh Hou
114059581c [automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours am: b3ed786e76 -s ours am: 1e73fa1555 -s ours
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history

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

Change-Id: If6dd9ba8f39fe706ee511f0fe23bf9fdc281c304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:08:22 +00:00
Tom Hsu
3bee7b4763 Merge "Remove Numbering System preference if no corresponding locale." into udc-dev am: db94f350cb am: b31390c086
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122897

Change-Id: I7084a4756a9ff5985fff16dc8b25f4d8cc2f1899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:08:01 +00:00
Bill Yi
e0c151f401 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b12e6d6f54498621874e018c19da0b3c904a9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:05:23 +00:00
Bill Yi
f58ee3f5f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6d39000e5fde2309e4a82483db0da9584311747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:03:22 +00:00
William Loh
baa16cfefc Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22212986

Change-Id: I98c3e99a3b2b769bfb7bfa6248601702bed3aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:00:44 +00:00
Ioana Alexandru
e230f326c3 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 am: 164ef2bc06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I9b96ca99ca659df6cd75f748d5031494bbe24d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:57:22 +00:00
Ioana Alexandru
d376093e8a Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: Ifcd72aa537a1ac7c5ed70561241b5ecbae76e412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:56:05 +00:00
Bill Yi
63c695b4f4 Merge changes from topic "tc_change_23032218_17" into udc-dev am: 8e1e45468b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22202160

Change-Id: I3750b1da8e158911ddf2da198f2c3b153568a89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:49:06 +00:00
Bill Yi
4cadc97b04 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de am: 2433e07070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1377d9f834c821144c25cbbcb4f5d7e7687011b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:49:04 +00:00
Daniel Norman
00e3fb513b Merge "Update Settings animation to use new slide style when in SUW." into udc-dev am: c76b568914
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163924

Change-Id: Ia45c97508ca9a734b172e234d217cb70174c0f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:48:06 +00:00
Becca Hughes
a149e67785 Merge "Add settings intent dialog" into udc-dev am: cbbab3632c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22181848

Change-Id: I6df96c7088998d88b02dba8ff31453e4341b9132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:47:53 +00:00
YK Hung
1e9a296069 Merge "Update battery settings page footer string" into udc-dev am: 72690c6844
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Ic02c0478703bc19324d543fc2257b0a6ef9f9730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:47:12 +00:00
Treehugger Robot
565cf7dc72 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38 am: 0bf3e6c9a4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: Ib8a0f155b46b819fb6808372c39f0b25f30c78bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:47:02 +00:00
Alexander Milantev
179d3d41aa Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Idc79a3e928daefc8ae86b4097cad51b4819cc27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:46:51 +00:00