Commit Graph

754433 Commits

Author SHA1 Message Date
TreeHugger Robot
1caf8b928e [automerger skipped] Merge "RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task" into sc-v2-dev am: 24506955d1 am: 6a3a50a059 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397265

Change-Id: Ie981db4a49fbe826b1744194461093e3a728896e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 20:07:46 +00:00
Automerger Merge Worker
0238c8b693 Merge "[automerger skipped] [automerge] RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task 2p: 1060493404 am: d2ed307c4d -s ours" into tm-dev 2022-03-25 20:07:30 +00:00
Lucas Silva
8159eedb16 Merge "Fix bouncer swipe touch handler" into tm-dev 2022-03-25 20:07:07 +00:00
TreeHugger Robot
6a3a50a059 Merge "RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task" into sc-v2-dev am: 24506955d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397265

Change-Id: Ic5ae3a483055010daa165f8c96a05b79340ea65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 20:07:06 +00:00
Presubmit Automerger Backend
b40c922de0 [automerger skipped] [automerge] RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task 2p: 1060493404 am: d2ed307c4d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397265

Change-Id: Ic83ebc26bf2b6910c51bd5a3bf59bd144231b56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 20:07:05 +00:00
TreeHugger Robot
24506955d1 Merge "RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task" into sc-v2-dev 2022-03-25 19:52:44 +00:00
Fabian Kozynski
d1496fc15c Merge "Fix refresh tile when tile is already listening" into tm-dev 2022-03-25 19:18:52 +00:00
Aaron Liu
fe4ffe1198 Merge "Bouncer: Remove overlap with shade and bouncer" into tm-dev 2022-03-25 19:01:33 +00:00
TreeHugger Robot
5bfedf550f Merge "Remove copied string from symbols.xml" into tm-dev 2022-03-25 18:59:15 +00:00
TreeHugger Robot
797572d068 Merge "Add traces to aid onScreenTuringOn latency debugging" into tm-dev 2022-03-25 18:48:21 +00:00
Presubmit Automerger Backend
d2ed307c4d [automerge] RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task 2p: 1060493404
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397265

