Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
852,754 Commits 3 Branches 0 Tags
ad758fca1f3ef94de03a65490ab011bc7ac49e24
Commit Graph

7398 Commits

Author SHA1 Message Date
Massimo Carli
70de08a63b Merge "Apply rounded corners to startWindow" into tm-qpr-dev am: 6db1ce2740 am: 60c604f7de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20222491

Change-Id: Ib8ff69b9233c311e0da8b194271fb11a79931c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 10:22:14 +00:00
Massimo Carli
60c604f7de Merge "Apply rounded corners to startWindow" into tm-qpr-dev am: 6db1ce2740 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20222491

Change-Id: I3ad8e6719a64c63ac911f66debf50bdf91ae045c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 09:47:51 +00:00
Massimo Carli
6db1ce2740 Merge "Apply rounded corners to startWindow" into tm-qpr-dev 2022-12-05 09:17:16 +00:00
Bill Yi
650cef136b Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-05 04:49:38 +00:00
Jerry Chang
f371b68af1 Merge "Consolidate entering split screen behavior" into tm-qpr-dev am: b60de628ba am: 4d9b900e56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20575007

Change-Id: I30f6b85970448c39ac75dd4c46dbc8f1a9d0f85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 04:20:51 +00:00
Jerry Chang
4d9b900e56 Merge "Consolidate entering split screen behavior" into tm-qpr-dev am: b60de628ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20575007

Change-Id: Ia5a072ddd66444cd464b1a7b3451facba9c69619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 03:47:52 +00:00
Jerry Chang
b60de628ba Merge "Consolidate entering split screen behavior" into tm-qpr-dev 2022-12-05 03:30:34 +00:00
Wei Sheng Shih
941c58dee9 Merge "Extract the drawing logic from StartingSurfaceDrawer." 2022-12-05 03:11:23 +00:00
Bill Yi
cf1bc1465c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib05e6f6989b850dba46b9dfc5936b7d097e99883
 2022-12-03 17:58:42 -08:00
Bill Yi
f4eb04688b Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-03 19:04:41 +00:00
Massimo Carli
f4976b84a3 Apply rounded corners to startWindow 
This removes the corner animation flickering happening when
starting a letterboxed app after a configuration change
(eg. Dark/Light mode)

Test: Manual
Fixes: 234107097

Change-Id: Iad9f4aaeb8edeeb56b0c88d7d0239843cd66a8f9
 2022-12-03 13:25:16 +00:00
Chris Li
9a9d73ba08 Merge "Fix activity relaunch issue with ActivityEmbedding" into tm-qpr-dev am: bac0f96f1e am: 7a40b19c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20585997

Change-Id: Id10da5de8ec911a8fd8d91b6fb5bdab0b383ed3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 12:06:53 +00:00
Chris Li
7a40b19c98 Merge "Fix activity relaunch issue with ActivityEmbedding" into tm-qpr-dev am: bac0f96f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20585997

Change-Id: I50c94e90f6540c3d581cfd8233696a49d612df70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 11:33:42 +00:00
Chris Li
bac0f96f1e Merge "Fix activity relaunch issue with ActivityEmbedding" into tm-qpr-dev 2022-12-03 10:45:00 +00:00
Chris Li
70dfdac013 Merge "Provide startBounds for closing container with legacy transition" into tm-qpr-dev am: 1bf14bee43 am: e681471300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20543368

Change-Id: I250875900e8a527512309d9450782fe8f4cf88fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 03:46:53 +00:00
Chris Li
e681471300 Merge "Provide startBounds for closing container with legacy transition" into tm-qpr-dev am: 1bf14bee43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20543368

Change-Id: I748c5be3bd210ed9c52cdf282dbebf2c9fd8fccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 03:11:14 +00:00
Chris Li
8f22204338 Fix activity relaunch issue with ActivityEmbedding 
When Activity relaunched, the SplitController will receive
onActivityDestroyed and onActivityCreated.

Before, we always remove all the reference onActivityDestroyed, which
can accidentally remove split pair finish relationship. Now we only
do that when the activity is actually finishing.

Also do the following to make sure there is no other regression:
1. Replace the stored activity reference with activity token, so it
   won't be changed when activity relaunched.
2. Update #getContainerWithActivity to first check pending appeared
   activity to make sure it returns the correct container before the
   server update.

Bug: 260301635
Test: atest WMJetpackUnitTests:SplitControllerTest
Test: atest WMJetpackUnitTests:TaskFragmentContainerTest
Change-Id: Ife6de66d22e336bb872a9fccbdf03562fe6e089d
 2022-12-03 02:39:56 +00:00
Chris Li
1bf14bee43 Merge "Provide startBounds for closing container with legacy transition" into tm-qpr-dev 2022-12-03 02:26:52 +00:00
Mady Mellor
8a70e9f2d5 Merge "Ensure the manage menu is closed when the stack collapses" into tm-qpr-dev am: 41d68f0cbd am: e42c4e545f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20611801

