From 33f3a80fdff82236f65afd46b70b8f949d6a2107 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 17 Aug 2011 22:07:43 +0800 Subject: Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c --- proguard.flags | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 proguard.flags diff --git a/proguard.flags b/proguard.flags new file mode 100644 index 000000000..0df05e3dc --- /dev/null +++ b/proguard.flags @@ -0,0 +1,7 @@ +# 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 ; +} -- cgit v1.2.3 From 734290823b0326dc18a85a7a3bc03f6a0bc0f18d Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Thu, 1 Sep 2011 14:11:19 +0800 Subject: Fix alias not found issue. Also remove note message in proguard. Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f --- proguard.flags | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proguard.flags b/proguard.flags index 0df05e3dc..a8cb36369 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,3 +1,6 @@ +# 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. -- cgit v1.2.3 From 95d15606219aacc2bc986461f068b7f9610e9f7c Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Thu, 8 Mar 2012 20:10:53 +0800 Subject: Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a --- proguard.flags | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/proguard.flags b/proguard.flags index a8cb36369..82509333c 100644 --- a/proguard.flags +++ b/proguard.flags @@ -8,3 +8,27 @@ -keep class * extends com.android.gallery3d.common.Entry { @com.android.gallery3d.common.Entry$Column ; } + +# ctors of subclasses of CameraPreference are called with Java reflection. +-keep class * extends com.android.camera.CameraPreference { + (...); +} + +-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 ; +} + +-keep class com.android.camera.CameraHolder { + public static void injectMockCamera(...); +} -- cgit v1.2.3 From c603e749e4332e86a02ba6a934c66665930ea45e Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 1 Aug 2012 13:32:34 +0800 Subject: Suppress the warnings in EffectRecorder Change-Id: I29d8348f40c35e720ab230e2c599bf8a8ff2a953 --- proguard.flags | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proguard.flags b/proguard.flags index 82509333c..66e53673e 100644 --- a/proguard.flags +++ b/proguard.flags @@ -32,3 +32,6 @@ -keep class com.android.camera.CameraHolder { public static void injectMockCamera(...); } + +# Disable the warnings of using dynamic method calls in EffectsRecorder +-dontnote com.android.camera.EffectsRecorder -- cgit v1.2.3 From 5088095aaa2194194390148a7ac16d1e2c18e239 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 22 Aug 2012 17:34:21 +0800 Subject: Uses ActionBarSherlock library in MovieActivity. bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff --- proguard.flags | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proguard.flags b/proguard.flags index 66e53673e..15e97434e 100644 --- a/proguard.flags +++ b/proguard.flags @@ -35,3 +35,11 @@ # Disable the warnings of using dynamic method calls in EffectsRecorder -dontnote com.android.camera.EffectsRecorder + +# 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* + -- cgit v1.2.3 From 4a1ce33c47659113160d1e749121070c5e05fd7f Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Fri, 24 Aug 2012 13:02:22 +0800 Subject: Revert "Uses ActionBarSherlock library in MovieActivity." This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234. --- proguard.flags | 8 -------- 1 file changed, 8 deletions(-) diff --git a/proguard.flags b/proguard.flags index 15e97434e..66e53673e 100644 --- a/proguard.flags +++ b/proguard.flags @@ -35,11 +35,3 @@ # Disable the warnings of using dynamic method calls in EffectsRecorder -dontnote com.android.camera.EffectsRecorder - -# 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* - -- cgit v1.2.3 From 8ce73319ec3047d7df3fb55405f3c53a8a169d67 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Fri, 24 Aug 2012 15:09:42 +0800 Subject: Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac. --- proguard.flags | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proguard.flags b/proguard.flags index 66e53673e..15e97434e 100644 --- a/proguard.flags +++ b/proguard.flags @@ -35,3 +35,11 @@ # Disable the warnings of using dynamic method calls in EffectsRecorder -dontnote com.android.camera.EffectsRecorder + +# 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* + -- cgit v1.2.3 From 8c32a04458f04d2a6b0dca05c98e24c9bc5c412a Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Sun, 23 Sep 2012 15:02:56 -0700 Subject: The trimming solution with the mp4parser library. bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff --- proguard.flags | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proguard.flags b/proguard.flags index 15e97434e..098a540c9 100644 --- a/proguard.flags +++ b/proguard.flags @@ -43,3 +43,6 @@ -keep interface com.actionbarsherlock.** { *; } -keepattributes *Annotation* +# Required for mp4parser +-keep public class * extends com.coremedia.iso.boxes.AbstractBox + -- cgit v1.2.3 From 23c71c4053b914ac86367704bd9a1402dd8a88c8 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Thu, 27 Sep 2012 10:49:46 +0800 Subject: Fix background replacement crash in camcorder. Add proguard flag to prevent methods from removing. bug:7106963 Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028 --- proguard.flags | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proguard.flags b/proguard.flags index 098a540c9..7cd6c19c1 100644 --- a/proguard.flags +++ b/proguard.flags @@ -25,6 +25,12 @@ public void onProtectiveCurtainClick(...); } +-keep class com.android.camera.VideoModule { + public boolean isRecording(); + public void onCancelBgTraining(...); + public void onProtectiveCurtainClick(...); +} + -keep class * extends android.app.Activity { @com.android.camera.OnClickAttr ; } -- cgit v1.2.3 From b61c4873c573c6a2a8178c7cf0eb91cc75e270f8 Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Sun, 30 Sep 2012 14:27:24 -0700 Subject: Trimming: support more box by keeping more classes bug:7093055 Change-Id: Ie4dbae8270cf0072dfc74b5c91fec628f4cad673 --- proguard.flags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proguard.flags b/proguard.flags index 7cd6c19c1..21b617957 100644 --- a/proguard.flags +++ b/proguard.flags @@ -50,5 +50,5 @@ -keepattributes *Annotation* # Required for mp4parser --keep public class * extends com.coremedia.iso.boxes.AbstractBox +-keep public class * implements com.coremedia.iso.boxes.Box -- cgit v1.2.3 From 44f476dc149a587c06e752987d0f1d00c57ca076 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Sun, 14 Oct 2012 21:28:31 +0800 Subject: Remove old camera classes. bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90 --- proguard.flags | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/proguard.flags b/proguard.flags index 21b617957..d5a2d1f26 100644 --- a/proguard.flags +++ b/proguard.flags @@ -19,14 +19,11 @@ public android.content.Intent getResultData(); } --keep class com.android.camera.VideoCamera { +-keep class com.android.camera.CameraActivity { public boolean isRecording(); - public void onCancelBgTraining(...); - public void onProtectiveCurtainClick(...); } -keep class com.android.camera.VideoModule { - public boolean isRecording(); public void onCancelBgTraining(...); public void onProtectiveCurtainClick(...); } -- cgit v1.2.3 From cdb0f9217c9bbda9e31b501b175accc1599c3fd1 Mon Sep 17 00:00:00 2001 From: Jason Noguchi Date: Wed, 17 Oct 2012 14:35:00 -0700 Subject: Adding accessor methods for camera latency vars. Change-Id: I21cb401aa12f116abd384efee021d2738b28793c --- proguard.flags | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proguard.flags b/proguard.flags index d5a2d1f26..8d60103bc 100644 --- a/proguard.flags +++ b/proguard.flags @@ -21,6 +21,12 @@ -keep class com.android.camera.CameraActivity { public boolean isRecording(); + public long getAutoFocusTime(); + public long getShutterLag(); + public long getShutterToPictureDisplayedTime(); + public long getPictureDisplayedToJpegCallbackTime(); + public long getJpegCallbackFinishTime(); + public long getCaptureStartTime(); } -keep class com.android.camera.VideoModule { -- cgit v1.2.3 From 7acd7415319c4de16e4deba0d40eb4099a7eaac1 Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 11 Dec 2012 14:42:27 -0800 Subject: GL packaging refactor Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa --- proguard.flags | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proguard.flags b/proguard.flags index 8d60103bc..b54b0c791 100644 --- a/proguard.flags +++ b/proguard.flags @@ -55,3 +55,7 @@ # Required for mp4parser -keep public class * implements com.coremedia.iso.boxes.Box +#-assumenosideeffects junit.framework.Assert { +#*; +#} + -- cgit v1.2.3 From dc3efa9ea22dba0aef5acc9c28b4d782a8e74236 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 16 Jan 2013 17:54:08 -0800 Subject: Switch Gallery over to RS compatibility library. Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad --- proguard.flags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proguard.flags b/proguard.flags index b54b0c791..dce9d077d 100644 --- a/proguard.flags +++ b/proguard.flags @@ -45,6 +45,8 @@ # 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.** { *; } -- cgit v1.2.3 From ac416c5a2af322039b07a76f90351f584c7f380f Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 23 Jan 2013 18:38:42 +0000 Subject: Revert "Switch Gallery over to RS compatibility library." This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50 --- proguard.flags | 2 -- 1 file changed, 2 deletions(-) diff --git a/proguard.flags b/proguard.flags index dce9d077d..b54b0c791 100644 --- a/proguard.flags +++ b/proguard.flags @@ -45,8 +45,6 @@ # 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.** { *; } -- cgit v1.2.3 From 203f5149ab28dc2d3d33be5868c16209030835e8 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Mon, 4 Feb 2013 13:09:27 -0800 Subject: Switch Gallery over to RS compatibility library. Change-Id: If27809236534f3b196949bf455faed45c99f3da5 --- proguard.flags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proguard.flags b/proguard.flags index b54b0c791..dce9d077d 100644 --- a/proguard.flags +++ b/proguard.flags @@ -45,6 +45,8 @@ # 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.** { *; } -- cgit v1.2.3 From df7e37face0245ce8651a50ba3ee16febc2b2bdb Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Wed, 13 Feb 2013 13:36:21 -0800 Subject: Fix proguard and makefile targets for tests. Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861 --- proguard.flags | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/proguard.flags b/proguard.flags index dce9d077d..45221e211 100644 --- a/proguard.flags +++ b/proguard.flags @@ -61,3 +61,37 @@ #*; #} +# 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(...); +} +-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 { *; } -- cgit v1.2.3 From 64cf19a431c4bfe20260cb36356e1f76b7e820e0 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Mon, 11 Mar 2013 19:00:12 -0700 Subject: Exif parser modifications. Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8 --- proguard.flags | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/proguard.flags b/proguard.flags index 45221e211..8cb04867d 100644 --- a/proguard.flags +++ b/proguard.flags @@ -64,23 +64,12 @@ # 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 { *; } -- cgit v1.2.3 From a89aa4bc9d5f7d1eeb31edb619d7f738723d7107 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Fri, 28 Jun 2013 20:02:54 -0700 Subject: Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94 --- proguard.flags | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proguard.flags b/proguard.flags index 8cb04867d..844c16305 100644 --- a/proguard.flags +++ b/proguard.flags @@ -84,3 +84,8 @@ *** toArray(...); } -keep class com.android.gallery3d.util.ProfileData { *; } + +# - Required for running jpeg stream tests on userdebug +-keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; } +-keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; } +-keep class com.android.gallery3d.jpegstream.StreamUtils { *; } -- cgit v1.2.3 From c8d3c0ab3769085b2b9a0235585798f06050bdb2 Mon Sep 17 00:00:00 2001 From: Angus Kong Date: Fri, 19 Jul 2013 14:55:07 -0700 Subject: Remove legacy code ActivityBase.java. Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445 --- proguard.flags | 5 ----- 1 file changed, 5 deletions(-) diff --git a/proguard.flags b/proguard.flags index 844c16305..65104ec1e 100644 --- a/proguard.flags +++ b/proguard.flags @@ -14,11 +14,6 @@ (...); } --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(); -- cgit v1.2.3