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

Commit 742d2cff authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.2'

parents a1d4f284 73803da5

res/values/codeaurora_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -140,4 +140,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    <string name="trim_video_exit_title">Discard changes?</string>

    <string name="trim_video_exit_msg">Discard the changes made to this video?</string>

    <string name="trim_video_exit_discard">DISCARD</string>



    <!-- Used in a toast message when selecting the Watermark tool -->

    <string name="watermark_must_be_only">Watermark must be the only edit</string>

</resources>

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

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ public class MainPanel extends Fragment implements BottomPanel.BottomPanelDelega 
                    waterMarkButton.setVisibility(View.VISIBLE);

                    showPanel(WATERMARK);

                } else {

                    Toast.makeText(getActivity(), "Watermark only support single edit",

                    Context context = getActivity();

                    Toast.makeText(context, R.string.watermark_must_be_only,

                            Toast.LENGTH_SHORT).show();

                    waterMarkButton.setVisibility(View.GONE);

                }