Joshua McCloskey
10ccb0b984
Added face unicorn strings am: 66211d15bf
am: 909913ffc1
am: 4be235f6a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: Icc08826d46790ba67c0db63f3afa5e4ca1232467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:43:37 +00:00
Joshua McCloskey
4be235f6a8
Added face unicorn strings am: 66211d15bf
am: 909913ffc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: I30ce8688e2a51a3748559dbf5c29a8c0779a52ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:17:24 +00:00
Joshua McCloskey
909913ffc1
Added face unicorn strings am: 66211d15bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: Ia1006b9a2e9dc4f2264cf0be47b7e087216c30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:01:36 +00:00
Joshua McCloskey
66211d15bf
Added face unicorn strings
...
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
2022-06-15 21:07:16 +00:00
Treehugger Robot
f2cbfafb57
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa
am: bef728d2ff
am: 3682ed9fca
am: 5b27a4e24c
am: 6d36425f67
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: I9369175ae744f146b41454e9835007664eb5296c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 19:24:44 +00:00
Treehugger Robot
6d36425f67
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa
am: bef728d2ff
am: 3682ed9fca
am: 5b27a4e24c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: I824b13f157033e6ede667010936cb607205fe7eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 18:47:19 +00:00
Treehugger Robot
5b27a4e24c
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa
am: bef728d2ff
am: 3682ed9fca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: I5a857be001a9ef641299b3f849c141b45d5b6664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 18:20:58 +00:00
Treehugger Robot
3682ed9fca
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa
am: bef728d2ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: Iff5656052d729efb83a1947ecfd2393e87c9460a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:54:52 +00:00
Treehugger Robot
bef728d2ff
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: Icf6b8698aa4f01e89076fc0566f5d71ef35c1742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:35:36 +00:00
Automerger Merge Worker
f0ad740c18
Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp am: 785cbaf832
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: Ie8acecdbed8d9b31149c683aed60c5a2cd7e854f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:13:23 +00:00
TreeHugger Robot
f31d81e491
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours am: 4a83e4212f
-s ours am: 53ed759eef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: Ibc790eea9659dc29ea2d142de75445a3b1c5d7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:12:56 +00:00
Treehugger Robot
79e1afbdfa
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed"
2022-06-15 17:12:06 +00:00
TreeHugger Robot
ea9acb7fe8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours am: 844417c14a
-s ours am: 37d218599e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I7cfdf9742c07e34236681af2aa7cbb334d68a7af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:05:49 +00:00
Bill Yi
b6344a3d07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours am: c4e65cf197
-s ours am: 9ea4c77941
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I1ebfe333e4bec8f92adae104dd33dd705be33915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:05:35 +00:00
Automerger Merge Worker
785cbaf832
Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours am: 4a83e4212f
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours am: b989753b8f
-s ours
2022-06-15 16:57:44 +00:00
TreeHugger Robot
53ed759eef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours am: 4a83e4212f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: Ie24810b1dc201cf014ec862b6bbca9de1396733c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:56:26 +00:00
Bill Yi
8e92c73b8b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours am: b989753b8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I385ab70eb6fb2eb546fae94d7e3352e18980e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:56:17 +00:00
TreeHugger Robot
37d218599e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours am: 844417c14a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I1cb47c57b7c38ab70396fa94e02063e24698f570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:55:17 +00:00
Bill Yi
9ea4c77941
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours am: c4e65cf197
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I79437548fe09b5244aca383352af660920d7ff3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:55:07 +00:00
Weng Su
10aac24e9b
Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev am: 1c25ce1937
am: cf7d2ef87c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802566
Change-Id: Idc60ceaab8bb124064b9c4dbb46c650a53d47990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:54:32 +00:00
Weng Su
cf7d2ef87c
Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev am: 1c25ce1937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802566
Change-Id: Iaa2b5a26a3ee2b8490e116c5148a371651d32ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:54:00 +00:00
TreeHugger Robot
28fc41c411
Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev am: cc0754b416
am: 6da32e8c5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869535
Change-Id: I48c23041bbe828678b6f179312ace6d920bb03f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:53:33 +00:00
TreeHugger Robot
4a83e4212f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I6d43c235439a1cfad2344b89a109cd268849e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:47:38 +00:00
TreeHugger Robot
844417c14a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: Ibf72c73b773c475a21d43029ccf0c4c0774aff8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:47:35 +00:00
Bill Yi
b989753b8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I12eeeef97b1931268f958e972f5be4ae98aa1286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:47:17 +00:00
Bill Yi
c4e65cf197
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I56973c016a00acb084a6bfbc02ea89bdbc58ae3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:47:12 +00:00
Weng Su
1c25ce1937
Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev
2022-06-15 16:40:03 +00:00
TreeHugger Robot
dc3e340774
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-15 16:39:17 +00:00
TreeHugger Robot
6da32e8c5c
Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev am: cc0754b416
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869535
Change-Id: Ic0544cd42cf28b12f8ae470c67363b8683aec6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:34:21 +00:00
TreeHugger Robot
cc0754b416
Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev
2022-06-15 16:18:40 +00:00
Jason Parks
5ad4f1e639
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
am: 9afd03c09e
am: d0f7e24eb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I35402eaa71d130d5b6c79dd560fa38303ea65ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 14:03:33 +00:00
Jason Parks
886fb42cec
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: a48c508afa
am: 296fe0d0cd
am: 007f9d7278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: Ia76467286a596450bde35ec54677c2a83cf84f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 14:03:01 +00:00
Jason Parks
0a8084e8ed
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
am: 3f55cd8929
am: 6d2ab0c69c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I8fe1651d0553193d1417fe508f570a1b56ca8b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 14:01:39 +00:00
Jason Parks
d0f7e24eb3
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
am: 9afd03c09e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I03d6b0debd1d1239af9a5fa1e1cc1cc8434b611c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:59:33 +00:00
Jason Parks
007f9d7278
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: a48c508afa
am: 296fe0d0cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: Iac6683e78266adbfee3537c0c93f4164df21dc98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:59:19 +00:00
Jason Parks
6d2ab0c69c
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
am: 3f55cd8929
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I73c85f36f4edde7719e9d12ead4c10e919629a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:48:58 +00:00
Jason Parks
9afd03c09e
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I41aea305788fc9063b50676b5594bfdd8f8873ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:13 +00:00
Jason Parks
296fe0d0cd
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: a48c508afa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I9bffe0d61056d7575015f5b20ff4b71da9714f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:03 +00:00
Jason Parks
3f55cd8929
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I0fafd91b14712a6bf9a118a2512973af1fb3d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:02 +00:00
Jason Parks
88c084c018
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 5c4943cc93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I64cbc363b3ddb6cb7272b7f21c3567fcbc4e7b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:41:24 +00:00
Jason Parks
3b6fe0813b
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:14:53 +00:00
Jason Parks
5c4943cc93
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: Ia63d08e0ece9f00930d5acd1569bfcfe6a10e597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:13:51 +00:00
Jason Parks
a48c508afa
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:13:24 +00:00
Jason Parks
73276b3c91
Merge "Use API to check for the superivion component." into tm-dev
2022-06-15 12:54:00 +00:00
TreeHugger Robot
f6bce14063
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: d61b92219c
-s ours am: cb303ebddb
-s ours am: 8f33d7a795
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I0972a9ef74fc8f63608239dcedeee496a13aba74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:33:32 +00:00
Bill Yi
26044f6c40
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 46611a953c
-s ours am: b96acd4fac
-s ours am: 5a1720b53b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I67220d53e2c3be25605af58181c5cf5de6227206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:33:23 +00:00
Bruno Kremp
b16ac39ee1
Keep setting of "TurnOff hotspot automatically" when AP is changed
...
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.
Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com >
Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
2022-06-15 09:20:18 +02:00
TreeHugger Robot
8f33d7a795
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: d61b92219c
-s ours am: cb303ebddb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I5ff8d0c73c4715f7807db64e8e8d75a7b9a3c41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:06:35 +00:00
Bill Yi
5a1720b53b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 46611a953c
-s ours am: b96acd4fac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I2e8b446607dd7a54d049e1522eb01a41e0dd7ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:06:22 +00:00
TreeHugger Robot
a67ac16157
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2133a3d676
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875876
Change-Id: I660ce68b6623ab3ecb0860ca19c303fcafe247ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:49:39 +00:00