PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,319 Commits 1 Branch 0 Tags
76ba344af688764fe71dbb4445fe3453f7c110e7
Commit Graph

103319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
76ba344af6 Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb am: 90903040e9 am: 34d651756c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: I17cad2e2475690ee8c20f723604ce0646ff1febd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:53:08 +00:00
Bill Yi
8ff4fc8689 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours am: 64ee29c99f -s ours am: 10fe65b769 -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: Ie7de15cfabb1da5d3abc4915d39147b7fc34d813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:53:05 +00:00
Lucas Silva
1333451d6d Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 am: 336f4991af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: I8c5725d8fe6dad32fdeb3fd79658d366fe11bd32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:37:48 +00:00
Josh Hou
3357df6940 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa2e am: e3281e01b7 am: 72ded649e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: Ief0d3ebb6c88c9d181f07a039bd0fc037abbb3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:21:16 +00:00
Lucas Silva
336f4991af 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: Ibeb86a0c80fb46afccc2f07b681251efacc62e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:13:54 +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
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
34d651756c Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb am: 90903040e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: I9774a0d8f1c2423384c89fab92ed5d46462f56ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 17:51:40 +00:00
Bill Yi
10fe65b769 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours am: 64ee29c99f -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: Id7058879d1b5c9df1e9d6ed3ce6a84f5d30f2618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 17:51:39 +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
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
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
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
72ded649e3 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa2e am: e3281e01b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: I324d90f3fac5b80c9e591384f5cc97044c03b9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 12:45:34 +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
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
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