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
2018-06-12 16:56:02 +00:00
267d04f79b
Merge "Adding overscroll effect in recents list" into ub-launcher3-edmonton-polish
2018-06-12 16:56:02 +00:00
41c40bbb13
Merge changes from topic "am-aa97c11a-ca5a-48a7-993d-107856bfc8c7" into ub-launcher3-master
...
* changes:
[automerger] Fix some issues with haptic am: 29aef52be3
2018-06-12 15:55:30 +00:00
fe1402d8a4
Merge "Fix some issues with haptic" into ub-launcher3-edmonton-polish
2018-06-12 15:55:30 +00:00
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
2018-06-11 23:56:09 +00:00
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
ce2c4a83c8
[automerger] Adding overscroll effect in recents list am: 4d6b1a95a1
...
Change-Id: Ic38c8c91a0848714d21a99e48a4f7d5d0c41594a
2018-06-11 23:42:43 +00:00
4d6b1a95a1
Adding overscroll effect in recents list
...
Bug: 109828536
Change-Id: If2b65cfc2b7f14deb721436f7aa378c4a2c5c468
2018-06-11 16:42:37 -07:00
f8f430d37f
[automerger] Fix some issues with haptic am: 29aef52be3
...
Change-Id: Icb16c1ee3828820187f023bd351e2a2720e9d300
2018-06-11 23:23:52 +00:00
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
54c1af806f
[automerger] Moving clear all button inside the recents view am: c82c6396e9
...
Change-Id: I1109b5ae959cab870fbf81e60ca143534b22cc20
2018-06-11 20:51:12 +00:00
c82c6396e9
Moving clear all button inside the recents view
...
Bug: 72222505
Bug: 109828536
Change-Id: I843b79db3e47abc2c41ed78f186b9c941941ddef
2018-06-11 13:51:03 -07:00
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
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
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
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
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
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
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
f80c70843d
Snap for 4832164 from 38b6a43922 to qt-release
...
Change-Id: I8b94035ec123e18a5b20db4c3efcc91cf4c82ecd
2018-06-10 09:33:11 +00:00
38b6a43922
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 9f936d5a2f
...
am: 115d25c27b
2018-06-09 06:45:46 -07:00
115d25c27b
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 9f936d5a2f
2018-06-09 03:15:59 -07:00
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
2018-06-08 23:59:21 +00:00
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
f47f51c179
[automerger] Fixing build breakage due to theme change am: 03f17fabf0
...
Change-Id: Iff98d08cb9c0f591256ac2d71eaa46d48666a269
2018-06-08 22:24:06 +00:00
03f17fabf0
Fixing build breakage due to theme change
...
Change-Id: I0d1f1b69a5dbde0cccfdcb925495018ee82403bd
2018-06-08 15:23:17 -07:00
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
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
0a1d6b530a
Merge "Set correct target position for other targets" into ub-launcher3-edmonton
2018-06-08 19:19:29 +00:00
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: 707c09d3e38c7e5cb111707c09d3e3
2018-06-08 19:19:29 +00:00
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
2018-06-08 19:19:29 +00:00
5ac259c46e
Merge "Exposing some private methods in FastBitmapDrawable" into ub-launcher3-edmonton-polish
2018-06-08 18:51:41 +00:00
becbc4ad88
[automerger] Exposing some private methods in FastBitmapDrawable am: 0ffab44153
...
Change-Id: Iefeb2b367cb08366598c115f09fd852002430cd3
2018-06-08 18:50:57 +00:00
15852dc121
Merge "Track shelf rather than app window" into ub-launcher3-edmonton-polish
2018-06-08 18:32:38 +00:00
cd8fb0fb7f
Merge changes from topic "am-a4912ede-7663-4592-a9fd-02d7d5e05de7" into ub-launcher3-master
...
* changes:
[automerger] Track shelf rather than app window am: 7f300e3dff
2018-06-08 18:32:38 +00:00
7f46327c04
[automerger] Defining a base theme, which can be overriden by derivative projects without affecting launcher theme am: bd88f396dc
...
Change-Id: I495b62832a9effdef6dc9ff779d92158f8be0aad
2018-06-08 18:20:26 +00:00
bd88f396dc
Defining a base theme, which can be overriden by derivative projects without
...
affecting launcher theme
Bug: 70220582
Change-Id: Ie3069686be5e6a42910e90541db2d6b5b79e25c1
2018-06-08 11:20:01 -07:00
9f936d5a2f
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
Bug: 79597307
Change-Id: I99565dab3a3def02b2ad26034287963fc878e66e
2018-06-08 11:08:00 -07:00
bf124b1301
Snap for 4829746 from 25d1f74852 to qt-release
...
Change-Id: I83386c27b6a4c8dd739afcf8090322f5fa81c216
2018-06-08 09:37:05 +00:00
25d1f74852
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" am: 74ebf7a282 am: a3b5695019
...
am: 3c7d4d0dbc
2018-06-07 23:22:35 -07:00
3c7d4d0dbc
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" am: 74ebf7a282
...
am: a3b5695019
2018-06-07 21:57:21 -07:00
a3b5695019
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests"
...
am: 74ebf7a282
2018-06-07 21:16:11 -07:00
9d3055dc47
[automerger] Don't intercept above shelf progress if still animating am: 89126653cd
...
Change-Id: Ida5b5548edb8495e2b4cb15291dc6778cf80b746
2018-06-08 03:50:01 +00:00
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
d11b60855c
[automerger] Track shelf rather than app window am: 7f300e3dff
...
Change-Id: I46442796f81ecb185bf74f2b1a873e08f679a8d1
2018-06-08 01:27:38 +00:00
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
74ebf7a282
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests"
2018-06-08 01:16:16 +00:00
0ffab44153
Exposing some private methods in FastBitmapDrawable
...
Bug: 109858110
Change-Id: Ica07426cb413876d90a1b8ff49645c4711e15fc9
2018-06-07 17:32:23 -07:00
d219bc1923
Fix duplicate <uses-sdk> elements in Launcher3Tests
...
PackageManager is probably ignoring the first one.
Bug: 78447299
Test: m Launcher3Tests
Change-Id: I359beac6819ec3f0d856e8e3c909765ea521e487
2018-06-07 16:30:16 -07:00
b5b89acc09
Merge "Revert workaround for missing frame callback" into ub-launcher3-edmonton
2018-06-07 22:42:27 +00:00
Sunny Goyal
Tony Wickham
TreeHugger Robot
Android Build Merger (Role)
Matthew Ng
android-build-team Robot
Xin Li
Winson Chung
Colin Cross