Commit Graph

102425 Commits

Author SHA1 Message Date
TreeHugger Robot
4ec4191709 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: Ie2cedf389563eaadc3d18243b093291e9091d696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:42:01 +00:00
Bill Yi
1e61214e45 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b am: d0019169fc -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: I6349541618d60517fef60d91f407dfe2b980593c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:42:00 +00:00
TreeHugger Robot
bba674ffe1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -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: Ic1edfcda7b55b28377a1d065dfaaec00b4e0088b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:51 +00:00
Bill Yi
f3020bd56f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ac1b5fd50 -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: Iba2f30b041de1d470b9eca7277664bb3060ab530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:50 +00:00
TreeHugger Robot
fcbf430ef7 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours am: 49ad55503b -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/+/17628095

Change-Id: If6986da64ef1a37ffb5bcf2f30d3c4443b3537bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:00 +00:00
Arc Wang
572b1c900f [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours am: 0c2193a8f2 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I91afac9e4e17556356ae15af489bfdc6b12bd7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:40:34 +00:00
TreeHugger Robot
22de864c99 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 18:36:40 +00:00
TreeHugger Robot
76774d9229 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:36:40 +00:00
TreeHugger Robot
dcce77a0ce Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:34:45 +00:00
TreeHugger Robot
49ad55503b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -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/+/17628095

Change-Id: I35de3648aac6fc1e15e4e7a84281fb9decc5aa00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:33:12 +00:00
Arc Wang
0c2193a8f2 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I1ab001d29927e83060cb99639e3a94d165f30a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:32:54 +00:00
TreeHugger Robot
efbebfda1f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -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/+/17628095

Change-Id: Ibceb4f290f2b935d417eba8b867c984170343b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:25:02 +00:00
Arc Wang
2adbb69d81 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: Ifc6d835387426825f5c22e92c7120b7fa9544caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:24:56 +00:00
TreeHugger Robot
eb37fe4394 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -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/+/17628095

Change-Id: Ib6f01b1895df56eb5b8d7e57cd19ddae3dfaba59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:24:45 +00:00
TreeHugger Robot
fd15f9fdd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours am: 36f3c3c79c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I195cbf230639a7529bde090a61d039e884e77804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:20:36 +00:00
Bill Yi
1405a87cb8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours am: 738c02db59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If749640486f50c991d2431a2e19639941196f7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:20:35 +00:00
TreeHugger Robot
e15242ce8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours am: 39e8371e7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0970ab5e51930fb85abcbfd3e5dff49d3926a180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:20:22 +00:00
Bill Yi
9122566cd2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours am: bad45996b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4c56f0026c37c6297eaa519006e0ec0e5c7c87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:20:21 +00:00
TreeHugger Robot
36f3c3c79c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75b57b7606a1be78acbe5e17c4f96c1bf65d7e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:37 +00:00
Bill Yi
738c02db59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5c1401fd5ffa72042366fa89219e64b2cf401f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:35 +00:00
TreeHugger Robot
d7564d9e6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours am: 3964b99f30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62b289d3ca17db68cb5f0742936ff4e6e38c88a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:35 +00:00
Bill Yi
9cbfe1b32b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5468439c4c -s ours am: 7cb7ea1514 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I826aae8414598c74157941b41bf1ab849bccddd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:34 +00:00
TreeHugger Robot
39e8371e7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5daa291faf003cde51ae8c40d8ef3ffb5655494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:29 +00:00
Bill Yi
bad45996b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea3a324200d2776651f7ad67f5934706998498d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:28 +00:00
Peiyong Lin
43836c899d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d am: 8e23b02de5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I5e8699df844aef4b3169bdc4b59643205b1cd5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:25 +00:00
Chaohui Wang
0811fb1f11 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee am: 2e5180884a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I30fe182712af3f38ccca547be103e5292db38da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:18 +00:00
TreeHugger Robot
3964b99f30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47a0a5526d8e6ee1c5851bae00a90c54d38efc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:16 +00:00
Bill Yi
7cb7ea1514 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5468439c4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d400413d41e847b9c07f588f448729d732b57ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:09 +00:00
TreeHugger Robot
3cc2f49ffc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I697483b01380c9a58968aaaf3f05b73c52bef72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:25 +00:00
Bill Yi
1b10109a03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibab16e0884b63f27be3b3e318b3aacfa46fb460b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:16 +00:00
TreeHugger Robot
03353d6449 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6192a7567342f40e2dfb0816ac5dfa9f8fa2e9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:10:58 +00:00
Bill Yi
b447a5f3b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61bf8ed909c9483c9a1fa836dfe54d1c9cdcaf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:10:48 +00:00
TreeHugger Robot
467b38d5b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-07 18:10:06 +00:00
TreeHugger Robot
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +00:00
TreeHugger Robot
ecb28bd73e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:05:07 +00:00
TreeHugger Robot
0f949ed72b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-07 18:02:44 +00:00
Peiyong Lin
8e23b02de5 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: If856da79393481c5c5d4fbddfd966a2f9d0879f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:54 +00:00
Chaohui Wang
2e5180884a Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I10e8e4a64531f5e4b8340b98ab3783f516b8c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:08 +00:00
Peiyong Lin
7ef70db34d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev 2022-04-07 17:48:18 +00:00
TreeHugger Robot
6336dc03b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:35 +00:00
TreeHugger Robot
ce51beb64d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:13 +00:00
Chaohui Wang
f2178a48ee Merge "Clean up unused Sliceable.copy()" into tm-dev 2022-04-07 17:31:08 +00:00
TreeHugger Robot
793846e887 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08cae367a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I797acd66aa4acb7b39a8d84cc068120301b4a40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:25:36 +00:00
Bill Yi
10b4940a2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 682d8df13d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7171f6e0493773705bff5ccabac56d8bb6ecbec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:25:29 +00:00
TreeHugger Robot
9e81a99857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e9c30933a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd5fc4a5daedab1839b13153caf395ed8643fb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:24:46 +00:00
Bill Yi
90f845a535 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08321b4e75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic549f6d8e099580d27740f838fe9a998ac75aa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:24:42 +00:00
TreeHugger Robot
d08cae367a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-07 17:00:11 +00:00
TreeHugger Robot
8e9c30933a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-07 17:00:05 +00:00
Bill Yi
f94a8a9af3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a31725689e388e013ea1122842c7aa0250e41a7
2022-04-07 14:17:44 +00:00
Bill Yi
d0019169fc [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib47f17b9aa3f4e067a9c7d4b203c4286356f9d87
2022-04-07 14:12:41 +00:00