Merge commit '5c6bdbbc27525acc8c49cea6a1de36723a13fac7' into manual_merge_5c6bdbbc

Change-Id: I508bce36edca28ed565338e5173b64eba14e89d4
This commit is contained in:
Winson
2015-09-09 17:06:09 -07:00
2 changed files with 18 additions and 7 deletions

View File

@@ -290,6 +290,15 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
}
}
/**
* Resets the state of AllApps.
*/
public void reset() {
// Reset the search bar and base recycler view after transitioning home
mSearchBarController.reset();
mAppsRecyclerView.reset();
}
@Override
protected void onFinishInflate() {
super.onFinishInflate();
@@ -555,9 +564,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
@Override
public void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace) {
if (toWorkspace) {
// Reset the search bar and base recycler view after transitioning home
mSearchBarController.reset();
mAppsRecyclerView.reset();
reset();
}
}