Commit Graph

654162 Commits

Author SHA1 Message Date
Andrei Onea
227595f050 Add null checks for ConcurrentHashmap queries
Ensure all queries done in CompatChange are only done for non-null
package names.
The previous change broke several tests.

Bug: 200155796
Test: atest com.android.server.wm.DisplayAreaTest#testGetOrientation
Change-Id: I7fc9ccb45987e03f6f172a077303c25d5ae1ccf3
Merged-In: I7fc9ccb45987e03f6f172a077303c25d5ae1ccf3
(cherry picked from commit 8596dd12ca)
2021-09-20 12:44:07 +00:00
Jamie Garside
2044a05ad6 Merge "Fix bug preventing pattern bouncer entering half height mode." into sc-v2-dev 2021-09-20 11:39:33 +00:00
Chris Li
f061f27f16 Merge "Include activity reparent in transition" into sc-v2-dev 2021-09-20 10:13:36 +00:00
TreeHugger Robot
a8ecb94434 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-20 06:19:02 +00:00
Chris Li
494ce0751d Include activity reparent in transition
When an activity is reparented from a Task to a TaskFragment of
different bounds, freeze the surface and include it in app transition.

Bug: 196173550
Test: test with demo app
Test: AppTransitionTests#testActivityRecordReparentToTaskFragment
Change-Id: I73edc2c4091f0e4156ecf963ce4d1fcbd00333c8
2021-09-19 08:12:03 +08:00
Bill Yi
7fb5fd2578 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaf431b5818d882f668b4f389a955868172e3bd85
2021-09-18 16:22:48 +00:00
Ben Murdoch
285761876b Merge "Set navigation mode when taskbar is initialised." into sc-v2-dev 2021-09-18 09:47:00 +00:00
TreeHugger Robot
f1851c9a84 Merge "Show UDFPS icon on AOD even if fp auth isn't running" into sc-v2-dev 2021-09-18 06:48:58 +00:00
TreeHugger Robot
15686a37fc Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-v2-dev 2021-09-18 06:20:47 +00:00
Jerry Chang
d13ce08d6b Merge "Align rounded corners beside divider bar with display and task bar" into sc-v2-dev 2021-09-18 01:54:45 +00:00
Kevin Chyn
451ae2cd74 Merge "Add Beverly to OWNERS" into sc-v2-dev 2021-09-18 01:09:05 +00:00
Brad Ebinger
b954ad84e2 Merge "Add a device overlay for radio off delay due to IMS deregistration" into sc-v2-dev 2021-09-17 23:01:25 +00:00
Kevin Chyn
102ff0fc77 Add Beverly to OWNERS
Fixes: 200321585
Test: Presubmit
Change-Id: I8383153855de2127f3b36d43ce5558751cc1a42e
2021-09-17 15:25:58 -07:00
Ben Murdoch
209727f64b Set navigation mode when taskbar is initialised.
Without this, EdgeBackGestureHandler doesn't know that gesture nav is
enabled until you toggle the setting explicitly.

Bug: 198639199
Test: Manual
Change-Id: Ie732469726318a335401a13f68083256f5b9a231
2021-09-17 23:23:46 +01:00
Mariia Sandrikova
c3c2b146d6 Merge "[2/n] Display stack provides DisplayInfos" into sc-v2-dev 2021-09-17 22:18:30 +00:00
TreeHugger Robot
aaca770cd7 Merge "Move toast line height attribute to default style" into sc-v2-dev 2021-09-17 20:29:36 +00:00
Beverly
6976853a62 Show UDFPS icon on AOD even if fp auth isn't running
* shows udfps if it's enrolled on AOD even if:
   * device requires strong auth (ie: after reboot, lockdown)
   * device is unlocked via smart lock

On click of the udfps icon in the above cases:
  * If the device is locked, the bouncer will show.
  * If the device is unlocked, the user will enter the device.

Fixes: 198315404
Test: manual
Change-Id: Id766df8f77427ae1db672507716bd38dc3462452
2021-09-17 19:36:37 +00:00
Beverly
9b62051f88 Update clock burn-in so it doesn't clash with udpfs
* update the UDFPS icon burn-in parameters to be in pixels
because we don't want display density to increase the
position movement
* when the clock is centered aligned, we want to make sure
it doesn't overlap with the udfps icon

Test: atest SystemUITests, manually update clock times with
with DozeUi.BURN_IN_TESTING_ENABLED enabled and see clock
doesn't interfere with the UDFPS icon.
Fixes: 192423460

