Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
706,621 Commits 3 Branches 0 Tags
f19b1dfd60bda4bd64df233bfd76417df7b8ca85
Commit Graph

2506 Commits

Author SHA1 Message Date
Winson Chung
0a5e07d0c7 Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev am: fa8944c1a2 am: 39326cd053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15443607

Change-Id: I01a64f21e47c937f2b4128df057f5e66458c9aff
 2021-08-03 18:37:24 +00:00
Winson Chung
39326cd053 Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev am: fa8944c1a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15443607

Change-Id: Ieff894252cffc4df4cd5110a16ccae614731d174
 2021-08-03 18:25:27 +00:00
Winson Chung
fa8944c1a2 Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev 2021-08-03 18:08:42 +00:00
Bill Lin
72d99a9351 Merge "Integrate SurfaceControl jank monitor for PIP transition" into sc-v2-dev am: fbb39c14c3 am: 6826296fa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15222486

Change-Id: I9f989c1753474a825694bb742b138abb0bbdc97e
 2021-08-03 07:31:30 +00:00
Bill Lin
6826296fa1 Merge "Integrate SurfaceControl jank monitor for PIP transition" into sc-v2-dev am: fbb39c14c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15222486

Change-Id: I2f685c4828dc75b1996d95a7c9c390f155da4d9d
 2021-08-03 07:19:10 +00:00
Bill Lin
d075ec0ab6 Integrate SurfaceControl jank monitor for PIP transition 
- onPipTransitionStarted()
Use InteractionJankMonitor.Builder to setup with PIP task's
leash and dispatch to begin() with CUJ_PIP_TRANSITION

- onPipTransitionFinishedOrCanceled()
End CUJ_PIP_TRANSITION when the transition either finished
or canceled.

Test: atest WMShellUnitTests
Test: atest SystemUITests
Test: record systrace through perfetto.dev
Bug: 169221267
Change-Id: I9f94ddde7f0dd48d50d50313ba517b919f0d8d25
 2021-08-03 03:41:12 +00:00
Mady Mellor
6980806291 Merge changes I500c566e,I4b5ffc26 into sc-v2-dev am: 81ce27f854 am: 3d1ed7a4f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15440807

Change-Id: I1dc04db9282adeb658a672d979426f1a2748521e
 2021-08-03 01:22:29 +00:00
Mady Mellor
3d1ed7a4f8 Merge changes I500c566e,I4b5ffc26 into sc-v2-dev am: 81ce27f854 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15440807

Change-Id: I16d4d764895a3d2c3f8725e0949559398b164011
 2021-08-03 01:21:53 +00:00
Mady Mellor
81ce27f854 Merge changes I500c566e,I4b5ffc26 into sc-v2-dev 
* changes:
  Update the flyout width to be smaller on large screens
  Updates to manage button based on latest mocks
 2021-08-03 01:07:12 +00:00
Winson Chung
fff8e21975 Fix one more import for ContextThemeWrapper. 
Bug: 195028385
Test: can build now.
Change-Id: Ie14285b614318a99098f4457d7564a25724cde6b
 2021-08-02 14:19:54 -07:00
Mady Mellor
3289ae9f64 Update the flyout width to be smaller on large screens 
On phone we use 60% of the screen which is huge on
tablet. This change uses 30% of the screen for the
flyout on large screens & enforces a minimum for
that value.

Test: manual - get a long message in a bubble on a
               tablet, it should have similar width
               as it does on phone.
Bug: 186776550
Change-Id: I500c566edd9941dc2bd149692eaf95c6e6f4aa61
 2021-08-02 14:03:01 -07:00
Mady Mellor
ba35a77513 Updates to manage button based on latest mocks 
- manage button should be inset from the expanded view edge
  but the menu should be flush with expanded view edge.
- button size is smaller (36dp instead of 40dp)
- more padding (16dp above / below on both tablet & phone)
- diff colour N1-800 instead of N1-900

Test: visual 1 - expand a bubble and look at 'manage' button
             2 - tap on the button and look at the menu
             3 - do 1 & 2 on tablet & in RTL & on phone
                 landscape
Bug: 183658858
Change-Id: I4b5ffc26602b72ee28d26476fc222df3e2e1e80b
 2021-08-02 12:20:08 -07:00
Hongwei Wang
fa325c750d Merge "Pass AppOps result for PiP in RemoteAnimationTarget" into sc-v2-dev am: 4eaeabe8bd am: 7abcb9bce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15391157

Change-Id: I1d63fc358e69cf2cf0f2745216226a8447c2a5ed
 2021-07-31 03:44:39 +00:00
Hongwei Wang
7abcb9bce8 Merge "Pass AppOps result for PiP in RemoteAnimationTarget" into sc-v2-dev am: 4eaeabe8bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15391157

Change-Id: I3e5f3f7beab30482a3e759fda7ed479ee24d3f48
 2021-07-31 03:28:56 +00:00
