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

Commit 08f52f19 authored by tobias's avatar tobias
Browse files

- fixed crashes due to support action bar

parent 023d054a

res/layout/text_field_view.xml

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
<org.dmfs.tasks.widget.TextFieldView xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/task_widget" >

    

    

    

    <LinearLayout ></LinearLayout>

    

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



    <TextView

res/menu/edit_task_activity_menu.xml

+4 −3
Original line number Diff line number Diff line 
<menu xmlns:android="http://schemas.android.com/apk/res/android" >

<menu xmlns:android="http://schemas.android.com/apk/res/android" 

    xmlns:app="http://schemas.android.com/apk/res-auto" >



    <item

        android:id="@+id/editor_action_cancel"

        android:icon="@drawable/content_remove"

        android:orderInCategory="99"

        android:showAsAction="always|withText"

        app:showAsAction="always|withText"

        android:title="@string/action_cancel"/>

    <item

        android:id="@+id/editor_action_save"

        android:icon="@drawable/navigation_accept"

        android:orderInCategory="100"

        android:showAsAction="always|withText"

        app:showAsAction="always|withText"

        android:title="@string/action_save"/>



</menu>
 
 No newline at end of file

res/menu/task_list_activity_menu.xml

+4 −3
Original line number Diff line number Diff line
@@ -10,13 +10,14 @@ 
        app:showAsAction="collapseActionView"/>

    <item

        android:id="@+id/menu_visible_list"

        android:title="@string/visible_task_lists">

        android:title="@string/visible_task_lists"

        app:showAsAction="never">

    </item>

    <item

        android:id="@+id/menu_alarms"

        android:checkable="true"

        android:showAsAction="never"

        android:title="@string/enable_alarms">

        android:title="@string/enable_alarms"

        app:showAsAction="never">

    </item>



</menu>
 
 No newline at end of file

res/menu/task_list_fragment_menu.xml

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

<menu xmlns:android="http://schemas.android.com/apk/res/android" >

<menu xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto" >



    <item

        android:id="@+id/menu_add_task"

        android:icon="@drawable/content_new"

        android:showAsAction="always"

        android:title="@string/menu_add_task"

        android:titleCondensed="@string/menu_add_task_condensed"/>

        android:titleCondensed="@string/menu_add_task_condensed"

        app:showAsAction="always"/>

    <item

        android:id="@+id/menu_show_completed"

        android:checkable="true"

        android:showAsAction="never"

        app:showAsAction="never"

        android:title="@string/menu_show_completed"

        android:titleCondensed="@string/menu_show_completed_condensed"/>

    <item

        android:id="@+id/menu_sync_now"

        android:showAsAction="never"

        app:showAsAction="never"

        android:title="@string/menu_sync_now"

        android:titleCondensed="@string/menu_sync_now_condensed"/>



    

</menu>
 
 No newline at end of file

res/menu/view_task_fragment_menu.xml

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

<menu xmlns:android="http://schemas.android.com/apk/res/android" >

<menu xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto" >



    <item

        android:id="@+id/complete_task"

        android:icon="@drawable/ic_action_complete"

        android:showAsAction="always"

        android:title="@string/activity_task_details_complete_task"

        android:titleCondensed="@string/activity_task_details_complete"> <!-- TODO: add dedicated string! -->

        android:titleCondensed="@string/activity_task_details_complete"

        app:showAsAction="always"> <!-- TODO: add dedicated string! -->

    </item>

    <item

        android:id="@+id/edit_task"

        android:icon="@drawable/content_edit"

        android:showAsAction="always"

        android:title="@string/activity_task_details_edit_task"

        android:titleCondensed="@string/activity_task_details_edit">

        android:titleCondensed="@string/activity_task_details_edit"

        app:showAsAction="always">

    </item>

    <item

        android:id="@+id/delete_task"

        android:icon="@drawable/content_discard"

        android:showAsAction="always"

        android:title="@string/activity_task_details_delete_task"

        android:titleCondensed="@string/activity_task_details_delete">

        android:titleCondensed="@string/activity_task_details_delete"

        app:showAsAction="always">

    </item>



</menu>
 
 No newline at end of file