Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,397 Commits 3 Branches 0 Tags
d6b673c15aaeabb9e2af1dce1ffe0feaa5ea159e
Commit Graph

1377 Commits

Author SHA1 Message Date
Jorge Gil
93c522f4dd Merge "Expand PIP to the normal size when menu actions don't fit" into sc-dev am: 37c329784f am: f6bd7f81ea am: e310d0d285 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668168

Change-Id: Iba94feac5ebbef1a8b12fd0826ce7cc4a3c47d5d
 2021-05-21 16:20:48 +00:00
Jorge Gil
e310d0d285 Merge "Expand PIP to the normal size when menu actions don't fit" into sc-dev am: 37c329784f am: f6bd7f81ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668168

Change-Id: I0e43769901b2c5adee1e7cb1a985a9e65471f091
 2021-05-21 16:05:45 +00:00
Jorge Gil
f6bd7f81ea Merge "Expand PIP to the normal size when menu actions don't fit" into sc-dev am: 37c329784f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668168

Change-Id: I1f1e15411a8c9608e355b4d42878ded605381fa2
 2021-05-21 15:51:54 +00:00
Jorge Gil
37c329784f Merge "Expand PIP to the normal size when menu actions don't fit" into sc-dev 2021-05-21 15:20:18 +00:00
Tony Huang
e6b41b5e23 Merge changes I1ea02fa9,I033a79dc,Iac219a8e into sc-v2-dev am: c3acdff9e8 am: dc696b0e6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660736

Change-Id: I0e6d974c6a521a53026c720af88c1e231c83dbf1
 2021-05-21 08:20:04 +00:00
Tony Huang
dc696b0e6c Merge changes I1ea02fa9,I033a79dc,Iac219a8e into sc-v2-dev am: c3acdff9e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660736

Change-Id: I631eab683e4ea20d9b7ca8721c716e5928de46a2
 2021-05-21 08:05:00 +00:00
Tony Huang
c3acdff9e8 Merge changes I1ea02fa9,I033a79dc,Iac219a8e into sc-v2-dev 
* changes:
  Make AppTransition animations sharable (6/n)
  Make AppTransition animations sharable (5/n)
  Make AppTransition animations sharable (4/n)
 2021-05-21 07:46:13 +00:00
Automerger Merge Worker
7071164aca Merge "Merge "Pass in finishTransaction to TransitionHandler#startAnimation" into sc-v2-dev am: bf09fa1d8a" into sc-v2-dev-plus-aosp am: 341e43239e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14608051

Change-Id: I42936ca5a443b5d0625e4aca96e753a7d763d9dd
 2021-05-21 06:52:38 +00:00
Ben Lin
f5444eaaa2 Merge "Pass in finishTransaction to TransitionHandler#startAnimation" into sc-v2-dev am: bf09fa1d8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14608051

Change-Id: I2fe9a7a96ac023ac92f6601469e7c4453fbd4a62
 2021-05-21 06:35:25 +00:00
Ben Lin
bf09fa1d8a Merge "Pass in finishTransaction to TransitionHandler#startAnimation" into sc-v2-dev 2021-05-21 06:20:33 +00:00
Wei Sheng Shih
b8884ba71d Merge "Tracking launch activity to decide next splash screen style." into sc-dev am: 9e14f714d4 am: 919405b38d am: f25d1ab393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326844

Change-Id: I2c5f843970bd949f40ede52762096155b073ce4e
 2021-05-21 05:32:48 +00:00
Wei Sheng Shih
0f7e6d52a7 Merge "Drawing the legacy icon similar to the Launcher." into sc-dev am: fffb1502cf am: 8fde873208 am: e7aba97e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234712

Change-Id: I5e888c8068dfdd86d039d38c5259ebcdc7743579
 2021-05-21 05:31:58 +00:00
Wei Sheng Shih
f25d1ab393 Merge "Tracking launch activity to decide next splash screen style." into sc-dev am: 9e14f714d4 am: 919405b38d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326844

Change-Id: Ie613201819eb38c997c7379f396cecc572f86226
 2021-05-21 05:16:42 +00:00
Wei Sheng Shih
e7aba97e1f Merge "Drawing the legacy icon similar to the Launcher." into sc-dev am: fffb1502cf am: 8fde873208 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234712

Change-Id: I7a234e72eecc989a0cd7e54687525cb27b1e102a
 2021-05-21 05:16:25 +00:00
Wei Sheng Shih
9e14f714d4 Merge "Tracking launch activity to decide next splash screen style." into sc-dev 2021-05-21 04:42:00 +00:00
Wei Sheng Shih
fffb1502cf Merge "Drawing the legacy icon similar to the Launcher." into sc-dev 2021-05-21 04:39:29 +00:00
Winson Chung
f8c359d9cb Merge "Keep PIP screenshot layer below input consumer layer" into sc-dev am: f369d35b27 am: dcea2ba7e2 am: e9785abe95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667204

Change-Id: Id21f769cc073791182c24f7853c154dd82014e3b
 2021-05-21 04:17:12 +00:00
