Bill Yi
de1870ffed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8acb20ea2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675008
Change-Id: I37b8fab4a16c5e5f94266bd46f41f7a814bdfe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 04:47:20 +00:00
Bill Yi
f89aa3ca1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I21a2962c5ae08b820a33b14a9a2c0243776cf792
2022-04-09 13:30:52 +00:00
Bill Yi
57cee05ab4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic0f60a7c13fb500763381b24d10af9e1ffd2f7b2
2022-04-09 13:26:57 +00:00
Bill Yi
7df6d79353
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675011
Change-Id: Ied5fd9d22e8a7567f921d24c344a6419ccf1fbbe
2022-04-09 13:15:09 +00:00
Bill Yi
a8dc008745
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic7c984e8829ae72309c1fc673d8b5efda52cac25
2022-04-09 13:15:01 +00:00
Bill Yi
8609572f5a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8806744519a2062a85a4bd3579604ee99afdf814
2022-04-09 13:13:23 +00:00
Bill Yi
8acb20ea2a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ec8d124d01075b528fe637783670daccb2da3cf
2022-04-09 13:07:19 +00:00
Bill Yi
7f2b0a3e06
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004
Change-Id: I9121da491000a804d91723b6e13ee9d2a74f82c2
2022-04-09 13:03:55 +00:00
Bill Yi
4beecb6946
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia56e96f0f7b667a6811440e12e3caab7dee7548e
2022-04-09 13:03:44 +00:00
TreeHugger Robot
66903e1328
Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev am: 3ed73b7b2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131
Change-Id: I2535c12e487cce2beb462995f0abda80415cf626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-09 09:22:00 +00:00
TreeHugger Robot
3ed73b7b2d
Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev
2022-04-09 08:59:05 +00:00
Bill Yi
29510c162d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib43c040ea78198a02e3a405c9d3814af1927458f
2022-04-09 04:37:46 +00:00
Bill Yi
f0622598ef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cc4c934e8fe86a45c45dc1d62aab78a30585529
2022-04-09 04:34:41 +00:00
Bill Yi
e82d15ef8a
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours am: 6df1ae4e5f
-s ours am: 74fc91b313
-s ours am: ee03d0172d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I3df6bb6584553658ba6df7a16b0f114b674747aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:57:44 +00:00
Bill Yi
3e95b42bec
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours am: ee5c8c915e
-s ours am: fdcf2eed39
-s ours am: 4dd803da1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I7f862634a2cebfda51de21a9a7df5df368ab25b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:57:21 +00:00
Bill Yi
ee03d0172d
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours am: 6df1ae4e5f
-s ours am: 74fc91b313
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: Ie8f47508a38cd60aba21309f166970901d42a13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:47:10 +00:00
Bill Yi
4dd803da1d
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours am: ee5c8c915e
-s ours am: fdcf2eed39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I84b054daea4ece17be364b6a405650ed9d3af04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:46:27 +00:00
Lucas Silva
4e8e70869b
Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536
Change-Id: I2623a62e2b83df6816ada4998951e38a4c8d8f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:15:39 +00:00
Bill Yi
74fc91b313
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours am: 6df1ae4e5f
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I8ccdc0914ae332731dbc24330bb7d42b05356ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:14:45 +00:00
Bill Yi
fdcf2eed39
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours am: ee5c8c915e
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I24893b4908756aceef98fd3edf3ed0d68e5c27ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:14:30 +00:00
Bill Yi
6df1ae4e5f
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I50b41ddcca4b5d93a80d7cb274c7bc6aee8e97cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 18:31:36 +00:00
Bill Yi
ee5c8c915e
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: Iae1f5f9c4b22fdd8aa1e82185a64c07d8c65a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 18:31:20 +00:00
Lucas Silva
8604694b24
Merge "Always set the customize button in dream settings to not selected." into tm-dev
2022-04-08 18:27:38 +00:00
Bill Yi
c854c108a2
Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE"
2022-04-08 18:08:25 +00:00
TreeHugger Robot
3e5d657d70
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443
-s ours am: 191b3c66f4
-s ours am: f558466b83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: I40930b9b7e3bc7cecca9a2550cd113a202f6a870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 17:30:03 +00:00
Bill Yi
f2ee75af93
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace
-s ours am: 6d933dc234
-s ours am: 405720d804
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: Iac8237d219de0f28af2f6eb9d8193b001b5aaf54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 17:30:02 +00:00
TreeHugger Robot
8fca0e1e69
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb
-s ours am: 71308f95e1
-s ours am: 4470dcd6c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: If9beaf5fe910d8d36ee00dcdf2c8e03cc2919925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 17:28:50 +00:00
TreeHugger Robot
90903040e9
Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb
am: 27d3d5cbdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: Id69fd6f3072a9d2daef15262ec5a168d57813cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 17:27:39 +00:00
Bill Yi
64ee29c99f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9
am: 3190e40a71
-s ours am: 23cdeae286
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: I646c34809d130c8c8beac4fbc0199d6c3b7257e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 17:27:38 +00:00
TreeHugger Robot
f558466b83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443
-s ours am: 191b3c66f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: Idbe24cff535f3591b26a033aa4ddb643c81c0854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:42:52 +00:00
Bill Yi
405720d804
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace
-s ours am: 6d933dc234
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: I1461c43cfe5f811cc80b212d9dd487fe96b296b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:42:51 +00:00
TreeHugger Robot
4470dcd6c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb
-s ours am: 71308f95e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: Id724e127a93ad691d7fad55d8e0819c9daaae909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:42:34 +00:00
TreeHugger Robot
191b3c66f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: I5cbe6e45fe2c432891eafd33960e2114b602e2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:41:15 +00:00
Bill Yi
6d933dc234
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: Ic87c9242df5d2da4163fe06cdc4a3ef52b271261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:41:03 +00:00
TreeHugger Robot
27d3d5cbdb
Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: I62f4ea02f37069236098d6abda1f6a49ed6fede3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:39:10 +00:00
Bill Yi
23cdeae286
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9
am: 3190e40a71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: I0d272ab0b28b5497c237ddc2d88b618d8206c564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:39:08 +00:00
TreeHugger Robot
71308f95e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: I4a5175a3977c16809128da77a7fba4438135952d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:38:33 +00:00
TreeHugger Robot
0e17e61443
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-08 16:22:54 +00:00
TreeHugger Robot
dd199c11cb
Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9
Import translations. DO NOT MERGE ANYWHERE
2022-04-08 16:20:46 +00:00
TreeHugger Robot
e07b5149fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-08 16:20:46 +00:00
Lucas Silva
94716a5d58
Always set the customize button in dream settings to not selected.
...
This will prevent screen readers from saying the button is selected when
the outer container is selected.
Bug: 227717835
Test: locally on device
Change-Id: Ic7b4a36eb3b79ff847909ab6fcbd984eaf93d618
2022-04-08 15:34:06 +00:00
Josh Hou
e3281e01b7
Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064
Change-Id: I0676a2cd4a37e2c7234bf8428e8c0f6a642d560b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 12:23:10 +00:00
Josh Hou
fc0033fa2e
Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev
2022-04-08 11:32:21 +00:00
Treehugger Robot
ac4f2642f0
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020
am: 02701dd8b1
am: a1e66c3aca
am: c77a56af57
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: I274b0dd215f7f1baaa1543a327fb0acb539aa843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 11:11:18 +00:00
Treehugger Robot
c77a56af57
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020
am: 02701dd8b1
am: a1e66c3aca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: Id1f56b98aaf7fc3d076eb56e54f660a50765352d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 10:55:23 +00:00
Treehugger Robot
a1e66c3aca
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020
am: 02701dd8b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 10:41:07 +00:00
Treehugger Robot
02701dd8b1
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: I686382ad702fb8e9fc090ea8441f9a1b3cae0716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 10:03:46 +00:00
Treehugger Robot
d6d6c5c020
Merge "Settings: Fix sometimes reset progress dialog not dismissed"
2022-04-08 09:46:39 +00:00
Bonian Chen
ae4b063bc2
Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486
Change-Id: Ib9d0dd32c1c3c9fbd440abec0ff24eaa8a992dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 08:28:14 +00:00
TreeHugger Robot
ea454bdbcd
Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524
Change-Id: Ic85e2d289ad3955e7d972af830d9e1b2256217a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 08:28:07 +00:00