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

Commit 39060740 authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

Trebuchet: Fix Landscape/TransposeLayoutWithOrientation move to default page 

Change-Id: I5906ee6af855d9ed17f51e9ee94d53058c67812e
JIRA: CYAN-1246
Issue: https://jira.cyanogenmod.org/browse/CYAN-1246


Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent 73c303e9

src/com/cyanogenmod/trebuchet/Hotseat.java

+9 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.cyanogenmod.trebuchet.preference.PreferencesProvider; 
public class Hotseat extends PagedView {

    private int mCellCount;



    private int mHotseatPages;

    private int mDefaultPage;



    private boolean mTransposeLayoutWithOrientation;
@@ -58,10 +59,10 @@ public class Hotseat extends PagedView { 
        mFadeInAdjacentScreens = false;

        mHandleScrollIndicator = true;



        int hotseatPages = PreferencesProvider.Interface.Dock.getNumberPages();

        mHotseatPages = PreferencesProvider.Interface.Dock.getNumberPages();

        int defaultPage = PreferencesProvider.Interface.Dock.getDefaultPage(DEFAULT_PAGE);

        if (defaultPage >= hotseatPages) {

            defaultPage = hotseatPages / 2;

        if (defaultPage >= mHotseatPages) {

            defaultPage = mHotseatPages / 2;

        }



        mCurrentPage = mDefaultPage = defaultPage;
@@ -91,7 +92,7 @@ public class Hotseat extends PagedView { 


        LayoutInflater inflater =

                (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

        for (int i = 0; i < hotseatPages; i++) {

        for (int i = 0; i < mHotseatPages; i++) {

            CellLayout cl = (CellLayout) inflater.inflate(R.layout.hotseat_page, null);

            cl.setChildrenScale(childrenScale);

            cl.setGridSize((!hasVerticalHotseat() ? mCellCount : 1), (hasVerticalHotseat() ? mCellCount : 1));
@@ -263,12 +264,13 @@ public class Hotseat extends PagedView { 
    }



    void moveToDefaultScreen(boolean animate) {

        int page = hasVerticalHotseat() ? (mHotseatPages - mDefaultPage - 1) : mDefaultPage;

        if (animate) {

            snapToPage(mDefaultPage);

            snapToPage(page);

        } else {

            setCurrentPage(mDefaultPage);

            setCurrentPage(page);

        }

        getChildAt(mDefaultPage).requestFocus();

        getChildAt(page).requestFocus();

    }



    @Override