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

Commit 0d94b210 authored by Ray Chen's avatar Ray Chen
Browse files

resolved conflicts for merge of 71c8cbb7 to master 

Change-Id: Ia5dc7bc54bba46218a53959076777e695ebb9dfe
parents fbfa7336 71c8cbb7

res/menu/operation.xml

+9 −9
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
            android:icon="@drawable/ic_menu_trash_holo_light"

            android:title="@string/delete"

            android:visible="false"

            android:showAsAction="ifRoom">

            android:showAsAction="never">

        <menu>

            <item android:id="@+id/action_confirm_delete"

                    android:icon="@drawable/ic_menu_trash_holo_light"
@@ -40,8 +40,8 @@ 
                    android:title="@string/cancel" />

        </menu>

    </item>

    <item android:id="@+id/action_show_on_map"

            android:title="@string/show_on_map"

    <item android:id="@+id/action_edit"

            android:title="@string/edit"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_rotate_ccw"
@@ -52,21 +52,21 @@ 
            android:showAsAction="never"

            android:visible="false"

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

    <item android:id="@+id/action_setas"

            android:title="@string/set_image"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_crop"

            android:title="@string/crop_action"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_setas"

            android:title="@string/set_image"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_details"

            android:icon="@drawable/ic_menu_info_details"

            android:title="@string/details"

            android:visible="false"

            android:showAsAction="never" />

    <item android:id="@+id/action_edit"

            android:title="@string/edit"

    <item android:id="@+id/action_show_on_map"

            android:title="@string/show_on_map"

            android:showAsAction="never"

            android:visible="false" />

</menu>

res/menu/photo.xml

+12 −12
Original line number Diff line number Diff line
@@ -44,26 +44,26 @@ 
            android:icon="@drawable/ic_menu_slideshow_holo_light"

            android:title="@string/slideshow"

            android:showAsAction="never" />

    <item android:id="@+id/action_details"

            android:title="@string/details"

            android:showAsAction="never" />

    <item android:id="@+id/action_show_on_map"

            android:title="@string/show_on_map"

            android:showAsAction="never" />

    <item android:id="@+id/action_edit"

            android:title="@string/edit"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_rotate_ccw"

            android:showAsAction="never"

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

    <item android:id="@+id/action_rotate_cw"

            android:showAsAction="never"

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

    <item android:id="@+id/action_crop"

            android:title="@string/crop_action"

            android:showAsAction="never" />

    <item android:id="@+id/action_details"

            android:title="@string/details"

            android:showAsAction="never" />

    <item android:id="@+id/action_setas"

            android:title="@string/set_image"

            android:showAsAction="never" />

    <item android:id="@+id/action_crop"

            android:title="@string/crop_action"

    <item android:id="@+id/action_show_on_map"

            android:title="@string/show_on_map"

            android:showAsAction="never" />

    <item android:id="@+id/action_edit"

            android:title="@string/edit"

            android:showAsAction="never"

            android:visible="false" />

</menu>