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

Unverified Commit 7396a2d3 authored by Marten Gajda's avatar Marten Gajda Committed by GitHub
Browse files

Partially restore 5f4e9012, fixes #711 (#712) 

Commit 5f4e9012 contains a couple of changes which break the UI in that some elements don't respond to clicks anymore.
In particular the `focusable="true"` attribute seems to cause these issues. For now we simply revert the addition of these attributes.
In another story we should address the issue and fix the layout.
parent 97d16907

opentasks/src/main/res/layout/activity_manage_task_list.xml

+2 −4
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
            android:paddingEnd="16dp"

            android:paddingLeft="16dp"

            android:paddingRight="16dp"

            android:paddingStart="16dp"

            android:focusable="true">

            android:paddingStart="16dp">



        <TextView

                style="@style/TextAppearance.AppCompat.Subhead"
@@ -45,8 +44,7 @@ 
            android:paddingEnd="16dp"

            android:paddingLeft="16dp"

            android:paddingRight="16dp"

            android:paddingStart="16dp"

            android:focusable="true">

            android:paddingStart="16dp">



        <TextView

                style="@style/TextAppearance.AppCompat.Subhead"

opentasks/src/main/res/layout/checklist_field_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
                android:layout_marginLeft="-8dp"

                android:clickable="true"

                android:gravity="center_vertical"

                android:orientation="horizontal"

                android:focusable="true">

                android:orientation="horizontal">



            <ImageView

                    android:id="@+id/drag_handle"

opentasks/src/main/res/layout/fragment_quick_add_dialog_header.xml

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 
                android:background="?attr/selectableItemBackground"

                android:clickable="true"

                android:padding="8dp"

                android:src="@drawable/content_edit"

                android:focusable="true"/>

                android:src="@drawable/content_edit"/>

    </LinearLayout>



    <Spinner

opentasks/src/main/res/layout/opentasks_location_field_view.xml

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<org.dmfs.tasks.widget.LocationFieldView xmlns:android="http://schemas.android.com/apk/res/android"

        android:clickable="true"

        style="@style/task_widget"

        android:focusable="true">

        style="@style/task_widget">



    <!-- TODO Touch feedback could be added later (android:background="?android:attr/selectableItemBackground" requires min API 11)-->

opentasks/src/main/res/layout/task_list_group.xml

+2 −3
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ 
            android:clickable="true"

            android:padding="8dp"

            android:src="@drawable/ic_24_plus_black50"

            android:visibility="gone"

            android:focusable="true"/>

            android:visibility="gone"/>



    <View

            android:id="@+id/divider"