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

Commit ee68a5a2 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge branch 'master' of /home/stefan/StudioProjects/nextcloud-notes with conflicts.

parent 026f06f2

app/src/main/res/layout/activity_edit.xml

+10 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"

    android:orientation="vertical"

    tools:context="it.niedermann.owncloud.notes.android.activity.EditNoteActivity">
@@ -10,7 +11,9 @@ 
        android:id="@+id/editContent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@null"

        android:ems="10"

        android:gravity="top"

        android:inputType="textMultiLine|textCapSentences"

        android:padding="16dp"

        android:textColor="@color/fg_default" />