Commit Graph

103112 Commits

Author SHA1 Message Date
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
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
Ricky Wai
0cacded5ca Apply enhanced confirmation mode OEM config to Settings
So Settings app will block user accessing restricted settings
if OEM config is off.

Bug: 217709978
Test: With OEM config on, accessibility page for unknown source app is
disabled by default.
Test: With OEM config off, accessibility page for unknown source app is
not disabled.

Change-Id: Id25e8fd76e6192fd4db64f81903449bb02785b39
2022-04-08 13:57:02 +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
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
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
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
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
TreeHugger Robot
897b72eb1b Merge "Fix keyboard settings crash in multi-user case" into tm-dev 2022-04-08 08:03:36 +00:00
Mill Chen
0a4bbff802 Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074

Change-Id: I1e7c78ff4d5e139fc7ee152a24265836ead34059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 06:12:06 +00:00
Mill Chen
34eecaad79 Merge "Add cache mechanism for secondary users in Storage" into tm-dev 2022-04-08 05:48:45 +00:00
Arc Wang
b9ecb6cadf [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours am: 106834efae -s ours am: b621abc5b1 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ic004264fcc0af420016b0f2fb080d781db57412f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:57:54 +00:00
Arc Wang
0213e207c5 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours am: 18e01b28e1 -s ours am: 247c98ae0f -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I0f1e1cf1982812c482afe1e841363a388b29f4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:57:53 +00:00
Arc Wang
b621abc5b1 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours am: 106834efae -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I93423294e0c2148da8774c07785bb86dda55f957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:24:12 +00:00
Arc Wang
247c98ae0f [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours am: 18e01b28e1 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4724268c0822817c05797fa3a70e0afc168a5352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:24:09 +00:00
Arc Wang
433dc28026 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: db9a89249b -s ours am: 7eacf06971 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iad43f0633ed323addf032f938215a9439c756080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:06:43 +00:00
Arc Wang
f91a33d38e [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: 925bcd19dc -s ours am: 14e8c2961d -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I20d652741924c103cee5a76917b6334dda7eb915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:06:42 +00:00
Arc Wang
106834efae [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iade58839f7c094a43b5386190c44f8f2e4056165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:06:06 +00:00
Arc Wang
18e01b28e1 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Id13203fcbe712651e2dc98aff35bc2776ec416df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 04:06:03 +00:00
Arc Wang
7eacf06971 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: db9a89249b -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I49b510353164219952c634c077850f985620714d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 03:28:28 +00:00
Arc Wang
14e8c2961d [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: 925bcd19dc -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I26605f8072de37c101a2345ff55f9972d7af155e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 03:28:24 +00:00
Arc Wang
58402f2e9f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iaf390a8742ca82ab9f5eb4023ce35f2b0bf598b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 03:28:21 +00:00
Arc Wang
13a95907d8 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I46a08791fda8dc955f2980effefa48fbe731b542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 03:28:20 +00:00
Presubmit Automerger Backend
41704f98b1 [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Bug: 216395439
Change-Id: Iac76ec56961b18816d750591654668b95d38e536
2022-04-08 03:05:40 +00:00
Wilson Wu
237a06e0c1 Fix keyboard settings crash in multi-user case
We have CL[1] to fix the NPE when keyboard settings
is launched by work app. CL[1] overlooked the work
profile with multi-user case.

Work profile user ID is not available(return null)
when calling Utils#getManagedProfile by work identity.

For work case, distinguish it's running on managed
profile user(launched by work app) or not. And use
corresponding userId as:

-. If it's a managed profile user, use currentUserId.
-. For a owner user, get managed profile userId.

[1]: Iea573922ee789d9932c0de05bf71179c4f005eeb

Bug: 216395439
Test: Manual test with bugs steps
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableVirtualKeyboardFragmentTest
Change-Id: If018d2fddbbcf932927d2235bb8e99393df1e67c
2022-04-08 11:04:52 +08:00
Arc Wang
88f4d41a82 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4929ded7641c64da2331ef184e08a90d7e31df6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:53:16 +00:00
Arc Wang
e80a3dda3c [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4ce3bc069c05b36c61dcb97204ec3eadb9a0a541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:53:15 +00:00
Arc Wang
11e9985b55 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours am: bb5620a06d -s ours am: ed46f3e357 -s ours am: cdb6525194 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Iff15ee6752482e5d67d3b176fefc6da7a8d390da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:53:09 +00:00