Commit Graph

14731 Commits

Author SHA1 Message Date
TreeHugger Robot 4bd8a9c853 Merge changes from topic "am-22b34d0b-71d8-4c8c-93fb-e03ad387dce6-ub-launcher3-edmonton-polish" into ub-launcher3-master
* changes:
  [automerger] Changed the Task Menu to overlay on top of the task view am: 1b9c3d6fe3
  Changed the Task Menu to overlay on top of the task view
2018-06-08 23:59:21 +00:00
TreeHugger Robot 808e7cae66 Merge "Changed the Task Menu to overlay on top of the task view" into ub-launcher3-edmonton-polish 2018-06-08 23:59:21 +00:00
Android Build Merger (Role) f47f51c179 [automerger] Fixing build breakage due to theme change am: 03f17fabf0
Change-Id: Iff98d08cb9c0f591256ac2d71eaa46d48666a269
2018-06-08 22:24:06 +00:00
Sunny Goyal 03f17fabf0 Fixing build breakage due to theme change
Change-Id: I0d1f1b69a5dbde0cccfdcb925495018ee82403bd
2018-06-08 15:23:17 -07:00
Android Build Merger (Role) 184e968628 [automerger] Changed the Task Menu to overlay on top of the task view am: 1b9c3d6fe3
Change-Id: I572cb5fe8801b2374487d489f78f2bf232df7217
2018-06-08 21:25:18 +00:00
Matthew Ng 1b9c3d6fe3 Changed the Task Menu to overlay on top of the task view
When tapping the icon for each card in overview, the options will
overlay on top of the task view below the icon instead of popping up
above the task view.

Change-Id: I42746022432385d976134988262514a238a5066e
Fixes: 109676098
Test: go to overview, tap the icon for the task
2018-06-08 14:24:22 -07:00
Winson Chung a41d3dda23 Merge changes from topic "am-6122ccdb-5b5a-43f4-8f32-3d9e1a775ee9" into ub-launcher3-master
* changes:
  [automerger] Set correct target position for other targets am: 707c09d3e3 am: 8c7e5cb111
  [automerger] Set correct target position for other targets am: 707c09d3e3
  Set correct target position for other targets
2018-06-08 19:19:29 +00:00
Winson Chung 1cabec12ea Merge changes from topic "am-6122ccdb-5b5a-43f4-8f32-3d9e1a775ee9" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Set correct target position for other targets am: 707c09d3e3
  Set correct target position for other targets
2018-06-08 19:19:29 +00:00
Tony Wickham 15852dc121 Merge "Track shelf rather than app window" into ub-launcher3-edmonton-polish 2018-06-08 18:32:38 +00:00
Android Build Merger (Role) 9d3055dc47 [automerger] Don't intercept above shelf progress if still animating am: 89126653cd
Change-Id: Ida5b5548edb8495e2b4cb15291dc6778cf80b746
2018-06-08 03:50:01 +00:00
Tony 89126653cd Don't intercept above shelf progress if still animating
When you swipe up to overview from home, we should allow touches on
recents even if the overshoot animation isn't finished. If the
touch is below the all apps progress, we continue to intercept to
allow for double swipe up.

Bug: 80093992
Change-Id: Ifdca61e7cfc1f7a713c067596cc0c1bd3154b44e
2018-06-07 20:48:04 -07:00
Android Build Merger (Role) d11b60855c [automerger] Track shelf rather than app window am: 7f300e3dff
Change-Id: I46442796f81ecb185bf74f2b1a873e08f679a8d1
2018-06-08 01:27:38 +00:00
Tony 7f300e3dff Track shelf rather than app window
Change swipe length to be the height of the shelf rather than the distance
to the bottom of the task in recents. The shelf already uses this distance
to determine its starting offset, and the window uses it to determine how
fast to move. So by setting the distance to the height of the shelf, we
effectively make the window move slightly faster and the shelf move directly
under your finger.

Bug: 109817942
Change-Id: I9b20bbed58cccc6f74aba36000a6ca272f9d554d
2018-06-07 18:23:19 -07:00
Android Build Merger (Role) a48273b4cb [automerger] Revert workaround for missing frame callback am: 2ad2859f1e am: 53d57998c1
Change-Id: Ie39ded4d958e25cf732d0fa3988151858186df8d
2018-06-07 22:23:57 +00:00
Android Build Merger (Role) 53d57998c1 [automerger] Revert workaround for missing frame callback am: 2ad2859f1e
Change-Id: Ie92ada3a301bad9cf0cdd355285503f656c8a125
2018-06-07 22:23:56 +00:00
Winson Chung 2ad2859f1e Revert workaround for missing frame callback
Bug: 109701914
Test: Long swipe from an app and ensure the app window is hidden
Change-Id: Ice2978687e2049d5cfb20f3f7ce93906246c30b6
2018-06-07 22:23:54 +00:00
Tony Wickham e4f7c7a394 Merge changes from topic "am-6d9ca486-65ce-4826-896a-aaf2c33186f9" into ub-launcher3-master
* changes:
  [automerger] Reapply back button alpha at end of state animation am: 5273b695c2 am: ac5a07cb59
  [automerger] Reapply back button alpha at end of state animation am: 5273b695c2
  Reapply back button alpha at end of state animation
