Viesturs Zarins
d16cabe8be
Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276
Change-Id: I097068654c6a38fd0d9ccdad0ee05e928d8691b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 17:50:48 +00:00
Viesturs Zarins
bd60552454
Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev
2023-06-01 17:38:21 +00:00
Prabir Pradhan
8fca8a72dc
Merge "Add "Show key presses" to input developer options" into udc-qpr-dev
2023-06-01 17:37:44 +00:00
Pavel Grafov
81e7bac047
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
am: 4c5394afb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I8ce1a31df186ab0a396c8b0858286fd1cc53f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 17:35:41 +00:00
Pavel Grafov
4c5394afb3
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I6a82013b578378facf575a6daa9070ff337d0fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:38:28 +00:00
Viesturs Zarins
8e33f2e52b
One more fix for missing Activity embedding allowlisting for Assistant.
...
The normal settings fragments are already allowlisted via SubSettingActivity.
ManageApplications fragment based activities are not compatible with that however.
ManageApplications internally launches Spa activity, so that needs to be allowlisted as well.
For more context, see
go/conversational-care-activity-embedding-allowlisting
BUG: 282921726
Change-Id: I4765bd6ba8006a56bc8b7016f57dac2188a14592
2023-06-01 16:30:51 +00:00
Pavel Grafov
8e13abebc0
Merge "Avoid double quiet mode requests" into udc-dev
2023-06-01 15:31:13 +00:00
Angela Wang
d91da4f4ca
Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev
2023-06-01 11:04:31 +00:00
Angela Wang
1bc59caf13
Shouldn't show pair another ear dialog if hearing aid supports CSIP
...
Some devices may supports both ASHA and CSIP. If the device supports
CSIP, it'll automatically pair the other ear and thus no need to pop up
the pair another ear dialog which is specially for ASHA device.
Bug: 283269736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Change-Id: I9a8e3876e2905b18b1c63e74f47c6877504ebdc8
2023-06-01 09:54:35 +00:00
TreeHugger Robot
c57d3de706
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
am: 9f831a600b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I15e5a054a77aafd21dcedea9b6a96a5b05b21e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:46:26 +00:00
TreeHugger Robot
9f831a600b
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: Ia75886edc6211a05645e047bc627a95f923cd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:02:59 +00:00
Chaohui Wang
c27682642f
Merge "Update comment for Settings_srcs build target" into udc-qpr-dev
2023-06-01 03:31:45 +00:00
TreeHugger Robot
f65da39f37
Merge "Fix TetherSettings crash issue" into udc-dev
2023-06-01 03:11:20 +00:00
Angela Wang
7df08d69be
Merge "Make Hearing devices preference always visible" into udc-qpr-dev
2023-06-01 02:04:50 +00:00
TreeHugger Robot
48381cbd0a
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
am: becebd3a55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I097932611469fa2b7db783946c6e189a8aced28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 23:17:37 +00:00
TreeHugger Robot
becebd3a55
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I023988aa8e4e84af116b44a9c5fac1982b6183c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:34:47 +00:00
TreeHugger Robot
2484fa72d6
Merge "Add more search terms for WPP" into udc-dev
2023-05-31 22:02:49 +00:00
TreeHugger Robot
4d94d4e932
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours am: d26db6ce5a
-s ours am: 34a8ceab26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I98132954e2a6ac54afc876bc6aee42957101d72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:49:37 +00:00
Bill Yi
92615faf3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours am: 16f5f3cf3d
-s ours am: 10cb85a272
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ib6f9152c11c622cd84da15542d466e90408740fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:49:32 +00:00
Bill Yi
dd3aa0a710
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours am: 58162acd2e
-s ours am: b32544a324
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I71316fddc1dce53edac50e712c474cc5c879c539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:41:11 +00:00
TreeHugger Robot
b234c9d476
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours am: 53a315463c
-s ours am: 352a55249d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I7b3281b3880345bf1e8f0f725fa40db6e57be5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:21:02 +00:00
Bill Yi
93430154f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours am: 5b8058c497
-s ours am: 5ef725d59a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I7df4aa1b6aad3d2ef55fde8d080ec53d64a49ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:21:00 +00:00
Bill Yi
6ffaa03d9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours am: 3365a09592
-s ours am: c4f7b4c792
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I6f7e5282f6ae266296255e033b54b8c6077d9b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:20:32 +00:00
TreeHugger Robot
40d10d5a57
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4
-s ours am: f8b09e115a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Ia2193600045ace9513c391550fd5ab54a7a68a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:20:02 +00:00
Bill Yi
a7de1c1abc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b
-s ours am: 27cdb764dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Ic7830cc73e05fdbfd7da1132be91f0a68a74d6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:54 +00:00
TreeHugger Robot
bffbb20d5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e
-s ours am: 647555b203
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Ia324fdf5e9567b116d5bcc18da92d274050f9c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:49 +00:00
Bill Yi
5948267b82
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd
-s ours am: 415c6816c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: I390f43e0cb8f6c111df09b8f3f7f724e28d34ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:37 +00:00
TreeHugger Robot
e27d26e27e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018
-s ours am: fc7894b9cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: I55a09b63eeacb0dd49c080497114a964babe9a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:17 +00:00
Bill Yi
f1c2dac769
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4
-s ours am: 9fdc25a0f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: If63f37fb520c7a5093f555fa6431b6eb73c56f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:18:59 +00:00
TreeHugger Robot
34a8ceab26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours am: d26db6ce5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Iaaa0fbfdb5af2fd52a0487efe0fc97d8fa6a128e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:38:06 +00:00
Bill Yi
10cb85a272
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours am: 16f5f3cf3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I520d6e87532c6ded333dc07f49c83abe15af47ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:38:00 +00:00
Bill Yi
b32544a324
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours am: 58162acd2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I9f9b243db18c2433734a1813b92bce9f4a430aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:30:48 +00:00
TreeHugger Robot
d26db6ce5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ic4012aae2ed5a39fa30a765714bfcc3fa5f3dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:30:10 +00:00
Bill Yi
16f5f3cf3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ie5bbdf284bed5731ff348b7b86bdd008e09b6d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:29:59 +00:00
Bill Yi
58162acd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I382bc02d9c504043841a8e67e304ca35fb893b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:29:09 +00:00
TreeHugger Robot
352a55249d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours am: 53a315463c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I3f170837d1872a736326ac2b6c4e0356d456ff7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:17:19 +00:00
Bill Yi
5ef725d59a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours am: 5b8058c497
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: Iabccc01460fd784dfd5031fac851478195c46602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:17:14 +00:00
TreeHugger Robot
53a315463c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I7a579cd60448e331cbdbdf709df9d851862ffe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:00 +00:00
Bill Yi
5b8058c497
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I13e43682afabb06f4b6b2db967b6b3ab485f0ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:15:53 +00:00
Bill Yi
c4f7b4c792
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours am: 3365a09592
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I5de4989ec3b0a8dd78543c0b9cb465ae611e19eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:15:08 +00:00
TreeHugger Robot
f8b09e115a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: If3bc7684a16d5e023d7db31d4796e4bb553bce7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:29 +00:00
Bill Yi
27cdb764dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Icc42e38b5b838b128e20f96cf53f719e213decab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:18 +00:00
TreeHugger Robot
647555b203
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: I8cc8f221b787a9f82498355076e74943bf28d791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:11 +00:00
Bill Yi
415c6816c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Ifa2f8a4cd867263e57ec9ed7868424d2f0c0ebdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:58 +00:00
TreeHugger Robot
fc7894b9cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: I540deef195d21dabea0fb68519cf8842ab65ad18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:38 +00:00
Bill Yi
9fdc25a0f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: I3ba1d73cbe300ad5c62b9d081dc2bebaa56482cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:13 +00:00
Bill Yi
3365a09592
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: Ida66b7c7e1e05bbab33e21143f9af1f812136dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:06 +00:00
TreeHugger Robot
17edc47fb9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6bbc4c9532
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467804
Change-Id: Ie8672f535c49be624ee9e2fa69679a904da2496a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:18 +00:00
Bill Yi
89cda21ba5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 241da8be39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467804
Change-Id: I26b6f1c38762398dbb30752bd9bb03d6c9fb7d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:12 +00:00
TreeHugger Robot
176f3d9c6a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2d464152ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467683
Change-Id: Ie8fc9fe6989f68072219cfffd2a18643340cb074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:04 +00:00