Change-Id: I9807d7706a2471515273a743122784ab5650cff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 23:46:15 +00:00
Mady Mellor
e42c4e545f Merge "Ensure the manage menu is closed when the stack collapses" into tm-qpr-dev am: 41d68f0cbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20611801

Change-Id: I2044c09ac03d370b2b61e50716df1be9c336450f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 23:42:38 +00:00
Mady Mellor
41d68f0cbd Merge "Ensure the manage menu is closed when the stack collapses" into tm-qpr-dev 2022-12-02 23:34:49 +00:00
TreeHugger Robot
ae4bee7359 Merge "Create window decors for leaf tasks & skip non-leafs" into tm-qpr-dev am: 5c3b3d0ac5 am: 8fd663fbe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20583356

Change-Id: Ib4ef611aec65a483ecbf6a3698629777a61e27f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 21:54:20 +00:00
TreeHugger Robot
8fd663fbe7 Merge "Create window decors for leaf tasks & skip non-leafs" into tm-qpr-dev am: 5c3b3d0ac5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20583356

Change-Id: I9111354a6df7edb58e1a3cba0e05b46103149213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 21:22:00 +00:00
TreeHugger Robot
5c3b3d0ac5 Merge "Create window decors for leaf tasks & skip non-leafs" into tm-qpr-dev 2022-12-02 20:59:23 +00:00
Merissa Mitchell
45f061a432 Merge "Set caption to full width in WindowDecoration if no width is defined." into tm-qpr-dev am: 88490035c5 am: 2b33756547 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20600974

Change-Id: I8b7735c23169dafb4f332e23d61294d4e3ed2f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 18:24:03 +00:00
Merissa Mitchell
2b33756547 Merge "Set caption to full width in WindowDecoration if no width is defined." into tm-qpr-dev am: 88490035c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20600974

Change-Id: I36d97c53fc98d4e23d10bdc178f9e138a5dcee12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 18:21:19 +00:00
Mateusz Cicheński
028b1d41cf Merge "Don't move PiP towards a corner after user manually moved it." into tm-qpr-dev am: 77f5aecbb2 am: deaf5a19d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20592536

Change-Id: I362d3a67c63b6405d4aa7e0461e7917924bc2a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 18:20:41 +00:00
Mateusz Cicheński
deaf5a19d0 Merge "Don't move PiP towards a corner after user manually moved it." into tm-qpr-dev am: 77f5aecbb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20592536

Change-Id: Ica5cd46bdd3d4f836ef454264f887064dcdb7a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 18:18:33 +00:00
Merissa Mitchell
88490035c5 Merge "Set caption to full width in WindowDecoration if no width is defined." into tm-qpr-dev 2022-12-02 18:09:31 +00:00
Mateusz Cicheński
77f5aecbb2 Merge "Don't move PiP towards a corner after user manually moved it." into tm-qpr-dev 2022-12-02 17:51:48 +00:00
TreeHugger Robot
fcb07fbd7a Merge "Only collapse stack on shade state change" into tm-qpr-dev am: 5932f31d58 am: 9df0ec60d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20611534

Change-Id: Ic3889400cb32782fc03456e8a2be645d5d7884c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 13:05:02 +00:00
TreeHugger Robot
9df0ec60d4 Merge "Only collapse stack on shade state change" into tm-qpr-dev am: 5932f31d58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20611534

Change-Id: I83ee47e671daf90cfd560cf07d1c082843c39c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 13:03:52 +00:00
TreeHugger Robot
5932f31d58 Merge "Only collapse stack on shade state change" into tm-qpr-dev 2022-12-02 12:30:58 +00:00
wilsonshih
f8801f5069 Extract the drawing logic from StartingSurfaceDrawer. 
Prepare for windowless starting surface. Attemp to decouple the drawing
methods from window related handling.
Move most of snapshot drawing method together to a utility class
SnapshotDrawerUtils, so SystemBarBackgroundPainter now can shared for
shell and core.

Bug: 131727607
Bug: 257857570
Test: atest SnapshotDrawerUtilsTest StartingSurfaceDrawerTests
Test: hot launch an app, and verify snapshot starting window show up
without issue.
Test: cold launch app, verify icon style splash screen can show.

Change-Id: I4d2c04e41d375cf6c8711a60977b8f24dddd41c0
 2022-12-02 12:11:30 +00:00
Chris Li
62f0464d29 Provide startBounds for closing container with legacy transition 
Before, we only provide startBounds when the animation target is
MODE_CHANGING, with which we won't know the start bounds for target that
is closing while resizing.

Now, we provide startBounds for all targets, so that we can use it to
provide seamless animation when the target is closing while resizing.

Also make sure the closing container's surface is in the start bounds
before the animation starts to avoid any flicker.

Bug: 241043533
Test: Verify with switching between split and stack.
Change-Id: I4d8e1ee44d418249dcb434425c7ab3d63a429bad
 2022-12-02 05:01:02 +00:00
Jerry Chang
e1dcbe2e4f Merge "Consolidate leaving split screen to pip mode behavior" into tm-qpr-dev am: 86d092aa7e am: 03df1890ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20586039