Winson Chung
dcea2ba7e2 Merge "Keep PIP screenshot layer below input consumer layer" into sc-dev am: f369d35b27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667204

Change-Id: I9e599ec740afd7b57ab0aa9785eda1d75b85bcf2
 2021-05-21 03:54:59 +00:00
Winson Chung
f369d35b27 Merge "Keep PIP screenshot layer below input consumer layer" into sc-dev 2021-05-21 03:33:30 +00:00
Winson Chung
ef3443f2cc Keep PIP screenshot layer below input consumer layer 
Fixes: 188830778
Test: Resize w/o seamless resizing and try touching the PIP
Change-Id: I55c45fc670cd3acc3b674809eb3afea626f34f06
 2021-05-21 03:32:42 +00:00
Ben Lin
a8b3618691 Pass in finishTransaction to TransitionHandler#startAnimation 
When iterating through registered transitions and finding one and
marking as active, WM sets a reset transition which runs at when the
transition handler runs its finish callback. However, not all transition
handler wants a complete reset of the transition; in PiP's case, it
actually wants to set the final position to the new PiP x and y
coordinates. Passing in the finish transition to #startAnimation will allow
each transition handler to customize and overwrite values as necessary.

Bug: 165793917
Test: Enable Transitions, enter PIP - PIP animates correctly now
Change-Id: I741a04c1a9123c924383168c0db48646ef34059d
 2021-05-20 17:32:46 -07:00
Mady Mellor
0aeb37b577 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e am: 8e0675e789 am: ea4444f387 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I59f942584b1fcd9cc6c26103f83e9d817d2236a1
 2021-05-20 23:58:42 +00:00
Mady Mellor
ea4444f387 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e am: 8e0675e789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I5ac22a88da2fd8992732fa15f0201bb4bb50f20c
 2021-05-20 23:37:19 +00:00
Mady Mellor
a1a2de8882 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I2f5f6fb18acb64d36188a3ff8033b119a79ce61b
 2021-05-20 23:14:38 +00:00
Mady Mellor
83f4345f9e Merge "Fix transitions in the background when launching something in TaskView" into sc-dev 2021-05-20 22:55:00 +00:00
Mady Mellor
e60e8b113b Merge changes I65f46028,Ie3f67ccd into sc-dev am: 0abd3000eb am: fb60557280 am: 4084192216 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626183

Change-Id: Ibed0767fb219f0d1b73c98f3cd57cbf561a5b395
 2021-05-20 20:39:43 +00:00
TreeHugger Robot
a9a3e9230a Merge "Only resize the menu on hide if it was resized on show" into sc-dev am: 46e2f5974c am: e7de6181e0 am: f934931d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14649851

Change-Id: Iedd6c0e50743b4b5991607728cd5ed5601502c5b
 2021-05-20 20:39:02 +00:00
jorgegil@google.com
553bfd9161 Expand PIP to the normal size when menu actions don't fit 
Instead of resizing to bounds larger than the default size
when the menu is shown, resize to the normal/default bounds
instead.
Also, remove the unused animateToMinimizedState() method.

Bug: 184789365
Test: enter PIP, pinch resize to min size, tap to poke menu -
verify that PIP expands to the default size

Change-Id: Ib0d7780fce2ec9157fb0f533d67b175ce699f40b
 2021-05-20 13:26:55 -07:00
Mady Mellor
fb60557280 Merge changes I65f46028,Ie3f67ccd into sc-dev am: 0abd3000eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14626183

Change-Id: I61c58c6a49be8bc51c8404fe024dff55181241c4
 2021-05-20 20:06:51 +00:00
Mady Mellor
0abd3000eb Merge changes I65f46028,Ie3f67ccd into sc-dev 
* changes:
  Make the pointer for bubbles expanded view rounded
  Update the manage button to the new style
 2021-05-20 19:54:53 +00:00
TreeHugger Robot
e7de6181e0 Merge "Only resize the menu on hide if it was resized on show" into sc-dev am: 46e2f5974c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14649851

Change-Id: If5ef94ed33ea538cbd0baf24d940c783d1b09586
 2021-05-20 19:52:03 +00:00
TreeHugger Robot
46e2f5974c Merge "Only resize the menu on hide if it was resized on show" into sc-dev 2021-05-20 19:31:26 +00:00
Mady Mellor
b619c785b6 Merge "Bubbles styling: Update colors to use new theme things" into sc-dev am: 9ac4fb0e34 am: f8236cc54c am: f781960d08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508390

Change-Id: Ie63736dc225addbdf90e861047b27ee40f16f4d0
 2021-05-20 17:23:41 +00:00
Mady Mellor
f781960d08 Merge "Bubbles styling: Update colors to use new theme things" into sc-dev am: 9ac4fb0e34 am: f8236cc54c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508390

Change-Id: I1d11d0b71b763f918d35b7331b302e25034da907
 2021-05-20 17:08:05 +00:00
Mady Mellor
529e1cb06b Merge "Bubbles styling: Update colors to use new theme things" into sc-dev am: 9ac4fb0e34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508390

Change-Id: I897eafdccb9744d02b80916fe51adf060af0ea63
 2021-05-20 16:45:11 +00:00
