TreeHugger Robot
3ab801d3ca
Merge "Introduce TaskView.setObscuredTouchRegion." into tm-dev
2022-03-26 02:04:15 +00:00
Lucas Dupin
70928042e6
Merge "Do not relayout window whenn pulling shade" into tm-dev
2022-03-26 01:10:05 +00:00
Bill Yi
210a64ff62
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-25 23:51:32 +00:00
Joe Bolinger
9b52f33620
Merge "Re-enable biometric prompt tests." into tm-dev
2022-03-25 23:32:53 +00:00
TreeHugger Robot
82100c9d36
Merge "Only clear preferred UID at appropriate times." into tm-dev
2022-03-25 22:12:51 +00:00
Chavi Weingarten
381743d2ee
Merge "Remove consumeNextDraw and replace with SurfaceSyncer" into tm-dev
2022-03-25 22:08:17 +00:00
Beverly Tai
e70333a546
Merge "Add lock icon click handler when a11y is enabled" into tm-dev
2022-03-25 22:08:01 +00:00
Aman Gupta
c1f6508897
Merge "Adding maxTargetSdk AndroidS to DATA_ROAMING. This will make sure that beyond S people can not access the DATA_ROAMING API from Settingss.Ideal way to use this is from TelephonyManager." into tm-dev
2022-03-25 22:01:07 +00:00
Xiaowen Lei
73f7aaf537
Merge "Add logging for Dream swipe up to show Bouncer." into tm-dev
2022-03-25 21:57:37 +00:00
Lucas Dupin
3cc59ab8de
Do not relayout window whenn pulling shade
...
Fixes: 226673097
Test: perfetto trace
Test: atest NotificationShadeWindowControllerImplTest
Change-Id: I73de673776957ad8cbb17d0d13b94f0fa28203bd
2022-03-25 14:50:45 -07:00
Xiaowen Lei
c1c53abc45
Add logging for Dream swipe up to show Bouncer.
...
Tested the behavior both in existing tests and in the new
testSwipeDownPositionAboveThreshold_expandsBouncer_doesNotLog().
Also removed the existing
testExpansionAmount_whenBouncerShown_setsCorrectValue(), because it
duplicates testCollapseAmount(). And updated some of the existing tests
to have more explicit names and comments.
Bug: 213906448
Test: Manually on device via `statsd_testdrive 90`
Test: atest BouncerSwipeTouchHandlerTest
Change-Id: I217025134d7574c3ce1d123688ae0db4ceef848c
2022-03-25 21:50:10 +00:00
Evan Rosky
be2f1eaea9
Merge "Detect "expand to fullscreen" over recents and switch to it" into tm-dev
2022-03-25 21:26:12 +00:00
Xiaowen Lei
aecf90be14
Merge "Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks." into tm-dev
2022-03-25 21:18:11 +00:00
Eric Biggers
912ef9c967
Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f am: 024d224ddd am: 3fc85dafa7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809
Change-Id: If6472cf90519a93d541ddd5a8ff491fd46b050c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 21:01:13 +00:00
Eric Biggers
3fc85dafa7
Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f am: 024d224ddd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809
Change-Id: I84e54f8879eda247a3b73875c167203b2725c6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 20:36:59 +00:00
Kweku Adams
807dab2cb3
Only clear preferred UID at appropriate times.
...
The preferred UID is set when we call
JobServiceContext.cancel(...PREEMPT), so clearing the preferred UID
before that call is pointless. Also, make sure not to clear the
preferred for contexts that are only going to be used to transfer jobs
to the preferred UID.
Bug: 141645789
Bug: 204924801
Test: Android builds
Change-Id: I18db34a389919432b604d68f90a6901d9e6f9cba
2022-03-25 20:15:52 +00:00
Eric Biggers
024d224ddd
Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809
Change-Id: Ia445a7820ebe9e412797b8b11b4543bb2a08e81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 20:14:13 +00:00
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
Eric Biggers
ca46dc186f
Merge "DiskStatsService: stop checking for full-disk encryption"
2022-03-25 19:54:49 +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
Xiaowen Lei
ac8355b60e
Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks.
...
Since the KEYGUARD_TIMEOUT message is sent to the handler before the
SHOW message, when handling KEYGUARD_TIMEOUT, mShowing is still false.
The notifyDefaultDisplayCallbacks is later called again in
setKeyguardShowing, after showing has been updated to true.
Also updated setKeyguardShowing to not call
notifyDefaultDisplayCallbacks when only aodShowing is different.
Bug: 221866693
Fix: 221866693
Test: manually on device with instructions in the bug.
Test: manually on device with added logging.
Change-Id: Ie43b1c629e94307a617fcf57c9ebc4ff3e982fbf
2022-03-25 19:04:36 +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