Change-Id: I3d441266b38ae3168533b03679e8666ea82c0706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 03:43:15 +00:00
Maryam Dehaini
ea4e24dd0f Merge "Rename WindowDecorModelView to reflect purposes" into tm-qpr-dev am: 9fcbcb0762 am: 08752d9141 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20534843

Change-Id: Ie1d02ca61c52914b28cf0f5171fcc02407eaa161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 03:13:34 +00:00
Jerry Chang
03df1890ec Merge "Consolidate leaving split screen to pip mode behavior" into tm-qpr-dev am: 86d092aa7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20586039

Change-Id: I6b789195a3125ebf6e40ad512c5baa8de6c707ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 02:31:05 +00:00
Mateusz Cicheński
265ee855b6 Merge "Fix the regression of PiP position in fixed rotation" into tm-qpr-dev am: d7f99f6c63 am: cad25dc19f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20587097

Change-Id: I47b7e0c74bff72069038126b19a0281e0e7c604f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 02:29:55 +00:00
TreeHugger Robot
c235ae8bd7 Merge "Don't insets the divider bar with task bar when IME showing" into tm-qpr-dev am: cfe5853cac am: 605cfe8bc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20560072

Change-Id: If4805276874ad9232819e3e4fd7dde5e0efa7807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 02:05:36 +00:00
Tony Huang
88732f4335 Merge "Fix surface offset issue when enter split from recents" into tm-qpr-dev am: 09b0485783 am: a53c7dddba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20514524

Change-Id: I24d3459e3df98fb9643175725ced506617502b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 02:02:20 +00:00
Jerry Chang
86d092aa7e Merge "Consolidate leaving split screen to pip mode behavior" into tm-qpr-dev 2022-12-02 01:58:06 +00:00
TreeHugger Robot
921aac6f4d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-02 00:50:40 +00:00
Mateusz Cicheński
76d2b200ae Don't move PiP towards a corner after user manually moved it. 
With keep clear areas flag on, PiP will gravitate towards one of the
bottom corners of the screen if possible. However, once a user moves
PiP manually, it will only continue to avoid occluding keep clear
areas, but no longer move downwards. This also happens if user resized
the window.

This can be disabled by turning the newly introduced sysprop flag.

Bug: 258529269
Test: manually

Change-Id: Ieaa292c54762d5cd005bcdf7eab48d6082e5c3a9
 2022-12-01 22:51:44 +00:00
Maryam Dehaini
08752d9141 Merge "Rename WindowDecorModelView to reflect purposes" into tm-qpr-dev am: 9fcbcb0762 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20534843

Change-Id: Iae39084cfb0cbd5102d116e5df6f28bb96511871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 22:01:45 +00:00
Maryam Dehaini
9fcbcb0762 Merge "Rename WindowDecorModelView to reflect purposes" into tm-qpr-dev 2022-12-01 21:17:36 +00:00
Merissa Tan
8cdd2cd068 Set caption to full width in WindowDecoration if no width is defined. 
This CL sets the caption width to match the task bounds width if no
fixed width is defined.

Bug: None
Test: atest WMShellUnitTests:WindowDecorationTests
Change-Id: I033d0564f21974f5fdc982fba823ae42bdd9f37c
 2022-12-01 11:50:54 -08:00
Mady Mellor
a4aed0261f Ensure the manage menu is closed when the stack collapses 
Bug: 255908995
Test: manual - expand the bubble stack, open the manage menu, turn
               off the screen
             - turn on the screen and unlock
             => verify bubbles are collapsed
Change-Id: I9ae1ff43a4c64ce46e4ad8fcbefc93e79c9d7afe
 2022-12-01 11:26:44 -08:00
Ats Jenk
091126fc7a Only collapse stack on shade state change 
Fixes an issue with bubble not being expanded when notification was set
to be expanded from lock screen.

Setting a notification to bubble from the notification action will add
it as a new entry in BubbleData. And that bubble will be set to
auto-expand.

When a device is locked, BubbleController receives a status bar state
change with isShade=false.

When a device is unlocked, BubbleController can receive duplicate status
bar state changes with isShade=false and will finally receive an update
with isShade=true. The isShade=true indicates device is unlocked.

Ensure that multiple duplicate status bar state changes to false do not
try to re-collapse the stack. As this would clear the expanded state for
bubbles that were updated while device was locked.

Bug: 260652751
Test: atest BubblesTest
Test: manual:
  1. have a notification that is not a bubble
  2. have pattern lock set and lock device
  3. mark notification to be a bubble from lock screen
  4. unlock device
  5. observe bubble is added and expanded
  6. lock device and unlock device again
  7. observe stack is now collapsed
Change-Id: Ie0fdbbb3cb95c0720a00e7e25deaeb438cc51df3
 2022-12-01 11:07:07 -08:00
Mateusz Cicheński
cad25dc19f Merge "Fix the regression of PiP position in fixed rotation" into tm-qpr-dev am: d7f99f6c63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20587097

Change-Id: I9c57b981e69d074ae455d9470f1e94fd6d6c09f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 22:09:49 +00:00