Change-Id: If2c6d7bd66a56a610a2703182f2927759cd4051d
2022-03-25 18:32:42 +00:00
Miranda Kephart
b07646b6e3 Merge "Align clipboard text editor with mocks" into tm-dev 2022-03-25 18:07:48 +00:00
Ayush Sharma
25011357e7 [automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e am: 140e9ba400 am: dccb882c22 -s ours
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Iecf7dfa231350f32f198e378ddd97928e8a0befe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:02:45 +00:00
Kohsuke Yatoh
5eae33da58 Merge "Move FEATURE_IME to TestApi" into tm-dev 2022-03-25 17:58:40 +00:00
Ayush Sharma
dccb882c22 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e am: 140e9ba400
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: I5696d3b8559a90400b2b9c2112418bf8d3f96045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:47:06 +00:00
Corina Grigoras
39bd9e7b46 [automerger skipped] Merge "Move UiEventLogger interface to modules-utils." into sc-mainline-prod am: 595d50d354 -s ours
am skip reason: Merged-In I27ebffa6817575f1377beb80f4092287d9b12c49 with SHA-1 9629248c81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17291123

Change-Id: Ic94b318f993b7ba84b65e70ee6a348173229faff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:32:54 +00:00
Ming-Shin Lu
1060493404 RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task
As the new split-screen behavior that the root task of the split-screen
can be in the recents task, so using quick switch can switch between
the split-screen task and other fullscreen tasks.

So if the IME shown on the fullscreen task, when quick switch to
the split-screen task, basically the expected result will be IME
attached on the fullscreen task then won't expect IME moved to the
split-screen task.

However, the issue case is that seen the IME flicker on top of the
split-screen task and then disappeared.

The root case is in DC#computeImeParent didn't consider to not change
the new IME surface parent while the next IME input target has not yet
updated and settled the new IME visiblity, so IME may flicker if
changing the new IME parent too early.
(Typically the IME parent will be on the root displayArea when the
next target task is in multi-window mode)

We do defer changing IME parent from CL[1] when shouldImeAttachedToApp is
true, but this check didn't applied when switching to the split-screen
task, because shouldImeAttachedToApp will be false when the next IME
layering taget is in multi-window mode.

Simply move the above defer update IME parent logic out from
shouldImeAttachedToApp check to fix this IME flicker issue.

Also, remove shouldImeAttachedToApp check in
InsetsPolicy#adjustVisibilityForIme when the window is in insets frozen
state waiting for the next input started. Since there is no strong
reason to froze IME insets only when switching on fullscreen tasks.

[1]: I01b67b9a7fdf04f23ab05c244281f42518352ca5

Fix: 210391817
Test: atest DisplayContentTests#testComputeImeParent_inputTargetNotUpdate
Test: atest WindowStateTests#\
   testAdjustImeInsetsVisibilityWhenSwitchingApps_toAppInMultiWindowMode

Change-Id: I332c0e4fff62df5d7b793eda2767bb58fe85a938
2022-03-26 01:32:16 +08:00
Ayush Sharma
140e9ba400 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ia6430a6ec27185f33c08cd8120f9fa485370192d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:32:15 +00:00
Ayush Sharma
eaa3f003af [automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: 52b816c77b -s ours
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ia5f8015f33e5b8c423707124d4bcd6cb4252b750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:32:09 +00:00
Lucas Silva
a74c7f66aa Merge "Update dream blur and fade to match the bouncer scrim" into tm-dev 2022-03-25 17:30:47 +00:00
Kohsuke Yatoh
39a5d5bb17 Merge "Add NotificationTest." into tm-dev 2022-03-25 17:25:03 +00:00
Corina Grigoras
595d50d354 Merge "Move UiEventLogger interface to modules-utils." into sc-mainline-prod 2022-03-25 17:18:19 +00:00
Corina Grigoras
f80d01428a Merge changes from topic "cherrypick-cherrypick-uievent-move-master-psh3rlonw7-h8mtjk3k65" into tm-dev
* changes:
  [automerged blank] Move UiEventLogger interface to modules-utils. 2p: 9629248c81
  Move UiEventLogger interface to modules-utils.
2022-03-25 17:18:19 +00:00
Lucas Silva
2d5bd43b11 Merge "Implement bouncer fade-in animation over dreams." into tm-dev 2022-03-25 17:09:28 +00:00
Lucas Dupin
ef47207112 Merge "Add Hawk to OWNERS 🦅" am: 9c178778df am: 996b96f0e3 am: d55b1074c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043585

Change-Id: I7bf0a6f94dfc6d64ff5543bb229dd80bb23979e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:09:00 +00:00
Remi NGUYEN VAN
8b727bd1bc [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours am: fb39ec4221 -s ours am: 5312a5ef85 -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694

Change-Id: I9c11da6fbb6c2a3d2f26400acf4187b097c3c272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:08:32 +00:00
Ayush Sharma
eba9a7f06e Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: If0707013d26acad6484e8f986d91b7a2a0f2d986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:08:28 +00:00
Lucas Dupin
d55b1074c2 Merge "Add Hawk to OWNERS 🦅" am: 9c178778df am: 996b96f0e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043585

Change-Id: I9446d6890776a0e88eb3550b5b8ce00c3d7de79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:08:24 +00:00
Remi NGUYEN VAN
a26b703d8f [automerger skipped] Remove stale aidl-export references am: d386543a34 -s ours am: db05a43860 -s ours am: abd2ee719d -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694

Change-Id: I975f6365e79735bc6468d1c6028af84b755d2ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:08:20 +00:00
Automerger Merge Worker
9ab1b5c301 Merge changes from topic "am-f3ac806bba6c4b3580f671ae01e97363" into tm-dev
* changes:
  [automerger skipped] Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534e2 am: c8e6f29a28 -s ours
  [automerger skipped] Move ConnectivityT to packages/modules am: 736d7b55c8 am: daa61b67ba -s ours
2022-03-25 17:08:07 +00:00
Kweku Adams
637f7d57b3 Merge "Avoid crash when resetting defaults." into tm-dev 2022-03-25 17:07:33 +00:00
Remi NGUYEN VAN
300375a306 [automerger skipped] Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534e2 am: c8e6f29a28 -s ours
am skip reason: Merged-In I7254da424bce3df7bf4c4a3e1a5076656b7b2f18 with SHA-1 235814bb0b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378905

Change-Id: I62abd561f03bcfb633363e28d93e297888225735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:07:27 +00:00
Ayush Sharma
52b816c77b Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ieefaa627b7412969ac9fe6dc9c827881be2b8535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:07:24 +00:00
Remi NGUYEN VAN
1f3e90f018 [automerger skipped] Move ConnectivityT to packages/modules am: 736d7b55c8 am: daa61b67ba -s ours
am skip reason: Merged-In I7254da424bce3df7bf4c4a3e1a5076656b7b2f18 with SHA-1 235814bb0b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378904

Change-Id: I460f77f087906b4223e16e2ce9d4fb15fdb8857c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:07:12 +00:00
Lucas Dupin
996b96f0e3 Merge "Add Hawk to OWNERS 🦅" am: 9c178778df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043585

Change-Id: I4f111566fdf2d77602f04525f1e4d7932036e26f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:05:11 +00:00
Sharon Su
affee4a5e1 Merge "Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API." into tm-dev 2022-03-25 17:05:09 +00:00
Mady Mellor
e8756a5689 Merge "Make sure to update the manage button click listener after rotation" into tm-dev 2022-03-25 17:03:43 +00:00
Remi NGUYEN VAN
5312a5ef85 [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours am: fb39ec4221 -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694

Change-Id: Ib79c442533914f854dcd75ca82bd155c7c189ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:03:26 +00:00
Remi NGUYEN VAN
abd2ee719d [automerger skipped] Remove stale aidl-export references am: d386543a34 -s ours am: db05a43860 -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694

Change-Id: I1ff0c31b6f55159e579589604885f6dd12cd08aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:03:24 +00:00
Joshua Mccloskey
882cdf1594 Merge "Removed haptic from udfps enrollment" into tm-dev 2022-03-25 17:03:21 +00:00
Remi NGUYEN VAN
c8e6f29a28 Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378905

Change-Id: If80b91ea42a838c12f2b21fcf29093b741831566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:57 +00:00
Remi NGUYEN VAN
daa61b67ba Move ConnectivityT to packages/modules am: 736d7b55c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378904

Change-Id: I3609f8982a1ebd67e3a5d1234c40a9580a19ce05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:49 +00:00
TreeHugger Robot
acc04270dd Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am: 97e13dbd32 am: a5ea5e2d60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348121

Change-Id: I86ef3483dbb69d0235bf67781b218dc0b2618648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:44 +00:00
Matt Pietal
30735935d5 [automerger skipped] Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev am: 6fea516344 am: 51051d6b20 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378326

Change-Id: Ia3bab40ad85db09ac0830b67e96937db0b4f8047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:27 +00:00
Bernardo Rufino
4e9903c3f6 [automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev am: 5bc80b693d -s ours am: 28edb92e7a -s ours
am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 a451d5bae2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071470

Change-Id: If95e96c4a9267d2de2d161dd9dc737c23622f622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:09 +00:00
Remi NGUYEN VAN
fb39ec4221 [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694

Change-Id: If8bee6f09d8f6c13f40c2457707a2f13086cf005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:02 +00:00
Remi NGUYEN VAN
db05a43860 [automerger skipped] Remove stale aidl-export references am: d386543a34 -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694

Change-Id: I210b6bf48048fd03452640de18ca8a6c0014a599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:01 +00:00
TreeHugger Robot
bb2a42d9d5 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev-plus-aosp am: 077189a93a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17399032

Change-Id: Ic62826e19cba268a559c40ffe637b9e0004b58dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:01:38 +00:00
Cyan_Hsieh
498819e716 [automerger skipped] [Skip-Merge] [DO NOT MERGE] Do not allow Bluetooth enabling during device 2p: 68ce540e60 am: f0b20bb21f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17399032

Change-Id: I2efc612dc2ff186338035d324f239dcb1738770f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:01:25 +00:00
TreeHugger Robot
a5ea5e2d60 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am: 97e13dbd32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348121

Change-Id: I9e396e1d42ca4bce0c19b0eb13942037792c18b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:00:57 +00:00