Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad

[android-x86/packages-apps-Camera2.git] / proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 45221e2..198df75 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,24 +1,11 @@
 # Disable the warnings of using dynamic method call in common library.
 -dontnote com.android.gallery3d.common.*
 
-# Keep all classes extended from com.android.gallery3d.common.Entry
-# Since we annotate on the fields and use reflection to create SQL
-# according to those field.
-
--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.CameraActivity {
   public boolean isRecording();
   public long getAutoFocusTime();
@@ -45,53 +32,13 @@
 # Disable the warnings of using dynamic method calls in EffectsRecorder
 -dontnote com.android.camera.EffectsRecorder
 
--keep class android.support.v8.renderscript.** { *; }
-
-# Required for ActionBarSherlock
--keep class android.support.v4.app.** { *; }
--keep interface android.support.v4.app.** { *; }
--keep class com.actionbarsherlock.** { *; }
--keep interface com.actionbarsherlock.** { *; }
--keepattributes *Annotation*
-
-# Required for mp4parser
--keep public class * implements com.coremedia.iso.boxes.Box
-
-#-assumenosideeffects junit.framework.Assert {
-#*;
-#}
-
 # For unit testing:
 
 # - Required for running exif tests on userdebug
--keepclassmembers class com.android.gallery3d.exif.ExifTag {
-  *** setValue(...);
-  *** valueToString(...);
-}
--keepclassmembers class com.android.gallery3d.exif.ExifParser {
-  *** parse(...);
-}
+-keep class com.android.gallery3d.exif.ExifTag { *; }
+-keep class com.android.gallery3d.exif.ExifData { *; }
+-keep class com.android.gallery3d.exif.ExifInterface { *; }
 -keepclassmembers class com.android.gallery3d.exif.Util {
   *** closeSilently(...);
 }
--keepclassmembers class com.android.gallery3d.exif.ExifData {
-  *** addInteroperabilityTag(...);
-  *** addThumbnailTag(...);
-  *** getTag(...);
-  *** getInteroperabilityTag(...);
-  *** getThumbnailTag(...);
-}
-
-# - Required for running blobcache tests on userdebug
--keep class com.android.gallery3d.common.BlobCache { *; }
 
-# - Required for running glcanvas tests on userdebug
--keep class com.android.gallery3d.ui.GLPaint { *; }
--keep class com.android.gallery3d.ui.GLCanvas { *; }
--keep class com.android.gallery3d.glrenderer.GLPaint { *; }
--keep class com.android.gallery3d.glrenderer.GLCanvas { *; }
--keep class com.android.gallery3d.ui.GLView { *; }
--keepclassmembers class com.android.gallery3d.util.IntArray {
-  *** toArray(...);
-}
--keep class com.android.gallery3d.util.ProfileData { *; }