Commit Graph

101825 Commits

Author SHA1 Message Date
TreeHugger Robot
e2a9ecd37f Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c5a30e12e
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:49:05 +00:00
TreeHugger Robot
7f37325af8 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: I1ea54e8389e17df766c869578a648efd5de7c121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:40:01 +00:00
TreeHugger Robot
f5826d9506 [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: I2c75598033153817892574f5a2bc43b695b58ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:39:20 +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
5bff9c0582 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 2p: d0019169fc
  [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
cec5814259 Merge changes from topic "presubmit-am-64cf0a3c0b354ea4b1dd5897c8a34a8d" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:34:45 +00:00
TreeHugger Robot
4e9515820f [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: I387fd94c259dd06804534f22e876c50cac30f9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:32:10 +00:00
Arc Wang
22d0b8cf8b [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: I70d40c4c64be98f21e1279a67b8578cf9df4ac9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:31:45 +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
b407f5f9e2 [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: Idd0304529f8f337b90cc9c5e3440eb8dc4f8f958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:41 +00:00
Bill Yi
e1e0224940 [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: I790fd5c3a88a6134102868ed939db45519414a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:40 +00:00
TreeHugger Robot
325c68c26e [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: I49f93ec8939a212f3d3ecb8489dc2d37ac825a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:33 +00:00
Bill Yi
60170e3ab0 [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: I94a5a02665caea3d7d0b06747a369ca16ed79ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:32 +00:00
TreeHugger Robot
932550da08 [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: I5f74bf4bb40f2fdeed2eaf4c4ff6e57f8a044d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:06 +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
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +00:00
TreeHugger Robot
6b7c737c5e Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:05:07 +00:00
TreeHugger Robot
ecb28bd73e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:05:07 +00:00
Peiyong Lin
f38e00f223 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: I50773da7dafbdde67ff5ace7bc5fb15a3e16f024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:00 +00:00
Chaohui Wang
1aebd5fb02 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: I9a02fa61cf65039e905b98a25e5510ae2e7c262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:54:53 +00:00
Peiyong Lin
7ef70db34d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev 2022-04-07 17:48:18 +00:00
Peiyong Lin
c3ce36da27 Merge changes from topic "remove_game_dashboard" into tm-mainline-prod
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
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
TreeHugger Robot
a18724de22 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 17:40:11 +00:00
Chaohui Wang
f2178a48ee Merge "Clean up unused Sliceable.copy()" into tm-dev 2022-04-07 17:31:08 +00:00
Bill Yi
6ed1350a4c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82c6955438591932f9801878562cbdbea36b368a
2022-04-07 14:21:45 +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
Giulio Fiscella
416e5d6f9b Merge "Use more unique ids for safety sources" into tm-mainline-prod 2022-04-07 14:17:11 +00:00
Bill Yi
847f203c73 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 2p: d0019169fc
Blank merge reason: parent was merged -s ours

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

Change-Id: I8f35bf1389a6c7e796319d525daf0060d73065ce
2022-04-07 14:12:50 +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
Bill Yi
2c4b82e04b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9df9e2fad6107338e395c58a794596f8f388c32e
2022-04-07 14:12:33 +00:00
Bill Yi
64ad35274d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
Blank merge reason: commit message contains skip directive

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

Change-Id: Iea650a2f6d4b0a8b51d12d73caea027f1335e58f
2022-04-07 14:10:02 +00:00
Bill Yi
5468439c4c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0d6144e79f9c3b5e3826d5d755842975c459ed7b
2022-04-07 14:09:14 +00:00
Bill Yi
27226cae62 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50
Blank merge reason: commit message contains skip directive

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

Change-Id: I20d817ba03611a51f006e32bd0bdc55eebb911bc
2022-04-07 14:05:40 +00:00
Bill Yi
0ac1b5fd50 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia7e6739e6fe1765e5a20e4719310354e8043db4e
2022-04-07 14:05:29 +00:00
TreeHugger Robot
1e7feb7b9b Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: Id4f0d167c496affda936b8e49ddfdd0e97f2ada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 12:07:17 +00:00
TreeHugger Robot
59c849da4d Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev 2022-04-07 11:47:51 +00:00
TreeHugger Robot
faad3dfd0d Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" into tm-mainline-prod
* changes:
  [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
  Restrict Wi-Fi toggle in Internet Settings
2022-04-07 11:47:51 +00:00
Edgar Wang
7bd6182c36 Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526

Change-Id: I611d1e07c92eda0e74b6749d3938c47ce4a5eedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:54:32 +00:00
TreeHugger Robot
55dc052eeb Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: I4a432c7345688490508a21e898462613baf1cd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:52:46 +00:00
Menghan Li
f2bfd08570 Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083

Change-Id: I940f854a1b6418b9f7d1f7fbb3c32bf1cea1235d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:52:06 +00:00
Edgar Wang
e27296e7af Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev 2022-04-07 08:01:57 +00:00
TreeHugger Robot
746502e98c Merge "Hide non-system overlay window on ActivityPicker" into tm-dev 2022-04-07 06:51:35 +00:00