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

Commit 541315cd authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android (Google) Code Review
Browse files

Revert "Add a overflow menu item to view 360-degree panorama." 

This reverts commit d84ae72a

Change-Id: I5921cbb476034da2798480534e9084e287312f04
parent d84ae72a

res/menu/operation.xml

+4 −6
Original line number Diff line number Diff line
@@ -27,17 +27,15 @@ 
            android:title="@string/share_panorama"

            android:visible="false"

            android:actionProviderClass="android.widget.ShareActionProvider"

            android:showAsAction="ifRoom" />

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

            android:title="@string/view_panorama"

            android:showAsAction="never"

            android:visible="false" />

            android:showAsAction="ifRoom">

    </item>

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

            android:icon="@drawable/ic_menu_share_holo_light"

            android:title="@string/share"

            android:visible="false"

            android:actionProviderClass="android.widget.ShareActionProvider"

            android:showAsAction="never" />

            android:showAsAction="never">

    </item>

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

            android:icon="@drawable/ic_menu_trash_holo_light"

            android:title="@string/delete"

res/menu/photo.xml

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
            android:visible="false"

            android:actionProviderClass="android.widget.ShareActionProvider"

            android:showAsAction="ifRoom" />

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

            android:title="@string/view_panorama"

            android:showAsAction="never" />

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

            android:icon="@drawable/ic_menu_share_holo_light"

            android:title="@string/share"

res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 
    <string name="cancel">Cancel</string>

    <string name="share">Share</string>

    <string name="share_panorama">Share panorama</string>

    <string name="view_panorama">View in 360\u00b0</string>

    <string name="share_as_photo">Share as photo</string>



    <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->

src/com/android/gallery3d/app/PhotoPage.java

+0 −4
Original line number Diff line number Diff line
@@ -939,10 +939,6 @@ public class PhotoPage extends ActivityState implements 
                mMenuExecutor.onMenuClicked(item, confirmMsg,

                        new ImportCompleteListener(mActivity));

                return true;

            case R.id.action_view_panorama:

                LightCycleHelper.viewPanorama(mActivity,

                        manager.getContentUri(path));

                return true;

            default :

                return false;

        }

src/com/android/gallery3d/ui/MenuExecutor.java

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ public class MenuExecutor { 
        setMenuItemVisible(menu, R.id.action_crop, supportCrop);

        setMenuItemVisible(menu, R.id.action_trim, supportTrim);

        setMenuItemVisible(menu, R.id.action_share_panorama, supportSharePanorama);

        setMenuItemVisible(menu, R.id.action_view_panorama, supportSharePanorama);

        setMenuItemVisible(menu, R.id.action_share, supportShare);

        setMenuItemVisible(menu, R.id.action_setas, supportSetAs);

        setMenuItemVisible(menu, R.id.action_show_on_map, supportShowOnMap);