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

Commit cf93228c authored by tobias's avatar tobias
Browse files

Merge branch 'material' of ssh://git.dmfs.org:23023/android-tasks/tasks into material

parents 68cb2fad d563c9e0

res/layout/checklist_field_editor.xml

+3 −17
Original line number Diff line number Diff line
@@ -2,28 +2,14 @@ 
<org.dmfs.tasks.widget.CheckListFieldEditor xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/task_widget" >



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal" >



        <TextView

            android:id="@android:id/title"

            style="@style/editor_label_text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:paddingLeft="12dip"

            android:singleLine="true" />

    </LinearLayout>

    <include layout="@layout/editor_header" />



    <LinearLayout

        android:id="@+id/checklist"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical" >

        android:orientation="vertical"

        android:paddingTop="8dp" >



        <!-- Add empty element -->

res/layout/editor_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
        android:layout_marginBottom="-8dip"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        android:paddingLeft="12dip"

        android:paddingLeft="4dip"

        android:singleLine="true" />



</merge>
 
 No newline at end of file

res/values-v11/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    </style>



    <style name="detail_label_line">

        <item name="android:background">@android:color/darker_gray</item>

        <item name="android:background">@android:color/transparent</item>

    </style>



    <style name="dark_edit_text" parent="dark_text">

res/values-v14/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ 
    </style>



    <style name="detail_label_text">

        <item name="android:textColor">@android:color/holo_blue_light</item>

        <item name="android:textColor">@android:color/darker_gray</item>

    </style>



    <style name="detail_label_line">

        <item name="android:background">@android:color/holo_blue_light</item>

        <item name="android:background">@android:color/transparent</item>

    </style>



    <style name="editor_label_text">