aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 18:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixing homescreen getting blank when returning from the overlay" into ub-launcher3-calgary

Browse Source
This commit is contained in:
Sunny Goyal
2016-03-01 01:07:38 +00:00
committed by Android (Google) Code Review
parent 061380a04d ee68816be8
commit e670159cfe
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/launcher3/PagedView.java
View File

@@ -1042,24 +1042,25 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
}
protected void getVisiblePages(int[] range) {
final int pageCount = getChildCount();
final int count = getChildCount();
range[0] = -1;
range[1] = -1;
if (pageCount > 0) {
int lastVisiblePageIndex = 0;
if (count > 0) {
final int visibleLeft = -getLeft();
final int visibleRight = visibleLeft + getViewportWidth();
final Matrix pageShiftMatrix = getPageShiftMatrix();
int curScreen = 0;
for (int currPageIndex = 0; currPageIndex < pageCount; currPageIndex++) {
View currPage = getPageAt(currPageIndex);
for (int i = 0; i < count; i++) {
View currPage = getPageAt(i);
// Verify if the page bounds are within the visible range.
sTmpRectF.left = 0;
sTmpRectF.right = currPage.getMeasuredWidth();
currPage.getMatrix().mapRect(sTmpRectF);
sTmpRectF.offset(currPage.getLeft() - getScrollX(), 0);
getMatrix().mapRect(sTmpRectF);
pageShiftMatrix.mapRect(sTmpRectF);
if (sTmpRectF.left > visibleRight || sTmpRectF.right < visibleLeft) {
if (range[0] == -1) {
@@ -1068,19 +1069,23 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
break;
}
}
curScreen = i;
if (range[0] < 0) {
range[0] = currPageIndex;
range[0] = curScreen;
}
lastVisiblePageIndex = currPageIndex;
}
range[1] = lastVisiblePageIndex;
range[1] = curScreen;
} else {
range[0] = -1;
range[1] = -1;
}
}
protected Matrix getPageShiftMatrix() {
return getMatrix();
}
protected boolean shouldDrawChild(View child) {
return child.getVisibility() == VISIBLE;
}