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

Commit 94483ac6 authored by cretin45's avatar cretin45 Committed by Matt Garnes
Browse files

Gallery2: Make grids scroll vertically by default 

- Can optionally be switched back to horizontal via overlay.

Change-Id: I666a2e7cfe95cba630171b6272eda9a786be4cb6
(cherry picked from commit fbf63465)
parent b9403120

res/values-xlarge/dimensions.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <!-- configuration for album set page -->

    <integer name="albumset_rows_land">3</integer>

    <integer name="albumset_rows_port">5</integer>

    <integer name="albumset_cols_land">5</integer>

    <integer name="albumset_cols_port">3</integer>

    <dimen name="albumset_title_font_size">14sp</dimen>

    <dimen name="albumset_count_font_size">11sp</dimen>

    <dimen name="albumset_title_right_margin">23dp</dimen>
@@ -30,4 +32,6 @@ 
    <!-- configuration for album page -->

    <integer name="album_rows_land">3</integer>

    <integer name="album_rows_port">5</integer>

    <integer name="album_cols_land">5</integer>

    <integer name="album_cols_port">3</integer>

</resources>

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,4 +23,6 @@ 
    <!-- Maximum recording length in milliseconds. 0 means unlimited. -->

    <integer name="max_video_recording_length">0</integer>

    <bool name="config_show_more_images">false</bool>



    <bool name="config_scroll_horizontal">false</bool>

</resources>

res/values/dimens.xml

+15 −5
Original line number Diff line number Diff line
@@ -112,9 +112,13 @@ 
    <!-- configuration for legacy album set page -->

    <integer name="albumset_rows_land">2</integer>

    <integer name="albumset_rows_port">3</integer>

    <dimen name="albumset_padding_top">7dp</dimen>

    <dimen name="albumset_padding_bottom">7dp</dimen>

    <dimen name="albumset_slot_gap">7dp</dimen>

    <integer name="albumset_cols_land">3</integer>

    <integer name="albumset_cols_port">2</integer>

    <dimen name="albumset_padding_top">3dp</dimen>

    <dimen name="albumset_padding_bottom">3dp</dimen>

    <dimen name="albumset_padding_left">3dp</dimen>

    <dimen name="albumset_padding_right">3dp</dimen>

    <dimen name="albumset_slot_gap">3dp</dimen>



    <dimen name="albumset_label_background_height">30dp</dimen>

    <dimen name="albumset_title_offset">10dp</dimen>
@@ -126,9 +130,15 @@ 
    <dimen name="albumset_icon_size">25dp</dimen>



    <!-- configuration for album page -->

    <integer name="album_rows_land">2</integer>

    <integer name="album_rows_land">3</integer>

    <integer name="album_rows_port">4</integer>

    <dimen name="album_slot_gap">5dp</dimen>

    <integer name="album_cols_land">6</integer>

    <integer name="album_cols_port">3</integer>

    <dimen name="album_padding_top">3dp</dimen>

    <dimen name="album_padding_bottom">3dp</dimen>

    <dimen name="album_padding_left">3dp</dimen>

    <dimen name="album_padding_right">3dp</dimen>

    <dimen name="album_slot_gap">3dp</dimen>



    <!-- configuration for manage page -->

    <dimen name="cache_pin_size">24dp</dimen>

src/com/android/gallery3d/app/AlbumPage.java

+9 −8
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
    private Path mMediaSetPath;

    private String mParentMediaSetString;

    private SlotView mSlotView;

    private Config.AlbumPage mConfig;



    private AlbumDataLoader mAlbumDataAdapter;
@@ -158,9 +159,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
        protected void onLayout(

                boolean changed, int left, int top, int right, int bottom) {



            int slotViewTop = mActivity.getGalleryActionBar().getHeight();

            int slotViewBottom = bottom - top;

            int slotViewRight = right - left;

            int slotViewTop = mActivity.getGalleryActionBar().getHeight() + mConfig.paddingTop;

            int slotViewBottom = bottom - top - mConfig.paddingBottom;

            int slotViewRight = right - left - mConfig.paddingRight;



            if (mShowDetails) {

                mDetailsHelper.layout(left, slotViewTop, right, bottom);
@@ -169,8 +170,8 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
            }



            // Set the mSlotView as a reference point to the open animation

            mOpenCenter.setReferencePosition(0, slotViewTop);

            mSlotView.layout(0, slotViewTop, slotViewRight, slotViewBottom);

            mOpenCenter.setReferencePosition(mConfig.paddingLeft, slotViewTop);

            mSlotView.layout(mConfig.paddingLeft, slotViewTop, slotViewRight, slotViewBottom);

            GalleryUtils.setViewPointMatrix(mMatrix,

                    (right - left) / 2, (bottom - top) / 2, -mUserDistance);

        }
@@ -504,10 +505,10 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
    private void initializeViews() {

        mSelectionManager = new SelectionManager(mActivity, false);

        mSelectionManager.setSelectionListener(this);

        Config.AlbumPage config = Config.AlbumPage.get(mActivity);

        mSlotView = new SlotView(mActivity, config.slotViewSpec);

        mConfig = Config.AlbumPage.get(mActivity);

        mSlotView = new SlotView(mActivity, mConfig.slotViewSpec);

        mAlbumView = new AlbumSlotRenderer(mActivity, mSlotView,

                mSelectionManager, config.placeholderColor);

                mSelectionManager, mConfig.placeholderColor);

        mSlotView.setSlotRenderer(mAlbumView);

        mRootPane.addComponent(mSlotView);

        mSlotView.setListener(new SlotView.SimpleListener() {

src/com/android/gallery3d/app/AlbumSetPage.java

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class AlbumSetPage extends ActivityState implements 


            int slotViewTop = mActionBar.getHeight() + mConfig.paddingTop;

            int slotViewBottom = bottom - top - mConfig.paddingBottom;

            int slotViewRight = right - left;

            int slotViewRight = right - left - mConfig.paddingRight;



            if (mShowDetails) {

                mDetailsHelper.layout(left, slotViewTop, right, bottom);
@@ -146,7 +146,7 @@ public class AlbumSetPage extends ActivityState implements 
                mAlbumSetView.setHighlightItemPath(null);

            }



            mSlotView.layout(0, slotViewTop, slotViewRight, slotViewBottom);

            mSlotView.layout(mConfig.paddingLeft, slotViewTop, slotViewRight, slotViewBottom);

        }



        @Override