Arc Wang
c2c5b15855
Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev
...
* changes:
[automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
Hide non-system overlay window on ActivityPicker
2022-04-08 01:01:27 +00:00
Arc Wang
9877f69b2f
Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-mainline-prod
...
* changes:
[automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
Hide non-system overlay window on ActivityPicker
2022-04-08 01:01:27 +00:00
TreeHugger Robot
72e6666f4d
Merge changes from topic "presubmit-am-8af453bc60ad46b9962a87ee16b946bc" into tm-dev am: 5a547fc1f5
am: 8975333e30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625911
Change-Id: I996b9504cbc118d7c94819b817a20c09a1567f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 00:29:45 +00:00
Bill Yi
5c5724d7e3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4
am: 47e0304cea
-s ours am: 02ff30e1d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625911
Change-Id: I150ce4de546a413ff2fcbbd18a2cd89eace1c6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 00:29:44 +00:00
TreeHugger Robot
bf8f416119
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2e98d2e165
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625911
Change-Id: I16a47cf9ba312bc205117e782acc798eafdb7b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 00:29:29 +00:00
Michael Wright
ac220fe1bf
Merge "Use more unique ids for safety sources" into tm-dev am: b111d233cd
am: 36611bc07d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17538685
Change-Id: I6512cc5ba0c2ce30318253b2b92c16eb853bdd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 00:18:29 +00:00
TreeHugger Robot
8975333e30
Merge changes from topic "presubmit-am-8af453bc60ad46b9962a87ee16b946bc" into tm-dev am: 5a547fc1f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625911
Change-Id: I48e62931e2e0cdd5169674ebcca0ca5dd20fe211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 00:08:17 +00:00
Bill Yi
02ff30e1d4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4
am: 47e0304cea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625911
Change-Id: I2064f1598ea06b310af62bfd782a7750496b5eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 00:08:16 +00:00
TreeHugger Robot
2e98d2e165
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-08 00:03:42 +00:00
TreeHugger Robot
5a547fc1f5
Merge changes from topic "presubmit-am-8af453bc60ad46b9962a87ee16b946bc" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4
Import translations. DO NOT MERGE ANYWHERE
2022-04-08 00:03:42 +00:00
Michael Wright
36611bc07d
Merge "Use more unique ids for safety sources" into tm-dev am: b111d233cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17538685
Change-Id: Ic63a911f31ce2f690fc73c192dcff1a4098154a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 23:55:43 +00:00
Arc Wang
56b9b2d185
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours am: 7b2c130b51
-s ours am: 581c11eafe
-s ours am: f3b8833975
-s ours am: bab13f7c55
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I3293993e7461d98e210b0bbdb63168608f7f6767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 23:47:16 +00:00
Arc Wang
737c82bbfb
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours am: 561bb2f83e
-s ours am: 77db4bf946
-s ours am: 0f645292f7
-s ours am: e96f503a27
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I9b8fb0e34b72fd65499dce6d55a21fb2e66d515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 23:46:22 +00:00
Michael Wright
b111d233cd
Merge "Use more unique ids for safety sources" into tm-dev
2022-04-07 23:44:31 +00:00
Arc Wang
bab13f7c55
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours am: 7b2c130b51
-s ours am: 581c11eafe
-s ours am: f3b8833975
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I9cf26e1086e6b4015c89077af5fb7f560b6ebb24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 23:21:44 +00:00
Arc Wang
e96f503a27
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours am: 561bb2f83e
-s ours am: 77db4bf946
-s ours am: 0f645292f7
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I7e7c7615d613ff4b5cd9e835da3398e8005540ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 23:20:54 +00:00
Arc Wang
e4d9c56c01
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: d65f4f645e
-s ours am: 57775ce240
-s ours am: e55a9cd9b1
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I5aaedb164e9524a7aabebed1ee6982538ef66c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 22:56:47 +00:00
Arc Wang
b4fe527f77
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 37a290bf79
-s ours am: ef9d2a4f94
-s ours am: 6f811dcce3
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I4d83c3a53e497e08bdc5f65cf480e62acf69a073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 22:54:30 +00:00
Arc Wang
f3b8833975
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours am: 7b2c130b51
-s ours am: 581c11eafe
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Id1b8f767211c889f693e1ab11f4108a12d76bbeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 22:50:59 +00:00
Arc Wang
0f645292f7
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours am: 561bb2f83e
-s ours am: 77db4bf946
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: Ibb843392f3a8d0ce54a8466d41274dded1aca9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 22:50:36 +00:00
Weng Su
6c42636cb8
Fix unexpected Wi-Fi hotspot shutdown
...
- Filter out unnecessary onSwitchChanged callbacks when the switch is
disabled, which should not be triggered by user input.
- Refine the state handling function to avoid unnecessary
onSwitchChanged callback.
- Refine the error handling of isHotspotPasswordValid function.
Bug: 227719584
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest
Change-Id: If62aaadc8ddb214769b1367d7801b6125bb5377c
2022-04-08 05:35:14 +08:00
Arc Wang
e55a9cd9b1
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: d65f4f645e
-s ours am: 57775ce240
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I4097068aa905bd7c5298f43540acc5c7a22a49bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:17:55 +00:00
Arc Wang
6f811dcce3
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 37a290bf79
-s ours am: ef9d2a4f94
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: Iebdf3fb9f337ebb344c2899fcb04175d65ac93e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:16:50 +00:00
Arc Wang
581c11eafe
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours am: 7b2c130b51
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:13:47 +00:00
Arc Wang
77db4bf946
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours am: 561bb2f83e
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: Iba131858c4965835bf5ea7636cd66f6533d02510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:13:39 +00:00
Arc Wang
57775ce240
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: d65f4f645e
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I303929daf01447a7d0d9ce371c2370c0f6957b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:00:26 +00:00
Arc Wang
ef9d2a4f94
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 37a290bf79
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I812ea91050bd00e0b0a4ab9ffde6c6bba5ca5e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:59:45 +00:00
Arc Wang
7b2c130b51
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Ib63653a11e9874c656bd2dd997f67a2b59d2788c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:59:13 +00:00
Arc Wang
561bb2f83e
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: Id6964b2ad98a10ec99d77d3fc08887affa204340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:59:06 +00:00
Arc Wang
4433b23ba9
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Iad907d4b02e7e2406aca918d8841d21aceab12e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:33:34 +00:00
Arc Wang
4f2a4c2036
Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I385f1718bdc0810db374edff607a5d088caffa52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:33:29 +00:00
Arc Wang
d65f4f645e
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I30b031e36a6553930faec328c2d0097e426fb8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:32:41 +00:00
Arc Wang
37a290bf79
Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I1828afe6ae782b7165d17b7c3f721ffc52c9f7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:32:35 +00:00
Arc Wang
038da819d2
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I705269b27f44fd7335013ff728113a12f088bc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:32:16 +00:00
TreeHugger Robot
dae05a94c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99
-s ours am: d694708421
-s ours am: ec6d0cc375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731
Change-Id: Ia8bd4ab5ed5c5ce12cdd9033b7400fc13e3a6844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:07:21 +00:00
Arc Wang
346ab35fc4
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: If996f3775f8de7981af3409129d8d5254b470b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:05:45 +00:00
Arc Wang
fcf0584f93
Hide non-system overlay window on ActivityPicker am: c55b5b54d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I5404085011ef8f1120e0a8239e4049d617716690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:59:23 +00:00
TreeHugger Robot
ec6d0cc375
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99
-s ours am: d694708421
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731
Change-Id: I8cc11dce1ac425df2ee58b22ea3f59c8ad4f2c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:46:28 +00:00
Arc Wang
e5e271bfed
Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Id6820351a67c2b2924a9a6ee3a06731519510ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:44:36 +00:00
TreeHugger Robot
640cbd98af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837
-s ours am: 11c23a6a04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625450
Change-Id: If261538d1759fec1982c07d77843d8973d1ca67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:39:45 +00:00
Bill Yi
edd538585e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e
-s ours am: 2569970104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625450
Change-Id: I713bbd9b3c311149ef14bc95ce7d0abb57e1e781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:39:43 +00:00
TreeHugger Robot
d694708421
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731
Change-Id: I03bd28da190f8a10e88f4226a12eef69d9d1f5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:37:57 +00:00
TreeHugger Robot
11c23a6a04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625450
Change-Id: I2d689528f06ba8cf282e3dbeaebc29cec7bcd2ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:16:23 +00:00
Bill Yi
2569970104
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625450
Change-Id: Ieacfe4a1369ff915d69b20f09d87415cb8b77801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:16:22 +00:00
Arc Wang
21a0db9882
Hide non-system overlay window on ActivityPicker am: c4121c15e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I54645a67488b6c155218eca6c5fb5779daabd495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:15:23 +00:00
TreeHugger Robot
7e30df1837
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-07 18:49:05 +00:00
TreeHugger Robot
8bbcb0d5e9
Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229
am: 4ec4191709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731
Change-Id: I7e897b4b905aba730d98ed8d993746b4ba130014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:48:23 +00:00
Bill Yi
5a2f516216
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
am: d0019169fc
-s ours am: 1e61214e45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731
Change-Id: I2c8a8e772e72011df96d54c2265d83ece6640eea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:48:21 +00:00
TreeHugger Robot
9afb293be5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce
-s ours am: bba674ffe1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638124
Change-Id: I885ae925c4e60b9af478d259b50aa487ee77b3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:48:14 +00:00
Bill Yi
65c8955fc9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ac1b5fd50
-s ours am: f3020bd56f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638124
Change-Id: Ia8bb02a567db1f5a08118e529ac2ec12a0357ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:48:13 +00:00