Commit Graph

103306 Commits

Author SHA1 Message Date
TreeHugger Robot
5ba74416d0 [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: 3b05e2f8b7 -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: Ib93e15074374009c92497587818a01a8d17d32c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:11:54 +00:00
Bill Yi
d0928c1448 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours am: 405720d804 -s ours am: ee310db504 -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: Ic35fd2a01f4f6a3aa503533edce3e74e87548abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:11:53 +00:00
TreeHugger Robot
c05fc2b3ef [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: 2583880780 -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: Ic365fe83a00c0940d72aa5f77ea8c95b6c11898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:10:37 +00:00
TreeHugger Robot
fe0a9b25bd Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb am: f220363676
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: If11b36783ccebbaaabadd50057e8c39248ab27e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:06:31 +00:00
Bill Yi
1831141062 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours am: 3d4c6cd1b1 -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: I6f9cbf54e582c3a9c35a3877fe24e670e31b603b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:06:29 +00:00
TreeHugger Robot
3b05e2f8b7 [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: Iffe1ae469f50aa316530478d03d198f274b4b3c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:32:25 +00:00
Bill Yi
ee310db504 [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: Ib0e96bf0e75565b9d46aeb326dceaa1af79bb6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:32:22 +00:00
TreeHugger Robot
2583880780 [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: I8f66f9e5ddc4c6415246224787b6ed0bb293059b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:31:26 +00:00
TreeHugger Robot
f220363676 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: I777bcc549974a047c83a306dc294a6196487a4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:27:13 +00:00
Bill Yi
3d4c6cd1b1 [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: Ic152ed1589b8eaf263bd65b4fb1bbeef173d3678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:27:09 +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
Josh Hou
4fbba11364 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa2e am: 1f5d4b565d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: I02397d733259df6ea0e79ee0852ce3f7a2458108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 12:23:30 +00:00
Josh Hou
ffa73fceeb Merge changes from topic "screen_title" into tm-mainline-prod am: 2808fd6a7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: Ia79431bb96fa13709352d6a0e13386a9ccf76d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 12:22:43 +00:00
Josh Hou
1f5d4b565d 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: Id056658081e27c8d55d3c3059b6f0d05b5a19a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 12:22:10 +00:00
Treehugger Robot
aad5cac854 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 am: ac4f2642f0 am: 5c6699ca7a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: Ic5497625607b057c11c213265f913c2da6ee5381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 12:14:23 +00:00
Josh Hou
fc0033fa2e Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev 2022-04-08 11:32:21 +00:00
Josh Hou
2808fd6a7e Merge changes from topic "screen_title" into tm-mainline-prod
* changes:
  [automerge] [Panlingual] Screen title is displayed incorrectly 2p: 98490cc740
  [Panlingual] Screen title is displayed incorrectly
2022-04-08 11:32:21 +00:00
Treehugger Robot
d436150433 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 am: b185066a24
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I155c8550894973763080327b3895803aa15d21a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 11:26:11 +00:00
Treehugger Robot
5c6699ca7a Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 am: ac4f2642f0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I5c463b8a31006a123076b4132d4c595866d820e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 11:26:04 +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
b185066a24 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: Id4fe93a2dec86b544cc980e7f927245be94d2d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 11:10:25 +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
d19b7cd971 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867 am: ae4b063bc2 am: ac3fd0d015
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486

Change-Id: If7fbb31a04db11761068454a50bd68818558a3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 09:13:05 +00:00
TreeHugger Robot
0c6b51a0bf Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb1b am: ea454bdbcd am: e55765f697
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: I51c78aff9b84d927c5ac8c96525abd86766e5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 09:12:38 +00:00
Bonian Chen
ac3fd0d015 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867 am: ae4b063bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486

Change-Id: I5aff304e7968eb9920df8df17ade47dd52b67584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:50:44 +00:00
TreeHugger Robot
e55765f697 Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb1b am: ea454bdbcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: Iae78388fc3085483f4f27894d05a5991f2467970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:50:39 +00:00
Bonian Chen
db24551d8e Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867 am: ee09af716f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486

Change-Id: I07a09e66af72da761d9b04b91c4dc0803ccb049f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:28:34 +00:00
TreeHugger Robot
83fe513c15 Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb1b am: 3cdb4ba090
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: I137f0bff9a7bb5c251bce58fc6afa4a2dbde48b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:28:27 +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
TreeHugger Robot
c9fa1a0136 Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod am: 485bfa10b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: I23cd19c7ba63a21a9530aceb5082d93a821ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:27:57 +00:00
Bonian Chen
ee09af716f 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: I744c944f6eb9f5ad95957887358bd9d90cac7c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:27:12 +00:00
TreeHugger Robot
3cdb4ba090 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: Id5fc60af601333e647c6450025aac9421760351c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 08:26:57 +00:00
Bonian Chen
5839607867 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev 2022-04-08 08:16:34 +00:00
TreeHugger Robot
897b72eb1b Merge "Fix keyboard settings crash in multi-user case" into tm-dev 2022-04-08 08:03:36 +00:00
TreeHugger Robot
485bfa10b7 Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod
* changes:
  [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1
  Fix keyboard settings crash in multi-user case
2022-04-08 08:03:36 +00:00
Mill Chen
ebed69a586 Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79 am: 9cbec63704 am: d65718e4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074

Change-Id: Ibb73e62f6264e6548c8c842fdb74e0aa97e84952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 06:48:05 +00:00