Change-Id: I6f95fe3ad763971b804129b517f4c98192ab3674
2021-09-17 17:48:25 +00:00
Peter Kalauskas
a47b439b06 [automerger skipped] Merge "Only animate user list if there's multiple users" into sc-qpr1-dev am: 2c25dc37ee -s ours
am skip reason: Merged-In I4a70e1bb93652996764a533b2c84241653c007da with SHA-1 54c8099b3e is already in history

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

Change-Id: I8c2ba081d41a0581b7148f65c30499a93ad63d39
2021-09-17 16:51:37 +00:00
Peter Kalauskas
212b756fb7 Merge "Move keyguard multi-user icon into container view" into sc-v2-dev 2021-09-17 16:41:57 +00:00
Peter Kalauskas
2c25dc37ee Merge "Only animate user list if there's multiple users" into sc-qpr1-dev 2021-09-17 16:39:03 +00:00
Bernardo Rufino
00d9e5301e Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011

Change-Id: I92fe8e94c677f79951994d03c6cae6071f31592c
2021-09-17 15:29:36 +00:00
Bernardo Rufino
d9ba2df119 Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev 2021-09-17 15:15:48 +00:00
TreeHugger Robot
092b4f8155 Merge "Make RtlEnabledContext static" into sc-v2-dev 2021-09-17 15:15:33 +00:00
Peter Kalauskas
ad63aa3dc9 Only animate user list if there's multiple users
Prevent ArrayIndexOutOfBoundsException from occurring if there are no
child views yet.

Test: Enable keyguard user switcher and reboot several times
Bug: 198642878
Change-Id: I4a70e1bb93652996764a533b2c84241653c007da
Merged-In: I4a70e1bb93652996764a533b2c84241653c007da
(cherry picked from commit 54c8099b3e)
2021-09-17 15:05:41 +00:00
Jerry Chang
8675afb2c4 Align rounded corners beside divider bar with display and task bar
Use the same way to draw rounded corners beside divider bar with
display and task bar to make sure all rounded corners share the same
style.

Bug: 196272915
Test: atest WMShellUnitTests
Test: manul check the rounded corners rendered in proper position.
Change-Id: I566ef5233dc345e0229fd9637c3b05705ba35864
2021-09-17 22:58:27 +08:00
Naomi Musgrave
aca03a172c [2/n] Display stack provides DisplayInfos
For all possible states a device can assume, the DisplayManagerService
provides the DisplayInfo associated with that layout of the logical
display. WindowManager applies each possible rotation to these
DisplayInfo. This, in turn, is used to calculate the possible max
WindowMetrics on the device.

Done:
* Display stack builds collection of DisplayInfo, for all
 possible display states (folded, unfolded on jumbo)
* Display stack pushing set of DisplayInfos to WindowManager
* WindowManager calculates max bounds for all possible
  (display layouts x rotations)

Not started:
* WindowManager calculates insets for each rotation

Bug: 181127261
Test: atest DeviceStateManagerGlobalTest
Test: atest DeviceStateManagerServiceTest
Test: atest LogicalDisplayMapperTest
Change-Id: I3a407262e755cb57c506b7255eb5c067523381d3
2021-09-17 14:56:33 +00:00
TreeHugger Robot
a77d117fb2 [automerger skipped] Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b -s ours am: ea3298f1fd -s ours
am skip reason: Merged-In I3a8168e6f1970c36717e0a7a223bcc74c3ec5600 with SHA-1 c87d7f79ca is already in history

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

Change-Id: Icbb1158f12c0d5d5dc3914391abbf88c3cdb7454
2021-09-17 14:19:16 +00:00
TreeHugger Robot
8fc910ff0d [automerger skipped] Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-dev am: cc62a80883 -s ours am: 74118d2cf2 -s ours
am skip reason: Merged-In I3583c277bebbb3de2523d18681dda3bb0dcf491f with SHA-1 e51d83e1c8 is already in history

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

Change-Id: I7a0ff7bc28761301ca04e5c060630351e5f99b56
2021-09-17 14:19:11 +00:00
TreeHugger Robot
404c69152c [automerger skipped] Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev am: 7326de8cc3 -s ours am: 14755715de -s ours
am skip reason: Merged-In Ic9fa82a549599e48d281b4db69c04627803c6c5a with SHA-1 374f321fca is already in history

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

Change-Id: Ic27189089e82e54a5859d427b3e2d17954823d14
2021-09-17 14:18:55 +00:00
TreeHugger Robot
ea3298f1fd [automerger skipped] Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b -s ours
am skip reason: Merged-In I3a8168e6f1970c36717e0a7a223bcc74c3ec5600 with SHA-1 c87d7f79ca is already in history

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

