resolved conflicts for merge of 9fc953b9 to ub-launcher3-master

Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1
This commit is contained in:
Sunny Goyal
2015-08-17 14:43:41 -07:00
29 changed files with 86 additions and 111 deletions

View File

@@ -2258,7 +2258,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
// Besides disabling the accessibility long-click, this also prevents this view from getting
// accessibility focus.
info.setLongClickable(false);
if (Utilities.isLmpOrAbove()) {
if (Utilities.ATLEAST_LOLLIPOP) {
info.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK);
}
}