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

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

Merge "Add custom border text" into gb-ub-photos-carlsbad

parents 2d933002 521e94c8

res/values/filtershow_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
    <string name="saved">Saved</string>

    <!--  Text for filters that apply a border to a picture [CHAR LIMIT=20] -->

    <string name="borders" msgid="4461692156695893616">Borders</string>

    <!-- Text for the custom border filter [CHAR LIMIT=20] -->

    <string name="custom_border">Custom</string>



    <!--  actionbar menu -->

src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java

+4 −1
Original line number Diff line number Diff line
@@ -126,8 +126,11 @@ public class FilterColorBorderRepresentation extends FilterRepresentation { 


    @Override

    public int getTextId() {

        if (super.getTextId() == 0) {

            return R.string.borders;

        }

        return super.getTextId();

    }



    public int getColor() {

        return mParamColor.getValue();