Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e73ef37 authored by Jason Monk's avatar Jason Monk
Browse files

Fix QS crash with RTL rotate 

Set the adapter after changes because we do some weird stuff in
the way pages are generated.

Change-Id: I8fd2cda3ad7e4e523731f1ba8628b661cf8a7a69
Fixes: 28317442
parent 42791eca

packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java

+7 −2
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
            TileRecord tile = mTiles.get(i);

            if (mPages.get(index).isFull()) {

                if (++index == mPages.size()) {

                    if (DEBUG) Log.d(TAG, "Adding page for " + tile.tile.getClass().getSimpleName());

                    if (DEBUG) Log.d(TAG, "Adding page for "

                            + tile.tile.getClass().getSimpleName());

                    mPages.add((TilePage) LayoutInflater.from(mContext)

                            .inflate(R.layout.qs_paged_page, this, false));

                }
@@ -145,7 +146,12 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
        }

        if (mNumPages != index + 1) {

            mNumPages = index + 1;

            while (mPages.size() > mNumPages) {

                mPages.remove(mPages.size() - 1);

            }

            if (DEBUG) Log.d(TAG, "Size: " + mNumPages);

            mPageIndicator.setNumPages(mNumPages);

            setAdapter(mAdapter);

            mAdapter.notifyDataSetChanged();

            setCurrentItem(0, false);

        }
@@ -231,7 +237,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
    private final PagerAdapter mAdapter = new PagerAdapter() {

        public void destroyItem(ViewGroup container, int position, Object object) {

            if (DEBUG) Log.d(TAG, "Destantiating " + position);

            // TODO: Find way to clean up the extra pages.

            container.removeView((View) object);

        }