OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoOnly link librsjni in unbundled branches.
Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]
Only link librsjni in unbundled branches.

bug 8939828

Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a

11 years agoadd highlight filter
John Hoford [Thu, 21 Feb 2013 01:50:42 +0000 (17:50 -0800)]
add highlight filter

Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872

11 years agoMerge "Remove com.android.camera.R" into gb-ub-photos-bryce
John Reck [Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)]
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce

11 years agoRemove com.android.camera.R
John Reck [Fri, 15 Feb 2013 23:51:30 +0000 (15:51 -0800)]
Remove com.android.camera.R

Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449

11 years agoMerging camera test with gallery test.
Jason Noguchi [Wed, 13 Feb 2013 23:35:23 +0000 (15:35 -0800)]
Merging camera test with gallery test.

Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841

11 years agoSwitch to GalleryGoogle as default provider for RS files (from Gallery2).
Stephen Hines [Fri, 8 Feb 2013 02:41:27 +0000 (18:41 -0800)]
Switch to GalleryGoogle as default provider for RS files (from Gallery2).

Bug: 8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0

11 years agoRemove reference to local libraries. Make CameraTest build against the SDK instead.
Jason Noguchi [Thu, 7 Feb 2013 02:49:51 +0000 (18:49 -0800)]
Remove reference to local libraries. Make CameraTest build against the SDK instead.

Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d

11 years agoSwitch Gallery over to RS compatibility library.
Tim Murray [Mon, 4 Feb 2013 21:09:27 +0000 (13:09 -0800)]
Switch Gallery over to RS compatibility library.

Change-Id: If27809236534f3b196949bf455faed45c99f3da5

11 years agoMove tests from camera to gallery2
Doris Liu [Fri, 1 Feb 2013 03:03:48 +0000 (19:03 -0800)]
Move tests from camera to gallery2

Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9

11 years agoCopy camera resources into Gallery2
Michael Kolb [Tue, 29 Jan 2013 22:03:06 +0000 (14:03 -0800)]
Copy camera resources into Gallery2

Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684

11 years agoMove Camera Java/Native source into Gallery2
Michael Kolb [Tue, 29 Jan 2013 18:33:22 +0000 (10:33 -0800)]
Move Camera Java/Native source into Gallery2

Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1

11 years agoRevert "Switch Gallery over to RS compatibility library."
Stephen Hines [Wed, 23 Jan 2013 18:38:42 +0000 (18:38 +0000)]
Revert "Switch Gallery over to RS compatibility library."

This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c

Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50

11 years agoSwitch Gallery over to RS compatibility library.
Stephen Hines [Thu, 17 Jan 2013 01:54:08 +0000 (17:54 -0800)]
Switch Gallery over to RS compatibility library.

Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad

11 years agoRefactoring: removed unused filters.
Ruben Brunk [Fri, 14 Dec 2012 06:42:33 +0000 (22:42 -0800)]
Refactoring: removed unused filters.

Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b

11 years agoAdded K-Means clustering filter.
Ruben Brunk [Thu, 13 Dec 2012 05:35:12 +0000 (21:35 -0800)]
Added K-Means clustering filter.

Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3

11 years agoAdded sobel filter for edge function.
Ruben Brunk [Tue, 11 Dec 2012 02:50:10 +0000 (18:50 -0800)]
Added sobel filter for edge function.

Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132

11 years agoAdded photonegative filter.
Ruben Brunk [Tue, 11 Dec 2012 03:40:27 +0000 (19:40 -0800)]
Added photonegative filter.

Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f

11 years agoremove actionbar sherlock
John Reck [Wed, 12 Dec 2012 21:43:43 +0000 (13:43 -0800)]
remove actionbar sherlock

Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5

11 years agoGingerbread support-ish
John Reck [Wed, 31 Oct 2012 00:34:20 +0000 (17:34 -0700)]
Gingerbread support-ish

This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.

Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee

11 years agoadd support for black and white filters, add rotation API to tiny planet
John Hoford [Tue, 23 Oct 2012 22:17:12 +0000 (15:17 -0700)]
add support for black and white filters, add rotation API to tiny planet

bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120

11 years agoMake sure we use xmp_toolkit from external instead of the precompiled JAR.
Sascha Haeberling [Tue, 23 Oct 2012 20:38:52 +0000 (13:38 -0700)]
Make sure we use xmp_toolkit from external instead of the precompiled JAR.

 Bug: 7400527

Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155

11 years agoon entry check if Tiny Planet if not remove UI
John Hoford [Mon, 22 Oct 2012 23:26:26 +0000 (16:26 -0700)]
on entry check if Tiny Planet if not remove UI

bug:7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83

11 years agoAdds a tiny planet (stereographic projection) image filter.
Sascha Haeberling [Fri, 19 Oct 2012 22:43:03 +0000 (15:43 -0700)]
Adds a tiny planet (stereographic projection) image filter.

 Bug: 7293391

Also fixes an issue where the preview value was statically set to 100.
This adds a preview parameter value that can be set for this purpose.

Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e

11 years agoadd White balance & disable UI elements
John Hoford [Wed, 10 Oct 2012 21:17:30 +0000 (14:17 -0700)]
add White balance & disable UI elements

bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af

11 years agoadd filters
John Hoford [Tue, 9 Oct 2012 23:17:17 +0000 (16:17 -0700)]
add filters

bug:7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030

11 years agoadd redeye and improve shadow removal
John Hoford [Mon, 8 Oct 2012 21:21:57 +0000 (14:21 -0700)]
add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681

11 years agoAdded stub for applying geometry flip.
Ruben Brunk [Mon, 8 Oct 2012 20:48:46 +0000 (13:48 -0700)]
Added stub for applying geometry flip.

Bug: 7224232
Bug: 7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0

11 years agoChange LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sat, 6 Oct 2012 19:29:50 +0000 (03:29 +0800)]
Change LOCAL_SDK_VERSION to current.

bug:7208909

Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57

11 years agoadd vibrance fix a free in shadows
John Hoford [Thu, 4 Oct 2012 21:12:36 +0000 (14:12 -0700)]
add vibrance fix a free in shadows

bug:7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2

11 years agoImplement sharpen
nicolasroard [Wed, 3 Oct 2012 04:57:22 +0000 (21:57 -0700)]
Implement sharpen

bug:7279964
bug:7247494
bug:7234321

- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI

Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01

11 years agoAdd Shadow feature
John Hoford [Wed, 3 Oct 2012 01:12:03 +0000 (18:12 -0700)]
Add Shadow feature

bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297

11 years agoRemove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb

11 years agoFix exposure and fixed warnings
John Hoford [Tue, 2 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Fix exposure and fixed warnings

bug:7234321

11 years agoAdd contrast & brightness filters
John Hoford [Thu, 27 Sep 2012 23:34:21 +0000 (16:34 -0700)]
Add contrast & brightness filters
Added hue fixed contrast
Stablized Contrast, Saturation, Tint, Exposure

bug:7234321
Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee

11 years agoAdd FilterShow and clean up native lib handling
Bart Sears [Fri, 28 Sep 2012 17:40:05 +0000 (10:40 -0700)]
Add FilterShow and clean up native lib handling

Bug: 7165910
Add libjni_filtershow_filters to Gallery2 so users can edit photos

Bug: 7250099
Remove native libs from the apk in /system/apps

Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266

11 years agoFix the build
nicolasroard [Thu, 27 Sep 2012 00:50:19 +0000 (17:50 -0700)]
Fix the build

Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924

11 years agoInitial import of the new image editor
nicolasroard [Tue, 25 Sep 2012 21:27:56 +0000 (14:27 -0700)]
Initial import of the new image editor

bug:7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3

11 years agoThe trimming solution with the mp4parser library.
Teng-Hui Zhu [Sun, 23 Sep 2012 22:02:56 +0000 (15:02 -0700)]
The trimming solution with the mp4parser library.

bug:7093055

Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff

11 years agoRevert "Revert "Uses ActionBarSherlock library in MovieActivity.""
Owen Lin [Fri, 24 Aug 2012 07:09:42 +0000 (15:09 +0800)]
Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""

This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.

11 years agoRevert "Uses ActionBarSherlock library in MovieActivity."
Owen Lin [Fri, 24 Aug 2012 05:02:22 +0000 (13:02 +0800)]
Revert "Uses ActionBarSherlock library in MovieActivity."

This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.

11 years agoUses ActionBarSherlock library in MovieActivity.
Owen Lin [Wed, 22 Aug 2012 09:34:21 +0000 (17:34 +0800)]
Uses ActionBarSherlock library in MovieActivity.

bug: 6927267

Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff

11 years agofix mips build
Keun young Park [Thu, 23 Aug 2012 16:44:46 +0000 (09:44 -0700)]
fix mips build

- LOCAL_SDK_VERSION should be defined always

Change-Id: Icd1972279c76bd28e3caf9b44f1cea9b585836a1

11 years agoRetire LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 17:33:44 +0000 (10:33 -0700)]
Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: I9e5e8fba22ac235701c002e27012bb3954896140

