Commit Graph

657323 Commits

Author SHA1 Message Date
Ben Lin
a656a4e4e4 Merge "PiP: Show/hide enter split button based on focused task." into sc-v2-dev 2021-11-25 07:18:59 +00:00
Chris Li
ec0c08c771 Merge "Check okToAnimate for TaskFragment change transition" into sc-v2-dev 2021-11-25 02:54:24 +00:00
Caitlin Cassidy
2ed5777693 Merge "[Status Bar Refactor] 3/3: Remove HeadsUpAppearanceController#destroy and migrate the controller to a ViewController model instead." into sc-v2-dev 2021-11-25 02:48:18 +00:00
Caitlin Cassidy
135ea0f4bc Merge "[Status Bar Refactor] 2/3: Remove HeadsUpAppearanceController#readFrom(oldController)." into sc-v2-dev 2021-11-25 02:47:53 +00:00
Ming-Shin Lu
cf9560a43b Merge "Revert hide logic in ImeInsetsSourceConsumer#setControl" into sc-v2-dev 2021-11-25 02:30:29 +00:00
Riddle Hsu
49794ebb48 Merge "Do not skip restoring rotation lock when returning to home" into sc-v2-dev 2021-11-25 02:20:20 +00:00
Vinit Nayak
1b79c1b5ce Merge "Revert "Revert "Extract assistant logic from NavigationBar to share with Taskbar""" into sc-v2-dev 2021-11-24 23:36:46 +00:00
Ben Lin
b26f380809 PiP: Show/hide enter split button based on focused task.
Bug: 202740657
Test: Enter PiP, go to home, tap on PiP - menu does not have split
button
Test: Enter PiP, open Messages, tap on PiP - menu shows split button

Change-Id: Ide755008f9b6ad844d7453fb024f2d6c7db4f36b
2021-11-24 14:29:31 -08:00
Winson Chung
17474bedec Fix issue with alphas not being applied to the same view on unlock am: acb755ce9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16333337

Change-Id: I4942c780a56624c58b1b785495f5e2e78becce3f
2021-11-24 21:47:05 +00:00
Caitlin Cassidy
31bb3ec91a Merge "[Status Bar Refactor] 1/3: Have HeadsUpAppearanceController be created by dagger and use it in CollapsedStatusBarFragment instead of using StatusBar.java." into sc-v2-dev 2021-11-24 21:41:55 +00:00
Vinit Nayak
7943b8b8da Revert "Revert "Extract assistant logic from NavigationBar to share with Taskbar""
This reverts commit 2511ebcc40.

Bug: 204273914
Change-Id: I142802ef68e77030a340a59a25fd082852cd6c0c
2021-11-24 12:10:29 -08:00
Beth Thibodeau
3a2fe51e9f Merge "[DO NOT MERGE] Remove taps option from screen record dialog" into sc-v2-dev 2021-11-24 18:12:55 +00:00
Caitlin Cassidy
d25d79f918 [Status Bar Refactor] 3/3: Remove HeadsUpAppearanceController#destroy and
migrate the controller to a ViewController model instead.

This allows us to not have to keep track of old HUACs anymore!

