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

Commit b0ddd3fd authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-q' into q-e-theme-implementation

parents c444b4b3 91f10e03

jni_jpegstream/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ include $(CLEAR_VARS) 


LOCAL_MODULE        := libjni_gallery_jpegstream



LOCAL_NDK_STL_VARIANT := c++_static



LOCAL_C_INCLUDES := $(LOCAL_PATH) \

                    $(LOCAL_PATH)/src

res/values-gd/filtershow_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
    <string name="filtershow_notification_label">A’ sàbhaladh an deilbh</string>

    <string name="filtershow_notification_message">’Ga phròiseasadh…</string>

    <string name="filtershow_save_preset">Sàbhail an ro-sheata làithreach</string>

    <string name="filtershow_manage_preset">Stiùirich ro-sheataichean a’ chleachdaiche</string>

    <string name="filtershow_manage_preset">Stiùir ro-sheataichean a’ chleachdaiche</string>

    <string name="filtershow_new_preset">Ro-sheata ùr</string>

    <string name="filtershow_preset_name">Ainm an ro-sheata</string>

    <string name="filtershow_show_info_panel">Fiosrachadh</string>

res/values-gd/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ 
    <string name="accessibility_mode_picker">Taghadh a’ chamara, a’ video no a’ chuairt-sheallaidh</string>

    <string name="accessibility_second_level_indicators">Barrachd uidheaman-smachd nan roghainnean</string>

    <string name="accessibility_back_to_first_level">Dùin uidheaman-smachd nan roghainnean</string>

    <string name="accessibility_zoom_control">Stiùirich an t-sùm</string>

    <string name="accessibility_zoom_control">Stiùir an t-sùm</string>

    <string name="accessibility_decrement">Lùghdaich %1$s</string>

    <string name="accessibility_increment">Meudaich %1$s</string>

    <string name="accessibility_check_box">Bogsa-cromaige %1$s</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ public class FilterShowActivity extends AbstractPermissionActivity implements On 


        if (representation instanceof FilterRotateRepresentation) {

            FilterRotateRepresentation r = (FilterRotateRepresentation) representation;

            r.rotateCW();

            r.rotateCCW();

        }

        if (representation instanceof FilterMirrorRepresentation) {

            FilterMirrorRepresentation r = (FilterMirrorRepresentation) representation;

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

+17 −0
Original line number Diff line number Diff line
@@ -103,6 +103,23 @@ public class FilterRotateRepresentation extends FilterRepresentation { 
        }

    }



    public void rotateCCW() {

        switch(mRotation) {

            case ZERO:

                mRotation = Rotation.TWO_SEVENTY;

                break;

            case NINETY:

                mRotation = Rotation.ZERO;

                break;

            case ONE_EIGHTY:

                mRotation = Rotation.NINETY;

                break;

            case TWO_SEVENTY:

                mRotation = Rotation.ONE_EIGHTY;

                break;

        }

    }



    public void set(FilterRotateRepresentation r) {

        mRotation = r.mRotation;

    }