From 32e91ad17313c1298f49459704d1de2a2da94537 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 24 Jul 2013 20:06:20 -0700
Subject: Added support to export to a flattened photo.

Bug: 10008212

- Adds a menu item to allow a photo with edits to be flattened
  into a separate photo.
- Fixes bug where crop intents fail to save cropped images.

Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
---
 res/menu/filtershow_activity_menu.xml | 5 +++++
 res/values/filtershow_strings.xml     | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 0a8f4e97a..cf083de9f 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -24,4 +24,9 @@
         android:showAsAction="never"
         android:visible="true"
         android:title="@string/show_imagestate_panel" />
+    <item
+        android:id="@+id/exportFlattenButton"
+        android:showAsAction="never"
+        android:visible="true"
+        android:title="@string/export_flattened" />
 </menu>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 0a33108ad..503ebbb34 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -47,6 +47,9 @@
     <string name="show_imagestate_panel">Show Applied Effects</string>
     <!--  Text for the image state panel menu item [CHAR LIMIT=30] -->
     <string name="hide_imagestate_panel">Hide Applied Effects</string>
+    <!--  Text for the menu item to export a flattened photo[CHAR LIMIT=30] -->
+    <string name="export_flattened">Export Flattened Image</string>
+
     <!--  Name for the overflow menu item for settings [CHAR LIMIT=20] -->
     <string name="menu_settings">Settings</string>
 
-- 
cgit v1.2.3