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

Commit 705e67b3 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix QS crash with RTL rotate" into nyc-dev 

am: 4a19a204

* commit '4a19a204':
  Fix QS crash with RTL rotate

Change-Id: I53b42f85cc1dd435fa1582c3435c5e6cf6ce1938
parents ce8c2168 4a19a204

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

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

            TileRecord tile = mTiles.get(i);

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

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

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

                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)

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

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

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

                }

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

        }

        if (mNumPages != index + 1) {

        if (mNumPages != index + 1) {

            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);

            mPageIndicator.setNumPages(mNumPages);

            setAdapter(mAdapter);

            mAdapter.notifyDataSetChanged();

            mAdapter.notifyDataSetChanged();

            setCurrentItem(0, false);

            setCurrentItem(0, false);

        }

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

    private final PagerAdapter mAdapter = new PagerAdapter() {

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

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

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

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

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

            container.removeView((View) object);

            container.removeView((View) object);

        }

        }