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

Commit 8ade16da authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Expose delete button in action bar in portrait. 

bug:6411759
Change-Id: I135edad5ab7d1194c774e7d5ee680cf3ba3206ad
parent 68e76bd4

res/menu-land/photo.xml

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 Google Inc.



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

            android:title="@string/Import"

            android:icon="@drawable/ic_menu_ptp_holo_light"

            android:showAsAction="always|withText"

            android:visible="false" />

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

            android:icon="@drawable/ic_menu_share_holo_light"

            android:title="@string/share"

            android:enabled="true"

            android:actionProviderClass="android.widget.ShareActionProvider"

            android:visible="false"

            android:showAsAction="ifRoom" />

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

            android:icon="@drawable/ic_menu_trash_holo_light"

            android:title="@string/delete"

            android:visible="false"

            android:showAsAction="ifRoom" />

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

            android:icon="@drawable/ic_menu_slideshow_holo_light"

            android:title="@string/slideshow"

            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_setas"

            android:title="@string/set_image"

            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" />

</menu>

res/menu/photo.xml

+4 −4
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="never" />

            android:showAsAction="ifRoom" />

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

            android:icon="@drawable/ic_menu_slideshow_holo_light"

            android:title="@string/slideshow"
@@ -48,12 +48,12 @@ 
    <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_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" />