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

Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1
2015-08-17 14:43:41 -07:00
parent 017a5c1e65 9fc953b94d
commit c268148f06
29 changed files with 86 additions and 111 deletions
@@ -2021,7 +2021,7 @@ public class Workspace extends PagedView
    }

    public void updateAccessibilityFlags() {
-        if (Utilities.isLmpOrAbove()) {
+        if (Utilities.ATLEAST_LOLLIPOP) {
            int total = getPageCount();
            for (int i = numCustomPages(); i < total; i++) {
                updateAccessibilityFlags((CellLayout) getPageAt(i), i);