resolve merge conflicts of 2fd0208 to ub-launcher3-master

Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90
This commit is contained in:
Tony Wickham
2016-10-12 14:38:43 -07:00
18 changed files with 28 additions and 24 deletions

View File

@@ -53,7 +53,7 @@ public class OverviewAccessibilityDelegate extends AccessibilityDelegate {
@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
Launcher launcher = (Launcher) host.getContext();
Launcher launcher = Launcher.getLauncher(host.getContext());
if (action == OVERVIEW) {
launcher.showOverviewMode(true);
return true;