Merge Camera into Gallery package.

Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a

diff --git a/proguard.flags b/proguard.flags
index a8cb363..8250933 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -8,3 +8,27 @@
 -keep class * extends com.android.gallery3d.common.Entry {
     @com.android.gallery3d.common.Entry$Column <fields>;
 }
+
+# ctors of subclasses of CameraPreference are called with Java reflection.
+-keep class * extends com.android.camera.CameraPreference {
+  <init>(...);
+}
+
+-keep class com.android.camera.ActivityBase {
+  public int getResultCode();
+  public android.content.Intent getResultData();
+}
+
+-keep class com.android.camera.VideoCamera {
+  public boolean isRecording();
+  public void onCancelBgTraining(...);
+  public void onProtectiveCurtainClick(...);
+}
+
+-keep class * extends android.app.Activity {
+  @com.android.camera.OnClickAttr <methods>;
+}
+
+-keep class com.android.camera.CameraHolder {
+  public static void injectMockCamera(...);
+}