11 years agoFix Gallery2Tests Build
Earl Ou [Tue, 31 Jul 2012 00:50:59 +0000 (08:50 +0800)]
Fix Gallery2Tests Build

Remove dependancy of android-test-runner in Android.mk
Also LOCAL_SDK_VERSION is needed in Android.mk for unbundle-branches
to avoid hiden api

Change-Id: I38cef8261aab264fe5a109ca5a6857eee3dff11b

11 years agoFixed x86 build
Andrew Hsieh [Wed, 18 Jul 2012 23:40:14 +0000 (16:40 -0700)]
Fixed x86 build

NDK supports x86 from r6.  Without setting correct LOCAL_NDK_VERSION
build may fail to add library path for "-llog" and "-lEGL"

Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d

11 years agoFix non-ARM builds - use the proper way to reference libraries
Jean-Baptiste Queru [Thu, 19 Jul 2012 17:56:47 +0000 (10:56 -0700)]
Fix non-ARM builds - use the proper way to reference libraries

Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0

11 years agoChange "current" sdk version to 16 as it becomes official
Ying Wang [Fri, 13 Jul 2012 17:19:43 +0000 (10:19 -0700)]
Change "current" sdk version to 16 as it becomes official

Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5

11 years agoMake jni build against NDK.
Wu-cheng Li [Wed, 4 Jul 2012 08:32:57 +0000 (16:32 +0800)]
Make jni build against NDK.

bug:6698708

Change-Id: I913e2f29657abc0af79223ba49148a6080d39ba7

11 years agoMake gallery/camera build in JB API level.
Wu-cheng Li [Fri, 29 Jun 2012 10:21:15 +0000 (18:21 +0800)]
Make gallery/camera build in JB API level.

Bug:4965992
Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee

11 years agoDon't reuse bitmaps in BitmapRegionDecoder before JB.
Owen Lin [Wed, 27 Jun 2012 11:01:21 +0000 (19:01 +0800)]
Don't reuse bitmaps in BitmapRegionDecoder before JB.

Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4

12 years agoFix b/6590795 dejank photo effect slider
Ruei-sung Lin [Thu, 31 May 2012 18:59:31 +0000 (11:59 -0700)]
Fix b/6590795 dejank photo effect slider

Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea

12 years agoMerge Camera into Gallery package.
Chih-Chung Chang [Thu, 8 Mar 2012 12:10:53 +0000 (20:10 +0800)]
Merge Camera into Gallery package.

Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a

12 years agoAdd profiling tools.
Chih-Chung Chang [Fri, 3 Feb 2012 13:17:17 +0000 (21:17 +0800)]
Add profiling tools.

Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e

12 years agoInitial code for Gallery2.
Owen Lin [Wed, 17 Aug 2011 14:07:43 +0000 (22:07 +0800)]
Initial code for Gallery2.

fix: 5176434

Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c

12 years agonew project, first commit
Ed Heyl [Thu, 11 Aug 2011 13:41:58 +0000 (06:41 -0700)]
new project, first commit