Mady Mellor
9ac4fb0e34 Merge "Bubbles styling: Update colors to use new theme things" into sc-dev 2021-05-20 16:32:14 +00:00
TreeHugger Robot
a3867cfaa7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-20 14:07:43 +00:00
wilsonshih
64e67a6ebf Tracking launch activity to decide next splash screen style. 
The generic rule to showing an empty splash screen is that if an
activity is launched from another visible activity besides Launcher.
So with this rule, when prepare the starting window for a launching
activity, we can tracking where the source activity comes from and
whether it has show splash screen or has drawn window before.
This can solve the inconsistent launch sequence when launching an
activity from non-system surface for the status either new task or
new process.
There will show an empty style splash screen if the launching
activity was drawn or it has show splash screen before.
Another coner case is that a process could start a new activity from
service, for the better UX we should also check whether there any
existing activities which were from the same process or same package
and has already at foreground.

We can still add "show icon_style_splash_screen" flag in the future.

Bug: 185433040
Bug: 185567723
Bug: 185448781
Test: atest SplashscreenTests ActivityRecordTests
Test: manual test
Launch browser from -1, empty splash screen
Launch calendar from launcher, icon splash screen
Launch work app from Settings -> Notifications -> Calendar show empty
splash screen
Launch Settings -> System update show empty splash screen
Launch Dialer -> call out -> show empty splash screen on InCallActivity

Change-Id: Id84f1f69de6c5e3f1c21cd249c62404958410193
 2021-05-20 19:59:39 +08:00
Bill Yi
8b426d12b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I73c3b5ee1590289835a2c5bbd43a953091f0a881
 2021-05-20 11:09:23 +00:00
Tony Huang
bc3d6581c6 Make AppTransition animations sharable (6/n) 
1. Migrate wallpaper related animation.
2. Refactor and correct some handled animations.

Bug: 178678389
Test: manual
Change-Id: I1ea02fa946c1c28d53ac6b92786db17dacbb45c4
 2021-05-20 16:36:24 +08:00
Tony Huang
29bdef95f8 Make AppTransition animations sharable (5/n) 
Handle attachThumbnail animation.

Bug: 178678389
Test: manual
Change-Id: I033a79dcf0a54d782c438c98763c6a5ad00d2bbf
 2021-05-20 16:36:17 +08:00
Tony Huang
a2c4a7577d Make AppTransition animations sharable (4/n) 
Migrate ActivityOptions transition animation to shell transition.

Bug: 178678389
Test: manual
Change-Id: Iac219a8eabab7ac7fac73a47e97ec003bbf2d366
 2021-05-20 16:36:13 +08:00
Wei Sheng Shih
385216bae8 Merge "Delete the delay for keeping tasksnapshot on screen." into sc-dev am: c56f67e7d9 am: ac8e94a0d3 am: eb504a8647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609912

Change-Id: Iaf4b2c2ce95847ed63162bd8439eb6cfc0ec3aec
 2021-05-20 05:25:15 +00:00
Hongwei Wang
82e3bbf83f Merge "Add test for move PiP upon Display change" into sc-dev am: c81fdf89d7 am: a6fb097906 am: 68420e253f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14647432

Change-Id: I778e9398b5c61a9f246c4ca5cdb786cd01b530f3
 2021-05-20 05:24:13 +00:00
Jorge Gil
29e5f1b334 Merge "Skip finishResize for non-exit animation if PIP is about to exit" into sc-dev am: a2a52c1fed am: a761bd8ec8 am: c41d488f8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14627499

Change-Id: I0e94dc3db4e9cb64e3ca04abb4d484992a2284bd
 2021-05-20 05:13:25 +00:00
Mady Mellor
94d401be7d Merge "Bubbles styling: flyout changes" into sc-dev am: 3952307a8c am: b22e1ee6f9 am: 7625892d41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508389

Change-Id: I45c3c3b118b341adb2fd777959361dca36924939
 2021-05-20 04:59:56 +00:00
Mady Mellor
be17bc657d Merge "Fix some sizes that weren't changing for font scale / display size`" into sc-dev am: 9f97f89342 am: 1099d370ab am: 1236d6cf20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508388

Change-Id: I33ba2eccf8ebd7744a6e5dfbbb2e4119974a7b39
 2021-05-20 04:59:39 +00:00
Wei Sheng Shih
ac8e94a0d3 Merge "Delete the delay for keeping tasksnapshot on screen." into sc-dev am: c56f67e7d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609912

Change-Id: I90d5f336826146ef7a15dc82ddbe3bd3c338b41b
 2021-05-20 01:28:36 +00:00
Wei Sheng Shih
c56f67e7d9 Merge "Delete the delay for keeping tasksnapshot on screen." into sc-dev 2021-05-20 01:26:29 +00:00
Hongwei Wang
a6fb097906 Merge "Add test for move PiP upon Display change" into sc-dev am: c81fdf89d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14647432

Change-Id: I37648d9b078ca6ccc6f4df4ec6d200eacdead46d
 2021-05-20 01:19:16 +00:00