Hongwei Wang
4eaeabe8bd Merge "Pass AppOps result for PiP in RemoteAnimationTarget" into sc-v2-dev 2021-07-31 03:14:11 +00:00
Hongwei Wang
c9a7c24e3e Pass AppOps result for PiP in RemoteAnimationTarget 
This result will be used by Launcher when deciding if we should start
the auto-enter-pip transition.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/c9raN4jiaNqbiV7DF4YTJ6
Bug: 194272108
Test: try auto-enter-pip with permission disabled
Change-Id: Iea3a45fd68b54d74e7d5da91b63684c206a0132e
 2021-07-30 15:57:39 -07:00
TreeHugger Robot
fdd6b8b6ec Merge "Fix broken launcher build to use the right import for ContextThemeWrapper." into sc-v2-dev am: 93be1fb110 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15419006

Change-Id: Ia2d43526e2d8e41f569f4b40a13eed51e8750f12
 2021-07-30 18:44:33 +00:00
TreeHugger Robot
93be1fb110 Merge "Fix broken launcher build to use the right import for ContextThemeWrapper." into sc-v2-dev 2021-07-30 18:32:37 +00:00
Becky Qiu
2ee44db719 Fix broken launcher build to use the right import for ContextThemeWrapper. 
Bug: 195028385
Test: can build now.
Change-Id: Ia36b77e3274191efa28c87cc0b2604a66906b604
Merged-In: Ia36b77e3274191efa28c87cc0b2604a66906b604
 2021-07-30 17:32:35 +00:00
Mady Mellor
66b936d926 Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev am: 57a3e448f6 am: efc97e3688 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15421004

Change-Id: I2b90171df59cdbf4514bc4e609f09d98bbabe588
 2021-07-30 17:16:33 +00:00
Mady Mellor
efc97e3688 Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev am: 57a3e448f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15421004

Change-Id: If1e174c0584c849ca1aa2c758d40fa560c123312
 2021-07-30 17:03:35 +00:00
Mady Mellor
57a3e448f6 Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev 
* changes:
  Remove BUBBLE_EXPANDED state from ScrimController
  Manage menu changes
 2021-07-30 16:47:43 +00:00
Nataniel Borges
de3ab6daab [DO NOT MERGE] Full - Compatibilize winscope with master am: 3dab1eaeec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403074

Change-Id: If1bc500776c7a411de294e66d220cf29a6302d91
 2021-07-30 14:54:34 +00:00
TreeHugger Robot
0b7f506aa9 Merge "[DO NOT MERGE] Full - Compatibilize winscope with master" into sc-v2-dev 2021-07-30 14:47:23 +00:00
Jerry Chang
5e2ec78c59 Merge "Fix the content of the bottom split being truncated while showing IME" into sc-v2-dev am: 581d500ee6 am: f3204bd10f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287617

Change-Id: I1b651ce81256b3ed46d0373567fe3b4fe31fb61e
 2021-07-30 12:35:45 +00:00
Jerry Chang
f3204bd10f Merge "Fix the content of the bottom split being truncated while showing IME" into sc-v2-dev am: 581d500ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287617

Change-Id: Idaa8454bdfe26cc0fd75e2fe77816c633c12560c
 2021-07-30 12:21:01 +00:00
Jerry Chang
581d500ee6 Merge "Fix the content of the bottom split being truncated while showing IME" into sc-v2-dev 2021-07-30 12:17:48 +00:00
Jerry Chang
da44526b9b Fix the content of the bottom split being truncated while showing IME 
Freeze the configuration size when shifting split layout so that client
apps can calculate insets properly and won't get config or relaunch.

Fix: 192410210
Test: atest WMShellUnitTests
Test: verified the content of the bottom split won't be truncated when
adjusting split layout with IME and won't get relaunch.

Change-Id: I38da063ffacc19b691c14b74d118949293414492
 2021-07-30 16:00:57 +08:00
Evan Rosky
f1e660fa10 Merge "Add some more transition filter properties" into sc-v2-dev am: cc3b202fab am: 84b5bb952e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365409

Change-Id: I483dd032e7087f31cc6cde780bad5760c3fdb29c
 2021-07-30 02:04:42 +00:00
Evan Rosky
84b5bb952e Merge "Add some more transition filter properties" into sc-v2-dev am: cc3b202fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365409

Change-Id: I09743406998378e1f7974f248804a8977a6f74da
 2021-07-30 01:54:54 +00:00
Evan Rosky
cc3b202fab Merge "Add some more transition filter properties" into sc-v2-dev 2021-07-30 01:41:51 +00:00
Mady Mellor
a324c0cfa0 Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev am: 0f7c6bbd4e am: 9fb1499dba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413213

Change-Id: I2628dcb2704dfcf0834f10237682256b84aca6d6
 2021-07-29 23:04:43 +00:00
Mady Mellor
9fb1499dba Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev am: 0f7c6bbd4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413213

Change-Id: I2f15459b3155484eeef16ddc126055ba4c3ed29e
 2021-07-29 22:46:36 +00:00