Test: atest SystemUITests
Test: manual (verified via logging that #onDetach is called at the same
points that #destroy would have been called)
Bug: 205609837

Change-Id: I32b5df3306616a75ffe009c81b8966689fd11dda
2021-11-24 18:00:55 +00:00
Caitlin Cassidy
098e210a51 [Status Bar Refactor] 2/3: Remove
HeadsUpAppearanceController#readFrom(oldController).

Instead, the old values are read from the parent controllers. This CL
plus the next CL will allow us to not keep track of old
HeadsUpAppearanceController instances; instead, each
HeadsUpAppearanceController knows how to correctly set itself up and
tear itself down without needing the old controller.

Bug: 205609837
Test: atest SystemUITests
Test: manual (verified via logging that new controller gets old values)
Change-Id: I15adc79982b5b7ca264e2bb45e92ba48b9844c1a
2021-11-24 18:00:54 +00:00
Caitlin Cassidy
7f4af891ac [Status Bar Refactor] 1/3: Have HeadsUpAppearanceController be created by
dagger and use it in CollapsedStatusBarFragment instead of using
StatusBar.java.

Note that HUAC can't be injected to the fragment directly because that
creates a dependency cycle: PhoneStatusBarView is injected into HUAC,
which is injected into the fragment, which provides PhoneStatusBarView.

Test: manual (verified HUAC callbacks still trigger, verified fragment
is still getting the correct value for shouldHeadsUpBeVisible)
Test: atest SystemUITests
Test: new unit tests
Bug: 205609837
Bug: 204792508

Change-Id: I33aa80f4866c9561302430cf9206cc96802896cc
2021-11-24 18:00:54 +00:00
Jeff DeCew
bdca451bbb Merge "Reduce hardware render sizes for ExpandableNotificationRow." into sc-v2-dev 2021-11-24 17:57:59 +00:00
Beth Thibodeau
19c76901bb [DO NOT MERGE] Remove taps option from screen record dialog
Removing option because the touch points currently cannot be recorded
due to changes in how the cursor is drawn

Bug: 205709231
Test: manual
Test: atest RecordingServiceTest
Change-Id: If544d534be16f2a2a21129f1f014c5c98aa55885
2021-11-24 16:37:22 +00:00
Riddle Hsu
481929130e Merge "Do not skip traversal of IME container when display is frozen" into sc-v2-dev 2021-11-24 16:04:44 +00:00
Issei Suzuki
85aacccba1 Merge "Clean up windows which stuck in animatingExit state." into sc-v2-dev 2021-11-24 15:00:09 +00:00
Riddle Hsu
a8a067f484 Do not skip traversal of IME container when display is frozen
Otherwise WindowState#mOrientationChanging IME window may be skipped
to be updated from forAllWindows. And even when window frozen timeout
is reached (DisplayContent#onWindowFreezeTimeout), if forAllWindows
still skips IME, the device will look like frozen forever. Unless
on/off screen to force canceling the state.

And since CL [1] has handled the case of IME with fixed rotation,
the restriction added in CLs [2],[3] can be removed. That eliminates
frozen for normal rotation animation.

[1]: I0b036594161898f9df6ad71f0adb5fe93880161a
[2]: Idfdf129adbfbee6634d8a27aa78da1f631bd213b
[3]: Idef12249806e4a6860b8cd190df4f0f8cad13c19

Bug: 207059118
Test: 1. Launch a portrait app which keeps showing IME.
      2. Return to home be home key or swiping.
      3. Hold the device in landscape.
      4. Launch the app again.
      The app should show in landscape directly and IME will
      fade-in when it is drawn in landscape.
Change-Id: Iceaedbfdb75e68e9f7fb8fd4a1bf8f35a779797e
2021-11-24 20:36:36 +08:00
Ming-Shin Lu
6ba7432173 Revert hide logic in ImeInsetsSourceConsumer#setControl
CL[1] using isRequestedVisibleAwaitingControl() in
ImeInsetsSourceconsumer#setControl to hide IME surface when it returned
false without waiting control or requesting visible to deal with the
unexpecting hide IME cases during the testing.

However, when calling IMM#toggleSoftInput to reqest showing keyboard
on the dialog implicitly that will set requrested visible on both the
caller window and the dialog window, since toggleSoftInput didn't
explicit set the target window but just using the caller window as
requester implicitly.

It causes a regression that can't hide the IME surface when dismissing
the dialog to back to the caller window that the IME insets source
control is null but isRequestedVisibleAwaitingControl still returned
true because isRequestedVisible has been set true for the
toggerSoftInput caller window.

Revert logic in setControl to use mIsRequestedVisibleAwaitingControl
in case the IME surface won't be removed when backing to the implicit
caller window of toggleSoftInput.

[1]: I3071af14bf78e23f9526d6a9c138ab6ae2e0e339

Bug: 207092186
Bug: 204524304

Test: manual
Test: atest CtsInputMethodTestCases
Test: atest WindowInsetsAnimationControllerTests
Change-Id: Ic5265a6c3f2eba77d43832d23309998bf3cb1671
2021-11-24 12:12:13 +00:00
Issei Suzuki
bdc4e842cf Clean up windows which stuck in animatingExit state.
WM delays to destroy window surface if the window is running an exit
animation, and clean it up after the animation finishes. In case the
clean up process was not triggered, we do it before starting an app
transition.

Note that this is a safe guard for potential bugs. The surface shall
be destroyed as soon as an animation finishes, so the clean up should
have been done before an app transition starts.

Bug: 205335975
Test: atest AppTransitionControllerTest
Change-Id: I9c37ab9ebc57ef48827df25ecc52bf09101ad419
2021-11-24 12:54:13 +01:00
Selim Cinek
fdbed18c79 Merge "Made usages of animate().setListener() call safer" into sc-v2-dev 2021-11-24 10:30:15 +00:00
Charles Chen
0dcd4ddcb2 Merge "[RESTRICT AUTOMERGE] Send WindowContext config only when Display is active" into sc-v2-dev 2021-11-24 09:52:47 +00:00
Riddle Hsu
3549a251fc Do not skip restoring rotation lock when returning to home
Since live-tile is enabled, the foreground app is still the original
activity, the display rotation doesn't change by the recents app
activity. So the condition added in commit 95cb52a doesn't need to
be enabled.

Bug: 205979005
Test: 1. Disable auto-rotation and home rotation.
      2. Launch an activity in portrait.
      3. Rotate the device to landscape and press rotation button.
      4. Enter overview (recents).
      5. Return to the application (keep in landscape).
      6. Return to home and launch the app again (restore to portrait).
Change-Id: Iccf87b2d66d57911cd49f2ea9080a71a85801e4c
2021-11-24 17:31:24 +08:00
Charles Chen
20fddbc609 [RESTRICT AUTOMERGE] Send WindowContext config only when Display is active
WMS may provide stale configuration value when secondary display
is off. This CL makes WindowContext only receives Configuration updates
if the display of associated WindowContainer is not suspended.

Test: atest WindowContextListenerControllerTests
Test: atest InputMethodMenuControllerTest
Bug: 198965093

Change-Id: I3c2871823f1b104f89bb801f3bf5ecef01966bb3
2021-11-24 08:31:04 +00:00
Chris Li
2ce49dc654 Check okToAnimate for TaskFragment change transition
1. Similar to ActivityRecord#setVisibility, check okToAnimate before
preparing transition.
2. Similar to ag/16063813, disable transition animation when screen
blocker is not removed.

Bug: 204035526
Test: atest WmTests:TaskFragmentTest
      #testNotOkToAnimate_doNotStartChangeTransition
Change-Id: I55486b456e4fd0a93b74faedcdc8a6f01bcc3737
2021-11-24 15:46:10 +08:00
Winson Chung
acb755ce9e Fix issue with alphas not being applied to the same view on unlock
- It's possible for the nav bar configuration to change between locking
  and unlocking the phone, which will prevent the alpha from being
  restored on the bar layout correctly. This change updates the alpha
  of both vertical/horizontal layouts in NavBarView since they should
  always be in sync.

Bug: 206733387
Test: atest SystemUITests
Test: Lock screen in landscape app, turn screen on and unlock


Change-Id: I265d04e6e2192f2bb57b1f8d77390664236427fc
(cherry picked from commit 9b53d2ecab)
2021-11-24 05:35:44 +00:00
Winson Chung
9e4c614404 Merge "Fix issue with alphas not being applied to the same view on unlock" into sc-v2-dev 2021-11-24 05:32:31 +00:00
Winson Chung
9b53d2ecab Fix issue with alphas not being applied to the same view on unlock
- It's possible for the nav bar configuration to change between locking
  and unlocking the phone, which will prevent the alpha from being
  restored on the bar layout correctly. This change updates the alpha
  of both vertical/horizontal layouts in NavBarView since they should
  always be in sync.

Bug: 206733387
Test: atest SystemUITests
Test: Lock screen in landscape app, turn screen on and unlock


Change-Id: I265d04e6e2192f2bb57b1f8d77390664236427fc
2021-11-24 05:32:16 +00:00
Garfield Tan
c35cf07c60 Merge "Guard absent SplitScreen in PipTaskOrganizer" into sc-v2-dev 2021-11-24 03:43:02 +00:00
Tony Huang
c06aeea5fd Merge "Fix pip surface under divider" into sc-v2-dev 2021-11-24 03:09:59 +00:00
Jerry Chang
21f00a141a Merge "Revert "Support to transfer freeform task into split screen"" into sc-v2-dev 2021-11-24 02:26:23 +00:00
Louis Chang
ab529ab901 Merge "RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity" into sc-v2-dev 2021-11-24 01:33:02 +00:00
Louis Chang
fcfd7e1a79 Merge "Checking Settings config for quick pick-up gesture" into sc-v2-dev 2021-11-24 01:31:47 +00:00
Wei Sheng Shih
26fffc68d9 Merge "Fade out branding image with icon while exit splash screen." into sc-v2-dev 2021-11-24 01:15:45 +00:00
TreeHugger Robot
d0d3b02874 Merge "Camera: Try to recover from failing stopRepeating requests" into sc-v2-dev 2021-11-24 00:40:57 +00:00
Vinit Nayak
f730a2c592 Merge "Revert "Extract assistant logic from NavigationBar to share with Taskbar"" into sc-v2-dev 2021-11-23 23:06:20 +00:00
Vishnu Nair
d57f990567 Merge "WM: Use task bounds for modal window touchable region" into sc-v2-dev 2021-11-23 22:27:10 +00:00
Beverly Tai
c546f6e01a Merge "Use SystemUI config to easily adjust udfps haptics" into sc-v2-dev 2021-11-23 21:33:08 +00:00
Garfield Tan
2daf28f449 Guard absent SplitScreen in PipTaskOrganizer
Current code assumes the presence of SplitScreen, so it crashes if
SplitScreen doesn't exist.

Bug: 207495281
Test: Transition in and out of PIP still works on phones.
Test: Transition from PIP to split screen on phones.
Change-Id: I6f2f05a1237c9e64f1df95b05347a1affa9b5a27
2021-11-23 13:25:48 -08:00
Vinit Nayak
2511ebcc40 Revert "Extract assistant logic from NavigationBar to share with Taskbar"
This reverts commit 33a7ce8427.

Reason for revert: test failure, b/207427578

Change-Id: I211a344659036248388e587c7cdf5082b8bdbf9d
2021-11-23 10:56:24 -08:00
Beverly
48df8c9b68 Use SystemUI config to easily adjust udfps haptics
take #1b

In the config file, it's easy to adjust (per device):
 * Using low_tick (default) vs tick
 * Customize tick intensity
 * Customize delay between ticks

Test: manual
Bug: 202867177
Bug: 207123411
Change-Id: I57dedc6480b83b7ea03fcff30e551cd900fead92
2021-11-23 18:22:51 +00:00
Jeff DeCew
627b68beea Reduce hardware render sizes for ExpandableNotificationRow.
Do not create a hardware layer for entire notifications during shade expand/collapse; instead just layer the elements with actually overlapping rendering.

Bug: 191969252
Test: lots of shade expansion; use of perfetto to validate phone reaches rendering deadlines more often.
Merged-In: I86b626fb61c5844b968be33d982e418bf8938de8
Change-Id: I86b626fb61c5844b968be33d982e418bf8938de8
2021-11-23 13:13:03 -05:00
Jerry Chang
1b8e88840a Revert "Support to transfer freeform task into split screen"
This reverts commit bd8b345337.

Reason for revert: b/207034379

Change-Id: I48d9b5289dd52d72f925cb155f38c5a1ed493d49
2021-11-23 17:50:36 +00:00
TreeHugger Robot
35185d54b4 Merge "Wakeup the screen for full screen intents" into sc-v2-dev 2021-11-23 17:33:13 +00:00
Fabian Kozynski
f322436d6a Merge "Fix privacy dialog padding" into sc-v2-dev 2021-11-23 16:49:03 +00:00
Fabian Kozynski
5150828ce3 Merge changes If6a02209,Ied39acb0 into sc-v2-dev
* changes:
  Apply dialog style to User switcher dialog.
  Create style for AlertDialog in SystemUI
2021-11-23 16:46:15 +00:00
Beverly
e1a74223bb Wakeup the screen for full screen intents
Apps shouldn't need to have the FLAG_TURN_SCREEN_ON
layout parameter on their full screen intent activity
in order for the full screen intent to show from AOD.

Test: atest StatusBarNotificationActivityStarterTest
Test: manual
Fixes: 202833729
Change-Id: If4a5d3dbd49367ddd7dc2895b83471d52fcfa47a
Merged-In: If4a5d3dbd49367ddd7dc2895b83471d52fcfa47a
2021-11-23 16:29:57 +00:00
Jonathan Miranda
1b3f782d94 Merge "Annotate TaskKey#baseIntent as @NonNull to match platform" into sc-v2-dev 2021-11-23 16:29:10 +00:00