Commit Graph

1301 Commits

Author SHA1 Message Date
Sunny Goyal
b0e4126ad0 Do not clip recents view as it scales down to reveal more content
Change-Id: Icc26dec5fc4d6b19d22eb975628de3856f2ea471
2018-06-12 10:02:44 -07:00
Sunny Goyal
3f7cee1736 Merge changes from topic "am-0b6a5c04-a2d6-4b04-9f21-7a735e052036" into ub-launcher3-master
* changes:
  [automerger] Adding overscroll effect in recents list am: 4d6b1a95a1
  Adding overscroll effect in recents list
2018-06-12 16:56:02 +00:00
Sunny Goyal
267d04f79b Merge "Adding overscroll effect in recents list" into ub-launcher3-edmonton-polish 2018-06-12 16:56:02 +00:00
Tony Wickham
41c40bbb13 Merge changes from topic "am-aa97c11a-ca5a-48a7-993d-107856bfc8c7" into ub-launcher3-master
* changes:
  [automerger] Fix some issues with haptic am: 29aef52be3
  Fix some issues with haptic
2018-06-12 15:55:30 +00:00
Tony Wickham
fe1402d8a4 Merge "Fix some issues with haptic" into ub-launcher3-edmonton-polish 2018-06-12 15:55:30 +00:00
TreeHugger Robot
8676841fda Merge changes from topic "am-229f9e14-980c-44e5-a5c0-41681fae0652" into ub-launcher3-master
* changes:
  [automerger] Dismiss task menu view after pinning from tapping menu item am: 89da6799e4
  Dismiss task menu view after pinning from tapping menu item
2018-06-11 23:56:09 +00:00
TreeHugger Robot
90edc36dd9 Merge "Dismiss task menu view after pinning from tapping menu item" into ub-launcher3-edmonton-polish 2018-06-11 23:56:09 +00:00
Android Build Merger (Role)
ce2c4a83c8 [automerger] Adding overscroll effect in recents list am: 4d6b1a95a1
Change-Id: Ic38c8c91a0848714d21a99e48a4f7d5d0c41594a
2018-06-11 23:42:43 +00:00
Sunny Goyal
4d6b1a95a1 Adding overscroll effect in recents list
Bug: 109828536
Change-Id: If2b65cfc2b7f14deb721436f7aa378c4a2c5c468
2018-06-11 16:42:37 -07:00
Android Build Merger (Role)
f8f430d37f [automerger] Fix some issues with haptic am: 29aef52be3
Change-Id: Icb16c1ee3828820187f023bd351e2a2720e9d300
2018-06-11 23:23:52 +00:00
Tony Wickham
29aef52be3 Fix some issues with haptic
- Don't have double haptic on quick scrub
- Correctly check interpolated progress to determine final state,
  so that it always aligns with the haptic (i.e. passing the haptic
  means letting go will go to the new state)

Bug: 109709720
Change-Id: I702bb76a4c15f932f923e81a14cc49f6a9126cb8
2018-06-11 23:23:49 +00:00
Android Build Merger (Role)
54c1af806f [automerger] Moving clear all button inside the recents view am: c82c6396e9
Change-Id: I1109b5ae959cab870fbf81e60ca143534b22cc20
2018-06-11 20:51:12 +00:00
Sunny Goyal
c82c6396e9 Moving clear all button inside the recents view
Bug: 72222505
Bug: 109828536

Change-Id: I843b79db3e47abc2c41ed78f186b9c941941ddef
2018-06-11 13:51:03 -07:00
Android Build Merger (Role)
19ded6aa6b [automerger] Dismiss task menu view after pinning from tapping menu item am: 89da6799e4
Change-Id: I0612c48bcd0d4bbf4d690e08d3c75e355a29ad60
2018-06-11 18:49:31 +00:00
Matthew Ng
89da6799e4 Dismiss task menu view after pinning from tapping menu item
OnClickListener for pin menu option will close all floating views such
as the task menu view.

Test: launch a transparent app, swipe up and try to pin it
Change-Id: I0a3253c79fd543e6044037835ffd74777c76a17d
Fixes: 109678966
2018-06-11 11:49:20 -07:00
TreeHugger Robot
367a53ec13 Merge "Added haptic feedback when swipe/fling up from an app in fullscreen" into ub-launcher3-edmonton-polish 2018-06-11 17:57:38 +00:00
Android Build Merger (Role)
b5703f997a [automerger] Added haptic feedback when swipe/fling up from an app in fullscreen am: c4b75abf3b
Change-Id: Ie9f2589f58b8d0a43a0829127b1977f26c91456e
2018-06-11 17:47:12 +00:00
Matthew Ng
c4b75abf3b Added haptic feedback when swipe/fling up from an app in fullscreen
This includes swiping/fling up from a fullscreen app and swiping/fling
down a task to a fullscreen app.

Test: swipe up when app is fullscreen
Fixes: 80543530
Change-Id: Iee259284cc6d4fe1e784532f0822ffd38cdee280
2018-06-11 10:45:47 -07:00
Android Build Merger (Role)
d822a85aa5 [automerger] Making the self always follow the vertical progress without any min height limit. After a certain height, the self fades out, but keeps following the vertical progress. am: 0f3af75eb0
Change-Id: Id6a0999f2ee3bf140df7e407011648a096fe1b8b
2018-06-11 16:51:49 +00:00
Sunny Goyal
0f3af75eb0 Making the self always follow the vertical progress without any min height limit.
After a certain height, the self fades out, but keeps following the vertical progress.

Eventually the fade-out can be decoupled from vertical progress and tied to the state

Bug: 109829614
Change-Id: I9808ed3fa1730b938196bc6d3518a6d096a13f4c
2018-06-11 09:51:42 -07:00
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