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

Commit 4d1c49cb authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Improves portrait categories buttons" into gb-ub-photos-carlsbad

parents 8d90cb8d 2332f652

res/values-large/filtershow_values.xml

+6 −0
Original line number Diff line number Diff line
@@ -23,4 +23,10 @@ 


    <!-- Category Panel Icon Size -->

    <dimen name="category_panel_icon_size">72dip</dimen>



    <!-- Category Panel Text Size -->

    <dimen name="category_panel_text_size">14dip</dimen>



    <!-- Category Panel Text Size -->

    <dimen name="category_panel_margin">4dip</dimen>

</resources>
 
 No newline at end of file

res/values-xlarge/filtershow_values.xml

+6 −0
Original line number Diff line number Diff line
@@ -23,4 +23,10 @@ 


    <!-- Category Panel Icon Size -->

    <dimen name="category_panel_icon_size">84dip</dimen>



    <!-- Category Panel Text Size -->

    <dimen name="category_panel_text_size">14dip</dimen>



    <!-- Category Panel Text Size -->

    <dimen name="category_panel_margin">4dip</dimen>

</resources>
 
 No newline at end of file

res/values/filtershow_values.xml

+7 −0
Original line number Diff line number Diff line
@@ -26,4 +26,11 @@ 


    <!-- Category Panel Icon Size -->

    <dimen name="category_panel_icon_size">64dip</dimen>



    <!-- Category Panel Text Size -->

    <dimen name="category_panel_text_size">13dip</dimen>



    <!-- Category Panel Text Size -->

    <dimen name="category_panel_margin">4dip</dimen>



</resources>
 
 No newline at end of file

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -351,9 +351,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 
        Resources res = getResources();

        FiltersManager.setResources(res);



        CategoryView.setMargin((int) getPixelsFromDip(8));

        CategoryView.setTextSize((int) getPixelsFromDip(16));



        // TODO: get those values from XML.

        FramedTextButton.setTextSize((int) getPixelsFromDip(14));

        FramedTextButton.setTrianglePadding((int) getPixelsFromDip(4));

src/com/android/gallery3d/filtershow/category/Action.java

+3 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class Action implements RenderingRequestCaller { 
        mName = name;

    }



    public void setImageFrame(Rect imageFrame) {

    public void setImageFrame(Rect imageFrame, int orientation) {

        if (mImageFrame != null && mImageFrame.equals(imageFrame)) {

            return;

        }
@@ -81,7 +81,8 @@ public class Action implements RenderingRequestCaller { 
            mImageFrame = imageFrame;

            int w = mImageFrame.width();

            int h = mImageFrame.height();

            if (mType == CROP_VIEW) {

            if (orientation == CategoryView.VERTICAL

                && mType == CROP_VIEW) {

                w /= 2;

            }

            Bitmap bitmapCrop = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);