Gallery2: Remove some menu items in editor interface.

Remove information, print menu items and change content of reset
item to "Back to original" in editor interface according to UX
specification document.

Change-Id: I1c75be02f388f6796eb9dd947afa9f8103c841f6
CRs-Fixed: 988055

3 files changed, 1 insertions, 23 deletions

diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 9a16e03d4..d52c003a9 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -19,11 +19,6 @@
     <item
         android:id="@+id/resetHistoryButton"
         android:title="@string/reset"/>
-    <item
-        android:id="@+id/showInfoPanel"
-        android:showAsAction="never"
-        android:visible="true"
-        android:title="@string/filtershow_show_info_panel" />
 <!--     <item -->
 <!--         android:id="@+id/showImageStateButton" -->
 <!--         android:showAsAction="never" -->
@@ -39,9 +34,4 @@
         android:showAsAction="never"
         android:visible="true"
         android:title="@string/export_image" />
-    <item
-        android:id="@+id/printButton"
-        android:showAsAction="never"
-        android:visible="true"
-        android:title="@string/print_image"/>
 </menu>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 234ed78e4..d3a4e7cee 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -90,7 +90,7 @@
     <!--  Text for the history panel title [CHAR LIMIT=50] -->
     <string name="history">History</string>
     <!--  Text for the history panel reset button [CHAR LIMIT=20]-->
-    <string name="reset">Reset</string>
+    <string name="reset">Back to original</string>
     <!--  Text for the original image[CHAR LIMIT=20]-->
     <string name="history_original">@string/original</string>
 
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 7cf8e992b..ce2ab7412 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -1355,10 +1355,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         //MenuItem undoItem = mMenu.findItem(R.id.undoButton);
         //MenuItem redoItem = mMenu.findItem(R.id.redoButton);
         MenuItem resetItem = mMenu.findItem(R.id.resetHistoryButton);
-        MenuItem printItem = mMenu.findItem(R.id.printButton);
-        if (!PrintHelper.systemSupportsPrint()) {
-            printItem.setVisible(false);
-        }
         //mMasterImage.getHistory().setMenuItems(undoItem, redoItem, resetItem);
     }
 
@@ -1421,14 +1417,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
                 manageUserPresets();
                 return true;
             }
-            case R.id.showInfoPanel: {
-                toggleInformationPanel();
-                return true;
-            }
-            case R.id.printButton: {
-                print();
-                return true;
-            }
         }
         return false;
     }