Change-Id: I6da6859925fdb39fe2b38034383c359062bdac95
2021-09-17 14:08:06 +00:00
TreeHugger Robot
74118d2cf2 [automerger skipped] Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-dev am: cc62a80883 -s ours
am skip reason: Merged-In I3583c277bebbb3de2523d18681dda3bb0dcf491f with SHA-1 e51d83e1c8 is already in history

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

Change-Id: I1857ab992ff11ffe1890ae245456daf063bca25e
2021-09-17 14:07:57 +00:00
TreeHugger Robot
14755715de [automerger skipped] Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev am: 7326de8cc3 -s ours
am skip reason: Merged-In Ic9fa82a549599e48d281b4db69c04627803c6c5a with SHA-1 374f321fca is already in history

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

Change-Id: I6baaae45335681981c4883a6ccca1ecdb4cfd234
2021-09-17 14:07:46 +00:00
TreeHugger Robot
9a66f8324b Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev 2021-09-17 13:54:05 +00:00
TreeHugger Robot
cc62a80883 Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-dev 2021-09-17 13:53:46 +00:00
TreeHugger Robot
7326de8cc3 Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev 2021-09-17 13:53:25 +00:00
TreeHugger Robot
004fbadf92 Merge "Show swipe up to open message on faceAuth from AOD2" into sc-qpr1-dev am: 0efdcfc86b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15845110

Change-Id: I7e307a191a8bd446f5db0bbcbf9fa6a418ef558d
2021-09-17 13:33:25 +00:00
TreeHugger Robot
0efdcfc86b Merge "Show swipe up to open message on faceAuth from AOD2" into sc-qpr1-dev 2021-09-17 13:20:05 +00:00
TreeHugger Robot
c44415d59e Merge "Update rotation with animating recents if the device will sleep" into sc-qpr1-dev am: 2e2e4b3ac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15837570

Change-Id: Icbec1d643527912b6a8571a80c187c577d6af3b8
2021-09-17 13:04:55 +00:00
TreeHugger Robot
278989e6a4 Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev am: 209aec5829
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15846215

Change-Id: If53683eb2f993b61854e69496f9569fa90fe93eb
2021-09-17 13:04:45 +00:00
Benedict Wong
ada726e26d Merge "Always trigger safe mode callbacks" into sc-qpr1-dev am: 24ad5af4f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15818048

Change-Id: Ieed9c2e04e586ddc73d66ef260d8b4a3a1d97bfa
2021-09-17 13:04:35 +00:00
TreeHugger Robot
3a746b4ec0 Merge "Don't rotate LS udfps location unless LS is occluded" into sc-qpr1-dev am: ed47c002f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839008

Change-Id: I78c9efde6cead95d72d0f5f602a393ea8fcb70f1
2021-09-17 13:04:17 +00:00
TreeHugger Robot
a608bf7c78 Merge "NotificationShade should animate away on MODE_UNLOCK_COLLAPSING" into sc-qpr1-dev am: a22f94bd81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15843869

Change-Id: Id38a11f15fe1a320cc403a8bcd864ab651bab8db
2021-09-17 13:04:07 +00:00
Matt Pietal
f2de364049 Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev am: b6dfc45ca1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15827618

Change-Id: Idf148fadb049d8ee2b2da2a5bf9472c3656bafc5
2021-09-17 13:03:56 +00:00
TreeHugger Robot
7cf67680ed Merge "Merge "Don't wakeup from the pickup gesture when kg is occluded" into sc-qpr1-dev am: 04c515b87a" into sc-v2-dev 2021-09-17 13:03:45 +00:00
Beverly Tai
c114a23f9f Merge "Don't wakeup from the pickup gesture when kg is occluded" into sc-qpr1-dev am: 04c515b87a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15669803
Bug: 194925434
Fixes: 200166757
Change-Id: Ie384cc8de3889f7001b43bb7f209014927b6c384
Merged-In: I9856571e104ef05aec93d32056cd2097c2d2a1da
2021-09-17 12:08:36 +00:00
Jerry Chang
754976361b Merge "Use screen-based coordinates to calculate divier bar dragging velocity" into sc-v2-dev 2021-09-17 07:44:13 +00:00
TreeHugger Robot
2e2e4b3ac4 Merge "Update rotation with animating recents if the device will sleep" into sc-qpr1-dev 2021-09-17 05:42:28 +00:00
TreeHugger Robot
c3409c0dfd Merge "Adding logging to track down alpha changes" into sc-v2-dev 2021-09-17 05:33:28 +00:00
Charles Chen
62a65fbf5c Merge "Fixes some issues for embedded Task" into sc-v2-dev 2021-09-17 02:32:30 +00:00