Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "QS: Fix crash when removing pages in RTL" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-06-09 15:25:00 +00:00
committed by Android (Google) Code Review
parent ac2e291832 45233d6b10
commit 9b5a780722
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
View File

@@ -109,18 +109,18 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
if (mListening) {
if (mPosition != position) {
// Clear out the last pages from listening.
mPages.get(mPosition).setListening(false);
setPageListening(mPosition, false);
if (mOffPage) {
mPages.get(mPosition + 1).setListening(false);
setPageListening(mPosition + 1, false);
}
// Set the new pages to listening
mPages.get(position).setListening(true);
setPageListening(position, true);
if (offPage) {
mPages.get(position + 1).setListening(true);
setPageListening(position + 1, true);
}
} else if (mOffPage != offPage) {
// Whether we are showing position + 1 has changed.
mPages.get(mPosition + 1).setListening(offPage);
setPageListening(mPosition + 1, offPage);
}
}
// Save the current state.
@@ -128,6 +128,11 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
mOffPage = offPage;
}
private void setPageListening(int position, boolean listening) {
if (position >= mPages.size()) return;
mPages.get(position).setListening(listening);
}
@Override
public boolean hasOverlappingRendering() {
return false;