Mady Mellor
0f7c6bbd4e Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev 2021-07-29 22:36:54 +00:00
Evan Rosky
adb7e53532 Add some more transition filter properties 
These are needed for keyguard transitions. The ones added are:

A NOT requirement which will reject transitions with a matching
change.

The ability to match containers that aren't independent.

Checks for global transition flags as well as individual change
flags.

Match only if container is a task.

Bug: 191799478
Test: atest ShellTransitionTests
Change-Id: I963c6c91cdfc0b71a75ba9656261bb0e237f11f1
 2021-07-29 15:05:24 -07:00
Mady Mellor
0974348d31 Manage menu changes 
- padding & size updates
- scrim between bubble expanded view and the manage menu

Test: manual - expand a bubble, tap on the manage menu, it
      should animate in with a scrim behind it.
Bug: 183658858
Change-Id: I3053cdb61497434a0aeb49eb33f87a3dafb364d7
 2021-07-29 12:46:19 -07:00
Mady Mellor
31075face6 Don't use SysUI ScrimController for bubbles 
Changes for the manage menu will require a scrim between the expanded
view and the manage menu.

I think it makes sense to just have BubbleStackView control the
scrims entirely rather than have 1 in ScrimController and 1 in
BubbleStackView (or 2 scrims in ScrimController).

Test: manual - expand a bubble, there's a scrim behind it, collapse
      the bubble, the scrim is gone.
Bug: 183658858
Change-Id: I537c910b959ab938eb1d116d9dc0c801006dbb79
 2021-07-29 12:46:10 -07:00
Jason Chang
47abd6c2b2 Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: I1cba57040d1b3d78a096f8336359fd0e3d64e52f
 2021-07-29 19:06:03 +00:00
Vadim Caen
44823207a4 Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68fd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175437

Change-Id: I99c182334636b3c9ce7bdc24b910d1b99bddb93a
 2021-07-29 19:02:27 +00:00
Becky Qiu
f0bdaf648b Fix broken launcher build to use the right import for ContextThemeWrapper. 
Bug: 195028385
Test: can build now.
Change-Id: Ia36b77e3274191efa28c87cc0b2604a66906b604
 2021-07-29 18:59:57 +00:00
Evan Rosky
abbe3e853b Merge "Enable keyguard remote animation when WMShell is used." into sc-v2-dev am: 58fd4834b9 am: 8ae8c3e9c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027112

Change-Id: I44fc397edce49cbc71ba45e3c7700cf6037770d1
 2021-07-28 21:01:32 +00:00
Evan Rosky
8ae8c3e9c8 Merge "Enable keyguard remote animation when WMShell is used." into sc-v2-dev am: 58fd4834b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027112

Change-Id: Ib6bc7cf0eaa142baf5306829c2fb359d22604f93
 2021-07-28 20:52:35 +00:00
Evan Rosky
58fd4834b9 Merge "Enable keyguard remote animation when WMShell is used." into sc-v2-dev 2021-07-28 20:37:38 +00:00
Wei Sheng Shih
20c556f1b0 Merge "Fine tune splash screen icon generation algorithm" into sc-dev am: e2ff050fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283495

Change-Id: I447a594ff5a891a3e36b8d27df8a67c55d852e5d
 2021-07-28 14:50:24 +00:00
Wei Sheng Shih
8ea3583b8d Merge "Correcting the package name used on splash screen window." into sc-dev am: 0793f65c95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358033

Change-Id: I28623c6b9596275536a1e3f979cd9650f8082b3e
 2021-07-28 14:49:43 +00:00
Winson Chung
20dd3c2812 Merge "Skip animating out bubble screenshot if surface is not ready" into sc-dev am: d4dd12ee06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15352585

Change-Id: I90f15f1082d954ef05bc2b4deeb573aa786cde65
 2021-07-28 14:45:15 +00:00
TreeHugger Robot
9d1f00944b Merge "Apply theme color and fade-in transition effect at the top of One-handed mode" into sc-dev am: a08d1cb0f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234619

Change-Id: I544c9b53f7475690b4ff898e8455d893411d2c06
 2021-07-28 14:43:57 +00:00
Automerger Merge Worker
8e3066a44c Merge "Merge "Dismiss stage split when unlock after folded" into sc-v2-dev am: 3c4e9ed3b8" into sc-v2-dev-plus-aosp am: 11d41979e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371910

Change-Id: I8625074c697e2f5a95b22c227e46c561860e68fa
 2021-07-28 13:53:57 +00:00
Wale Ogunwale
46f3d5e3c8 Merge "Dismiss stage split when unlock after folded" into sc-v2-dev am: 3c4e9ed3b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371910

Change-Id: Ib8ad17a64341043c5f6618138a92a8dad53db46a
 2021-07-28 13:40:00 +00:00
Wale Ogunwale
3c4e9ed3b8 Merge "Dismiss stage split when unlock after folded" into sc-v2-dev 2021-07-28 13:23:53 +00:00