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
Sunny Goyal
5ac259c46e
Merge "Exposing some private methods in FastBitmapDrawable" into ub-launcher3-edmonton-polish
2018-06-08 18:51:41 +00:00
Android Build Merger (Role)
becbc4ad88
[automerger] Exposing some private methods in FastBitmapDrawable am: 0ffab44153
...
Change-Id: Iefeb2b367cb08366598c115f09fd852002430cd3
2018-06-08 18:50:57 +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
Tony Wickham
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
Track shelf rather than app window
2018-06-08 18:32:38 +00:00
Android Build Merger (Role)
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
Sunny Goyal
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
Xin Li
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
android-build-team Robot
bf124b1301
Snap for 4829746 from 25d1f74852 to qt-release
...
Change-Id: I83386c27b6a4c8dd739afcf8090322f5fa81c216
2018-06-08 09:37:05 +00:00
Colin Cross
25d1f74852
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" am: 74ebf7a282 am: a3b5695019
...
am: 3c7d4d0dbc
Change-Id: I07d33f34b8cc38c7da89ba60b73bb1116642c04f
2018-06-07 23:22:35 -07:00
Colin Cross
3c7d4d0dbc
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" am: 74ebf7a282
...
am: a3b5695019
Change-Id: Ic0fca09f12ddc5793e4946359258a24ea1047050
2018-06-07 21:57:21 -07:00
Colin Cross
a3b5695019
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests"
...
am: 74ebf7a282
Change-Id: I355094c08249d0f393acdafd5aeeea73de8b0b0f
2018-06-07 21:16:11 -07: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
Treehugger Robot
74ebf7a282
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests"
2018-06-08 01:16:16 +00:00
Sunny Goyal
0ffab44153
Exposing some private methods in FastBitmapDrawable
...
Bug: 109858110
Change-Id: Ica07426cb413876d90a1b8ff49645c4711e15fc9
2018-06-07 17:32:23 -07:00
Colin Cross
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
TreeHugger Robot
b5b89acc09
Merge "Revert workaround for missing frame callback" into ub-launcher3-edmonton
2018-06-07 22:42:27 +00: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
53f22d98fe
Merge "Reapply back button alpha at end of state animation" into ub-launcher3-edmonton
2018-06-07 21:41:16 +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
9df4597f04
Merge "Do not execute controller callbacks, if controller is null" into ub-launcher3-edmonton
2018-06-07 20:57:41 +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
TreeHugger Robot
0c5cc11b91
Merge changes from topic "am-5a1fc777-28dd-40a0-967f-68b8f7176b2c" into ub-launcher3-master
...
* changes:
[automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2 am: f99417f8bb
[automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2
Reset state amanger, when switching from state animation to task launch animation
2018-06-06 18:55:20 +00:00
TreeHugger Robot
68a2d66add
Merge changes from topic "am-5a1fc777-28dd-40a0-967f-68b8f7176b2c" into ub-launcher3-edmonton-polish
...
* changes:
[automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2
Reset state amanger, when switching from state animation to task launch animation
2018-06-06 18:55:20 +00:00
TreeHugger Robot
f75fa0f8e2
Merge "Reset state amanger, when switching from state animation to task launch animation" into ub-launcher3-edmonton
2018-06-06 18:55:20 +00:00
TreeHugger Robot
108801840b
Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel"" into ub-launcher3-edmonton
2018-06-06 18:51:46 +00:00
Android Build Merger (Role)
be60722190
[automerger] Revert "Set mState = mCurrentStableState in onAnimationCancel" am: d6692cedff am: 69652337ef
...
Change-Id: I7c546b292b952ebb7a20696859a7dfc3ec084aa5
2018-06-06 18:48:01 +00:00