2018-06-07 21:41:16 +00:00
Tony Wickham d968bdbc25 Merge changes from topic "am-6d9ca486-65ce-4826-896a-aaf2c33186f9" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Reapply back button alpha at end of state animation am: 5273b695c2
  Reapply back button alpha at end of state animation
2018-06-07 21:41:16 +00:00
Sunny Goyal bddfe15e54 Merge changes from topic "am-b4ccc74b-9fac-466f-997f-63416774e49c" into ub-launcher3-master
* changes:
  [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11 am: a4785c9a3f
  [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11
  Do not execute controller callbacks, if controller is null
2018-06-07 20:57:41 +00:00
Sunny Goyal 13c69a6251 Merge changes from topic "am-b4ccc74b-9fac-466f-997f-63416774e49c" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11
  Do not execute controller callbacks, if controller is null
2018-06-07 20:57:41 +00:00
Android Build Merger (Role) a0bde7e91a [automerger] Reapply back button alpha at end of state animation am: 5273b695c2 am: ac5a07cb59
Change-Id: I398df285e665d85a68b299697793741cd1b896d0
2018-06-07 18:48:59 +00:00
Android Build Merger (Role) ac5a07cb59 [automerger] Reapply back button alpha at end of state animation am: 5273b695c2
Change-Id: Ic83348b0559743b334c5989d014987f144c390f1
2018-06-07 18:48:57 +00:00
Tony 5273b695c2 Reapply back button alpha at end of state animation
We determine the toAlpha at the start of the state change, but something
may happen (e.g. we lose window focus) during the transition. So to make
sure we don't end in a state with the wrong alpha, reapply at the end.

Bug: 109835691
Change-Id: I271a1d269f861f698efbb8e66148a924c8620e71
2018-06-07 11:46:16 -07:00
Android Build Merger (Role) a8eda90c95 [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11 am: a4785c9a3f
Change-Id: I7445f1f572a0e07a5356f65c9abe65ca90fc7d52
2018-06-07 18:08:01 +00:00
Android Build Merger (Role) a4785c9a3f [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11
Change-Id: I00471a292a30f1a500a36007486e68035380e4ac
2018-06-07 18:08:00 +00:00
Sunny Goyal aa168d5c11 Do not execute controller callbacks, if controller is null
Bug: 109812478
Change-Id: I55adc276fd894dd5f8913483984266327d7d482b
2018-06-07 11:07:53 -07:00
Android Build Merger (Role) cf407455e6 [automerger] Reset the UI to the proper state, if we start the swipe-ui gesture from an inconsistent state am: a04c779f86 am: 87c1a14ef1
Change-Id: I3634bd17f8ed31cf2065669c4b2b95ff9911105f
2018-06-07 17:46:55 +00:00
Android Build Merger (Role) 87c1a14ef1 [automerger] Reset the UI to the proper state, if we start the swipe-ui gesture from an inconsistent state am: a04c779f86
Change-Id: Ie8c72e058f35e4fce566b1751737de48b987ffe0
2018-06-07 17:46:53 +00:00
Sunny Goyal a04c779f86 Reset the UI to the proper state, if we start the swipe-ui gesture from an
inconsistent state

Bug: 109583168
Change-Id: I451c66bf7643b7c1791c26b5862ca9f7a020f7be
2018-06-07 10:46:39 -07:00
Android Build Merger (Role) ff3f2a07f2 [automerger] Set correct target position for other targets am: 707c09d3e3 am: 8c7e5cb111
Change-Id: I2567e3235c149b06fbb9efd1554a5fd90f3a4168
2018-06-07 14:40:57 +00:00
Android Build Merger (Role) 8c7e5cb111 [automerger] Set correct target position for other targets am: 707c09d3e3
Change-Id: I953aaf62740e0e9408cde6a5a337e6f2a1f96be4
2018-06-07 14:40:54 +00:00
Jorim Jaggi 707c09d3e3 Set correct target position for other targets
Test: Open/close app in split screen
Bug: 109867619
Change-Id: Ice2325e1be2f45c135e1beca63a16afed2d21644
2018-06-07 16:40:18 +02:00
Android Build Merger (Role) ea15d92bad [automerger] Overshoot when flinging up from an app am: b45444b250 am: 34838cf551
Change-Id: Ib6cd939131e5df32f713d39bb180f5e2759ddb1f
2018-06-06 23:21:01 +00:00
Android Build Merger (Role) 34838cf551 [automerger] Overshoot when flinging up from an app am: b45444b250
Change-Id: I25d7621d3b60b307d4eb7c466eafc893e78b7ea0
2018-06-06 23:20:59 +00:00
Tony Wickham b45444b250 Overshoot when flinging up from an app
- Use OvershootInterpolator based on velocity (consistent with swiping up
  from home)
- Scale down recents as well, to be consistent with adjacent pages scaling
  up when you launch a task

Bug: 109709720
Change-Id: Ie47309058ccf673a4b86c40c843c415beb2d8dc7
2018-06-06 23:20:58 +00:00
Android Build Merger (Role) 8fa7632840 [automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2 am: f99417f8bb
Change-Id: I345bca035f5b2c00dedb39bfc8652f0136c461d5
2018-06-06 18:45:09 +00:00
Android Build Merger (Role) f99417f8bb [automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2
Change-Id: Ide18fd680c598701a8521e5fca1fecb0efd5f3a2
2018-06-06 18:45:07 +00:00
Sunny Goyal 0cd2a254b2 Reset state amanger, when switching from state animation to task launch animation
A pending task launch animation can set some transient properties on state manager.
If the next animation is not a state animation, and reapply is not called, the
transient properties are never cleared

Bug: 79935289
Change-Id: I18398c74692960c460af537bf0c48801e69ac11e
2018-06-06 11:45:00 -07:00
Winson Chung 48412ca2c9 Merge "Fixing task window is not getting alpha set properly when long-swiping" into ub-launcher3-edmonton 2018-06-06 01:00:55 +00:00
Android Build Merger (Role) 9c940a551f [automerger] Fixing task window is not getting alpha set properly when long-swiping am: d01a28758d am: 4600bfca66
Change-Id: Ifaea5caac11678d268d4fd15dab1c34ee7febe69
2018-06-06 00:24:14 +00:00
Android Build Merger (Role) 4600bfca66 [automerger] Fixing task window is not getting alpha set properly when long-swiping am: d01a28758d
Change-Id: I83c8cb55b8d1ad95dc2f36ae3aa368dbcce3acdc
2018-06-06 00:24:13 +00:00
Sunny Goyal d01a28758d Fixing task window is not getting alpha set properly when long-swiping
We were setting the alpha of the target window to 0 on the UI thread, and setting it
back to 1, through ClipAnimationHelper on background thread

Bug:109701914
Change-Id: I4abb73298b5e957a66f91c5654b184cdd398724b
2018-06-05 17:24:06 -07:00
Winson Chung 7938e9fbc6 Merge "Log source component instead of current task base intent" into ub-launcher3-edmonton 2018-06-06 00:20:32 +00:00
Winson Chung fbfc33046b Merge changes from topic "am-f473c0ff-c51d-4d80-bdfd-be4951e83f73" into ub-launcher3-master
* changes:
  [automerger] Log source component instead of current task base intent am: 3cc3df59af am: dee4137e5e
  [automerger] Log source component instead of current task base intent am: 3cc3df59af
  Log source component instead of current task base intent
2018-06-06 00:20:32 +00:00
Winson Chung a1b651dcaf Merge changes from topic "am-f473c0ff-c51d-4d80-bdfd-be4951e83f73" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Log source component instead of current task base intent am: 3cc3df59af
  Log source component instead of current task base intent
2018-06-06 00:20:32 +00:00
TreeHugger Robot af19ffff62 Merge "Adding a pending invisibility flag, which is used to indicate that the launcher is not really invisible, but consider it invisible for window transitions" into ub-launcher3-edmonton 2018-06-05 23:57:08 +00:00
Android Build Merger (Role) fd662397b3 [automerger] Adding a pending invisibility flag, which is used to indicate that the launcher is not really invisible, but consider it invisible for window transitions am: 1c63c72c1a am: 7ef92daaf5
Change-Id: Ia98e9e536debd114efe95d545639b48c081e558c
2018-06-05 23:48:02 +00:00
Android Build Merger (Role) 7ef92daaf5 [automerger] Adding a pending invisibility flag, which is used to indicate that the launcher is not really invisible, but consider it invisible for window transitions am: 1c63c72c1a
Change-Id: Ic88f7803c9a938f20f002f7d8eaf8df33e0f578f
2018-06-05 23:48:01 +00:00
Sunny Goyal 1c63c72c1a Adding a pending invisibility flag, which is used to indicate that the launcher
is not really invisible, but consider it invisible for window transitions

When a recents animation is cancelled, the callback can be received before or after the
wallpaper animation. To ensure that wallpaper animaiton runs properly, we keep the launcher
forceInvisible=true, only for that particular animaiton and false everywhere

Bug: 109735443
Change-Id: I5b22cc3327c8cd53a836d10e09fc88ae103becfc
2018-06-05 16:47:54 -07:00
Android Build Merger (Role) 7c3c1951cc [automerger] Log source component instead of current task base intent am: 3cc3df59af am: dee4137e5e
Change-Id: Ic88a4281bef9d1a07ab1360a2fd6d5834c239a0e
2018-06-05 21:09:35 +00:00