The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/30a59b170a4c51572fb5b996591d872ee0f39b3b

commit 30a59b170a4c51572fb5b996591d872ee0f39b3b
Author: Alex Newcomer <newcomer@chromium.org>
Date: Fri Jul 21 00:24:40 2017

cros: Added Launcher Animations

First round of launcher animations.
The launcher now animates from the bottom of the screen when it is
loaded.
The launcher also animates between states.
When the launcher is closed it keeps its old closing animation (for
now).

Round 2 changes:
Linking the launcher animation with the search result animation.
Jank improvements.

** Also in this CL: **

AppListView cleanup
AppListPresenterDelegateUnittest fixes
-Introduced HalfToPeekingByClickorTap to test for this use case.
-Refactored and parameterized TapAndClickOutsideClosesHalfAppList 

BUG= 735498 

Change-Id: I11bc0324f9b34d0257e6c08642f0bddb512fa4e4
Reviewed-on: https://chromium-review.googlesource.com/576257
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Yury Khmel <khmel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488513}
[modify] https://crrev.com/30a59b170a4c51572fb5b996591d872ee0f39b3b/ash/app_list/app_list_presenter_delegate_unittest.cc
[modify] https://crrev.com/30a59b170a4c51572fb5b996591d872ee0f39b3b/testing/buildbot/filters/ash_unittests_mash.filter
[modify] https://crrev.com/30a59b170a4c51572fb5b996591d872ee0f39b3b/ui/app_list/views/app_list_view.cc
[modify] https://crrev.com/30a59b170a4c51572fb5b996591d872ee0f39b3b/ui/app_list/views/app_list_view.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d556afc42246e1f9282e9339f607e6a97d97bfbd

commit d556afc42246e1f9282e9339f607e6a97d97bfbd
Author: Ken Rockot <rockot@chromium.org>
Date: Fri Jul 21 03:32:52 2017

Revert "cros: Added Launcher Animations"

This reverts commit 30a59b170a4c51572fb5b996591d872ee0f39b3b.

Reason for revert: Suspected cause of repeat failures such as https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/473789. Apologies if this speculative revert is incorrect.

Original change's description:
> cros: Added Launcher Animations
> 
> First round of launcher animations.
> The launcher now animates from the bottom of the screen when it is
> loaded.
> The launcher also animates between states.
> When the launcher is closed it keeps its old closing animation (for
> now).
> 
> Round 2 changes:
> Linking the launcher animation with the search result animation.
> Jank improvements.
> 
> ** Also in this CL: **
> 
> AppListView cleanup
> AppListPresenterDelegateUnittest fixes
> -Introduced HalfToPeekingByClickorTap to test for this use case.
> -Refactored and parameterized TapAndClickOutsideClosesHalfAppList 
> 
> BUG= 735498 
> 
> Change-Id: I11bc0324f9b34d0257e6c08642f0bddb512fa4e4
> Reviewed-on: https://chromium-review.googlesource.com/576257
> Commit-Queue: Alex Newcomer <newcomer@chromium.org>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Reviewed-by: Yury Khmel <khmel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#488513}

TBR=jamescook@chromium.org,khmel@chromium.org,newcomer@chromium.org

Change-Id: I7dbbb7feba9bdc3d46b13ef173476afcf7500415
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  735498 
Reviewed-on: https://chromium-review.googlesource.com/580430
Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488568}
[modify] https://crrev.com/d556afc42246e1f9282e9339f607e6a97d97bfbd/ash/app_list/app_list_presenter_delegate_unittest.cc
[modify] https://crrev.com/d556afc42246e1f9282e9339f607e6a97d97bfbd/testing/buildbot/filters/ash_unittests_mash.filter
[modify] https://crrev.com/d556afc42246e1f9282e9339f607e6a97d97bfbd/ui/app_list/views/app_list_view.cc
[modify] https://crrev.com/d556afc42246e1f9282e9339f607e6a97d97bfbd/ui/app_list/views/app_list_view.h

Issue 748533 has been merged into this issue.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/806d3e1ac063d19019e783a6fc64420e805831c0

commit 806d3e1ac063d19019e783a6fc64420e805831c0
Author: Alex Newcomer <newcomer@chromium.org>
Date: Wed Jul 26 16:00:25 2017

[RELAND] cros: Added Launcher Animations

Reason for revert: Bad test in AppListPresenterDelegateUnittest, 
whitespacequery. It was exposed by my CL, then fixed by someone else.

Here is the CL that fixed the broken test: 
https://chromium-review.googlesource.com/c/581567/

First round of launcher animations.
The launcher now animates from the bottom of the screen when it is
loaded.
The launcher also animates between states.
When the launcher is closed it keeps its old closing animation (for
now).

Round 2 changes:
Linking the launcher animation with the search result animation.
Jank improvements.

** Also in this CL: **

AppListView cleanup
AppListPresenterDelegateUnittest fixes
-Introduced HalfToPeekingByClickorTap to test for this use case.
-Refactored and parameterized TapAndClickOutsideClosesHalfAppList

BUG= 735498 

Reviewed-on: https://chromium-review.googlesource.com/576257
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Yury Khmel <khmel@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#488513}
Change-Id: Ic017fa6d38d3b1abe035136f57a26640c2bbd4ba
Reviewed-on: https://chromium-review.googlesource.com/584819
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#489658}
[modify] https://crrev.com/806d3e1ac063d19019e783a6fc64420e805831c0/ash/app_list/app_list_presenter_delegate_unittest.cc
[modify] https://crrev.com/806d3e1ac063d19019e783a6fc64420e805831c0/testing/buildbot/filters/ash_unittests_mash.filter
[modify] https://crrev.com/806d3e1ac063d19019e783a6fc64420e805831c0/ui/app_list/views/app_list_view.cc
[modify] https://crrev.com/806d3e1ac063d19019e783a6fc64420e805831c0/ui/app_list/views/app_list_view.h

This bug requires manual review: Reverts referenced in bugdroid comments after merge request.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), ketakid @(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Note that no merge to M61 is necessary. I tried using git drover on the reland and got an empty merge conflict, and this is probably due to the following sequence of events:

1. Original, reverted CL was landed pre-branch.
2. Revert CL was landed post-branch but not merged (thus original CL is in the branch)
3. Fix to the revert reason was landed post-branch and merged, thus no revert nor reland in the branch is necessary.

Approving merge to M61 and M62.

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot