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

Commit 73c303e9 authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

Trebuchet: Sync "maxExternal" preferences and its defaults values 



Change-Id: If6f70d75a9a2e5ea044e68dcaf906748bd09a53e
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent 0827ce7a

res/xml/preferences_dock.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        android:summary="@string/preferences_interface_dock_default_page_summary"

        android:defaultValue="1"

        launcher:maxExternal="ui_dock_pages"

        launcher:max="3"

        launcher:max="1"

        launcher:min="1" />

    <!-- android:dependency="ui_dock_enabled" /-->

    <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_dock_icons"

res/xml/preferences_homescreen.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
            android:summary="@string/preferences_interface_homescreen_general_default_screen_summary"

            android:defaultValue="3"

            launcher:maxExternal="ui_homescreen_screens"

            launcher:max="7"

            launcher:max="5"

            launcher:min="1" />

        <CheckBoxPreference android:key="ui_homescreen_stretch_screens"

            android:title="@string/preferences_interface_homescreen_general_stretch_screens_title"

src/com/cyanogenmod/trebuchet/Hotseat.java

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ public class Hotseat extends PagedView { 
    private float[] mTempCellLayoutCenterCoordinates = new float[2];

    private Matrix mTempInverseMatrix = new Matrix();



    private static final int DEFAULT_PAGE = 0;



    private static final int DEFAULT_CELL_COUNT = 5;



    public Hotseat(Context context) {
@@ -57,7 +59,7 @@ public class Hotseat extends PagedView { 
        mHandleScrollIndicator = true;



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

        int defaultPage = PreferencesProvider.Interface.Dock.getDefaultPage(hotseatPages / 2);

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

        if (defaultPage >= hotseatPages) {

            defaultPage = hotseatPages / 2;

        }

src/com/cyanogenmod/trebuchet/Workspace.java

+3 −1
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ public class Workspace extends PagedView 
    private SpringLoadedDragController mSpringLoadedDragController;

    private float mSpringLoadedShrinkFactor;



    private static final int DEFAULT_HOMESCREEN = 2;



    private static final int DEFAULT_CELL_COUNT_X = 4;

    private static final int DEFAULT_CELL_COUNT_Y = 4;
@@ -385,7 +387,7 @@ public class Workspace extends PagedView 


        // Preferences

        mNumberHomescreens = PreferencesProvider.Interface.Homescreen.getNumberHomescreens();

        mDefaultHomescreen = PreferencesProvider.Interface.Homescreen.getDefaultHomescreen(mNumberHomescreens / 2);

        mDefaultHomescreen = PreferencesProvider.Interface.Homescreen.getDefaultHomescreen(DEFAULT_HOMESCREEN);

        if (mDefaultHomescreen >= mNumberHomescreens) {

            mDefaultHomescreen = mNumberHomescreens / 2;

        }