Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 70a7579..390863a 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -28,6 +28,13 @@
android:id="@+id/preview_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
+ <View
+ android:id="@+id/flash_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:visibility="gone"
+ android:alpha="0" />
<ViewStub android:id="@+id/face_view_stub"
android:inflatedId="@+id/face_view"
android:layout="@layout/face_view"
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index dfe0308..abe69d1 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -56,6 +56,7 @@
if (a instanceof FilterFxRepresentation) {
FilterFxRepresentation representation = (FilterFxRepresentation) a;
setName(representation.getName());
+ setSerializationName(representation.getSerializationName());
setBitmapResource(representation.getBitmapResource());
setNameResource(representation.getNameResource());
}