Bill Yi
c68321c696
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: If6d5d2926bf2bd268a832ec8f05fa718967d3de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:24 +00:00
Treehugger Robot
059773bd86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I03d8e31c1ab27742b95e0a528a135aa15db4e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:46:16 +00:00
Bill Yi
284d320abb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I4e9438ad10906e729a3eafbb69410fa4ce011c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:46:11 +00:00
Treehugger Robot
763b15231f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I67802f22ec2b6c9181294a2bede4a125f59d9514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:36 +00:00
Bill Yi
32fce5403f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I635434e235c73d3db56a56183e0c9b442f2da8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:29 +00:00
Treehugger Robot
ba4dc8f0bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
d8d85a8485
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
f996cfceba
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-06 14:19:16 +00:00
George
d41299016e
Correct typo in the launch via NFC bottom string
...
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
2023-06-06 21:39:01 +08:00
Bill Yi
1f4423fafc
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-06-06 13:27:22 +00:00
Bill Yi
e390627eb5
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-06-06 13:27:22 +00:00
Aleksandar Kiridzic
a882fd268d
speech: On-device recognition settings profile selector
...
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.
Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
2023-06-06 14:10:34 +01:00
SongFerngWang
13cd052693
ForgetDeviceDialogFragment check whether device is null or not
...
Bug: 280687867
Test: build pass
Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b
2023-06-06 09:53:36 +00:00
Treehugger Robot
7d5f723677
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: d05997872a
am: 2237bd2d6e
am: 2168824eba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Id108a23d2ed00cc302c4cdf38f2aef0100305114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 08:49:13 +00:00
Treehugger Robot
cdde783492
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: ae50f4d0e6
am: ed2f0ccb0b
am: e2892a70dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I677a4ceed862b2287bccc57679f97f8aad3425dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 08:48:04 +00:00
Treehugger Robot
13916f6b4d
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: d05997872a
am: b0df718bae
am: e5e57499b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: If69063cea6e2f74010e9ca08e05df1519d778496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 08:47:28 +00:00
Treehugger Robot
2168824eba
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: d05997872a
am: 2237bd2d6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I574474239367f71e23303252ce35317b8cbc54fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 08:03:46 +00:00
Treehugger Robot
e2892a70dc
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: ae50f4d0e6
am: ed2f0ccb0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I06743a0141833c157973c11ada377c8106175c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:59:09 +00:00
Treehugger Robot
e5e57499b8
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: d05997872a
am: b0df718bae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: If6e3d192523e9ae43ff157234e8a9c4193adb0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:58:28 +00:00
Treehugger Robot
ed2f0ccb0b
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: ae50f4d0e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I03e173717694632d6dd2ee02f1e16813b49cf1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:21:39 +00:00
Treehugger Robot
2237bd2d6e
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: d05997872a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Iac12a1a635d0aab70b994f49a18b4914aa0d412e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:20:29 +00:00
Treehugger Robot
0c13ef9e5e
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: e6d4fa7daa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I7841aa63a4c06f4d7cf7f6500e2989e95a2c11f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:17:45 +00:00
Treehugger Robot
b0df718bae
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
am: d05997872a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I3af28ff3dcbb096e8376d0983cbfd54ce73f72b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:16:22 +00:00
Treehugger Robot
e6d4fa7daa
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I94b718ca2dfebe1a704e558efb9e4dcf1c9cb200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 06:38:26 +00:00
Treehugger Robot
d05997872a
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Ice47c201387d778d3bee0aa239fdd3b3eb59a031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 06:38:00 +00:00
Treehugger Robot
ae50f4d0e6
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Ia2d93b574bf5a744d129558e92f19fa5229486a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 06:33:51 +00:00
Treehugger Robot
185244f43d
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev
2023-06-06 05:49:40 +00:00
TreeHugger Robot
c6420ce212
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f
-s ours am: 8f5a0bc281
-s ours am: af27dd5a9f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I88015e2cc4931e4e23aa91dc88747dc8559fb715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 02:06:23 +00:00
Bill Yi
3eca87c921
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0
-s ours am: a18807d9ca
-s ours am: 1f4d5cbba3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: If711e7e43cadc96724dc5f08c83b42060a03e6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 02:06:21 +00:00
Bill Yi
fc3728ece1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours am: aeacaaee64
-s ours am: 8d90146056
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: I36d540ceaca0f6138d0680f7a44399c45c48f86d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 02:04:49 +00:00
TreeHugger Robot
54d05e8ef3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f
-s ours am: 8f5a0bc281
-s ours am: 9c6d0441b1
-s ours am: db9add5106
-s ours am: beaf62c888
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I411a287b02d18eb9d0163900e4efdfd00b670b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 01:59:19 +00:00
Bill Yi
e678010634
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0
-s ours am: a18807d9ca
-s ours am: 0db4720d61
-s ours am: 125d5904d2
-s ours am: 6ff4c4f3da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I581e07e65fa52927be69935c8930cdd1f231282d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 01:59:15 +00:00
Bill Yi
09c895a6a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours am: 0a31322199
-s ours am: 5594e824f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I745b5284200ad13144eb57f4db7071015e205fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 01:56:23 +00:00
TreeHugger Robot
1c9b4520d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: a28a3df494
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556161
Change-Id: I0e1b0857b8a03eae4c0382c3c45c6002f4b3fc17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 01:55:46 +00:00
Bill Yi
bbbdbfe3ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81c5c7a5d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556161
Change-Id: I36be3a2ca8506bdb435c3ab9a206a7306410d98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 01:55:38 +00:00
Treehugger Robot
e30a893b22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6cb0b2c68e
-s ours am: fc0e5b8a0c
-s ours am: 58ccdb7f48
-s ours am: 6eb3ba882a
-s ours am: 2ccc970989
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: Icd5665cd9ab5fd964ca646bc59f9eb7b05a02a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:49:08 +00:00
Bill Yi
290a131454
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cb99dd3e3
-s ours am: eabe8621e3
-s ours am: 0a3eb6c5ba
-s ours am: d08542f649
-s ours am: 3ae4845dd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: I3ae7d3219e18d161e3ca9784e1cf0951030c6ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:48:52 +00:00
Bill Yi
40c68c6632
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14
-s ours am: e68afc2727
-s ours am: 63067fce6e
-s ours am: 5df607d81f
-s ours am: da41afac9c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: I7811e9213f298c52bdb4d3e67eb49e4f0a852f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:48:34 +00:00
TreeHugger Robot
1de82ff75e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f
-s ours am: 8f5a0bc281
-s ours am: 0741621536
-s ours am: 2856b252d6
-s ours am: 266708ca2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I996de987cca3f7dac30646d5657cc6276304fc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:44:28 +00:00
Bill Yi
8f123bf2ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0
-s ours am: a18807d9ca
-s ours am: 556351d016
-s ours am: 1286e7ab43
-s ours am: 1b40614229
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: Ie1a38a64c11cc1ace7ba271ab2f7ce56eb7ea53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:44:24 +00:00
Automerger Merge Worker
efff7697c6
Merge changes from topic "am-6cc4fe5fab0148828467f72cff0ecff5" into udc-qpr-dev-plus-aosp am: c8acbf2fd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I3eee18199cd929b7fa258f2fc5405316432ef4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:42:44 +00:00
TreeHugger Robot
65deee9dca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f
-s ours am: 8f5a0bc281
-s ours am: 0741621536
-s ours am: c80daa5759
-s ours am: fd9b1dd3e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: If9484de224dd55968daf89dd0b53e991f85c8a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:42:43 +00:00
Bill Yi
9892a0ff76
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours am: aeacaaee64
-s ours am: 6f0fe3ef25
-s ours am: 586019ca54
-s ours am: 0e15c95689
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: I0ea37bff6994b92f49201794cbec11c006c3b101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:41:56 +00:00
Bill Yi
81ee70d76d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours am: aeacaaee64
-s ours am: 6f0fe3ef25
-s ours am: 6804100740
-s ours am: cfbc70747e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: Id7b009200e397902cde0df7cdccd0377abe4f779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:39:46 +00:00
Bill Yi
9a0e7e8f15
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours am: 0a31322199
-s ours am: 0813a0de64
-s ours am: 3f370e8a21
-s ours am: 66a09fa2d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: Ib8e702dd650c5d313b681f5ecc5e9b9322c0b1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:25:53 +00:00
Automerger Merge Worker
6cb717bea1
Merge changes from topic "am-83fb4ab6e7314229b5ecf602fd7d3290" into udc-qpr-dev-plus-aosp am: 957d5dcce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: I42836fc82e357cc8ce4c1d1ed504a9d455e58e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:24:23 +00:00
Automerger Merge Worker
9990eeda81
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237
-s ours am: aeacaaee64
-s ours" into udc-dev-plus-aosp am: df0a3a6534
-s ours am: 3777d18917
-s ours am: a400341534
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: I7d6351d770348c73e9b8e92e9a82319a98b27329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 23:24:17 +00:00
Alejandro Nijamkin
6f9f3a4594
Fixes nav stack issue.
...
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.
Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.
Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
Bill Yi
273e3ee549
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours am: 0a31322199
-s ours am: 0813a0de64
-s ours am: 84b1429d7c
-s ours am: b3db689a07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: Ib78e1c66ebd6b3411b9b8be17dbc11b9aeed4c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 22:14:40 +00:00