OSDN Git Service
ztenghui [Tue, 13 Aug 2013 22:56:57 +0000 (22:56 +0000)]
Merge "Add the menu items back" into gb-ub-photos-carlsbad
ztenghui [Tue, 13 Aug 2013 20:53:16 +0000 (13:53 -0700)]
Add the menu items back
bug:
10245009
Change-Id: I4e11e0cd64800bd9c07158d1a46ea5765ba51d15
Doris Liu [Tue, 13 Aug 2013 22:13:49 +0000 (22:13 +0000)]
Merge "Check for device support before taking video snapshots" into gb-ub-photos-carlsbad
Doris Liu [Tue, 13 Aug 2013 22:01:52 +0000 (15:01 -0700)]
Check for device support before taking video snapshots
Bug:
9496097
Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba
Doris Liu [Tue, 13 Aug 2013 20:30:14 +0000 (20:30 +0000)]
Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos-carlsbad
Doris Liu [Tue, 13 Aug 2013 19:35:34 +0000 (12:35 -0700)]
Remove old video camera icon and label from Camera2
Bug:
10296343
Change-Id: I6c6f130f86b4206d6b9ef322c76e6bdbe81aa57e
Sascha Haeberling [Tue, 13 Aug 2013 19:17:34 +0000 (12:17 -0700)]
Remove Refocus from Camera UI.
Bug:
10073814
Change-Id: I023c7f61463690b02492705cedec8c74159c515d
Doris Liu [Tue, 13 Aug 2013 18:26:09 +0000 (18:26 +0000)]
Merge "Fix video capture intent handling" into gb-ub-photos-carlsbad
Doris Liu [Mon, 12 Aug 2013 22:18:53 +0000 (15:18 -0700)]
Fix video capture intent handling
Bug:
10296343
Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
Angus Kong [Mon, 12 Aug 2013 22:03:45 +0000 (15:03 -0700)]
Add local data types.
We need local data types to generate different menus.
bug:
10245009
Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
Angus Kong [Mon, 12 Aug 2013 22:54:46 +0000 (15:54 -0700)]
Don't return null if there's no images to load.
bug:
10294250
Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
Sascha Haeberling [Mon, 12 Aug 2013 21:34:53 +0000 (14:34 -0700)]
Don't set mImages to null, as we call .size() later.
Bug:
10293573
Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
Sascha Haeberling [Mon, 12 Aug 2013 18:49:33 +0000 (11:49 -0700)]
Update app name to "Camera" before merging to KLP.
Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
ztenghui [Mon, 12 Aug 2013 17:27:46 +0000 (17:27 +0000)]
Merge "Add the basic action bar back." into gb-ub-photos-carlsbad
Angus Kong [Sat, 10 Aug 2013 01:13:10 +0000 (01:13 +0000)]
Merge "Clean up Gallery codes." into gb-ub-photos-carlsbad
ztenghui [Sat, 10 Aug 2013 00:37:15 +0000 (17:37 -0700)]
Add the basic action bar back.
Remove outdated styles.
bug:
10245009
Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
Angus Kong [Fri, 9 Aug 2013 21:55:20 +0000 (14:55 -0700)]
Clean up Gallery codes.
bug:
10263696
Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
Angus Kong [Sat, 10 Aug 2013 00:09:35 +0000 (17:09 -0700)]
Fix NPE after capture when camera roll is empty.
Use empty array instead of null.
bug:
10264304
Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
Sascha Haeberling [Fri, 9 Aug 2013 23:03:56 +0000 (23:03 +0000)]
Merge "Add camera-related tests back." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 9 Aug 2013 21:43:07 +0000 (14:43 -0700)]
Add camera-related tests back.
Change-Id: I2213618fe3b2d4ba776c5f1f94aca330a785df1a
Doris Liu [Fri, 9 Aug 2013 01:08:43 +0000 (18:08 -0700)]
Use PopupWindow for settings popup
Bug:
10261902
Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
Angus Kong [Fri, 9 Aug 2013 20:05:55 +0000 (13:05 -0700)]
Fix DataAdapter wrapper classes callback mechanism.
Also to fix FilmStripView to avoid NPE before data is loaded.
Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
Angus Kong [Wed, 7 Aug 2013 23:55:07 +0000 (23:55 +0000)]
Merge "Refactor data/LocalData." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 7 Aug 2013 23:40:00 +0000 (16:40 -0700)]
Changes required for building GoogleCamera.
Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
Angus Kong [Wed, 7 Aug 2013 21:52:56 +0000 (14:52 -0700)]
Refactor data/LocalData.
Make the design more easily understood.
Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
Sascha Haeberling [Wed, 7 Aug 2013 00:27:55 +0000 (17:27 -0700)]
Remove refocus icon if it's not enabled or present.
Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
Sascha Haeberling [Tue, 6 Aug 2013 23:44:42 +0000 (16:44 -0700)]
Add .mk files for Camera2.
Change-Id: I0678c1b12f40f6dfd76d7589f61d18e99997394f
Sascha Haeberling [Tue, 6 Aug 2013 21:31:52 +0000 (14:31 -0700)]
This adds the following four CLs to Camera2:
http://ag/339319
http://ag/338974
http://ag/338401
http://ag/324149
Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.
Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
Sascha Haeberling [Tue, 6 Aug 2013 21:30:06 +0000 (14:30 -0700)]
Remove two more .mk files. We will add CleanSpec.mk back later.
Change-Id: Ic58a86df7ba5002d4f9ea8c0fdacb02435a92da4
Sascha Haeberling [Tue, 6 Aug 2013 18:43:02 +0000 (11:43 -0700)]
This removes all non-Camera stuff from Camera2.
Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.
Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
Sascha Haeberling [Tue, 6 Aug 2013 18:20:32 +0000 (11:20 -0700)]
Remove all .mk files from the cloned Camera2 until the project is
properly set up.
Change-Id: I3eb79a7a756793ac5253b8c40c3fbc6c6fe2e8e3
Qiwen Zhao [Tue, 6 Aug 2013 03:31:23 +0000 (20:31 -0700)]
Merge tests/exiftool_parser/ from platform/packages/apps/Gallery2 to tests/exiftool_parser/
Qiwen Zhao [Tue, 6 Aug 2013 03:13:25 +0000 (20:13 -0700)]
Merge CleanSpec.mk/ from platform/packages/apps/Gallery2 to CleanSpec.mk/
Qiwen Zhao [Tue, 6 Aug 2013 03:04:07 +0000 (20:04 -0700)]
Merge proguard.flags/ from platform/packages/apps/Gallery2 to proguard.flags/
Qiwen Zhao [Tue, 6 Aug 2013 02:53:46 +0000 (19:53 -0700)]
Merge Android.mk/ from platform/packages/apps/Gallery2 to Android.mk/
Qiwen Zhao [Tue, 6 Aug 2013 02:44:21 +0000 (19:44 -0700)]
Merge AndroidManifest.xml/ from platform/packages/apps/Gallery2 to AndroidManifest.xml/
Qiwen Zhao [Tue, 6 Aug 2013 01:50:24 +0000 (18:50 -0700)]
Merge res/ from platform/packages/apps/Gallery2 to res/
Qiwen Zhao [Tue, 6 Aug 2013 01:37:28 +0000 (18:37 -0700)]
Merge jni/ from platform/packages/apps/Gallery2 to jni/
Qiwen Zhao [Tue, 6 Aug 2013 01:27:31 +0000 (18:27 -0700)]
Merge src/ from platform/packages/apps/Gallery2 to src/
Qiwen Zhao [Tue, 6 Aug 2013 01:14:24 +0000 (18:14 -0700)]
Merge jni_jpegstream/ from platform/packages/apps/Gallery2 to jni_jpegstream/
Qiwen Zhao [Tue, 6 Aug 2013 01:03:38 +0000 (18:03 -0700)]
Merge gallerycommon/ from platform/packages/apps/Gallery2 to gallerycommon/
Angus Kong [Mon, 5 Aug 2013 22:30:05 +0000 (15:30 -0700)]
Load the FilmStrip data in onCreate()
The loading should be done in onCreate() so it won't waste time loading the data
which has been loaded everytime the app is brought to the foreground.
bug:
10189998
Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
Jason Noguchi [Sat, 3 Aug 2013 00:17:06 +0000 (00:17 +0000)]
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
Jason Noguchi [Sat, 3 Aug 2013 00:17:06 +0000 (00:17 +0000)]
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
Jason Noguchi [Wed, 31 Jul 2013 21:16:31 +0000 (14:16 -0700)]
Clean up the test tags used by the continuous test service to determine which
tests to run on every dev build. Add SmallTest or MediumTest tags for unit
tests that are currently being skipped and remove LargeTest tags from long
running stress tests which are not necessary in this context.
Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
Jason Noguchi [Wed, 31 Jul 2013 21:16:31 +0000 (14:16 -0700)]
Clean up the test tags used by the continuous test service to determine which
tests to run on every dev build. Add SmallTest or MediumTest tags for unit
tests that are currently being skipped and remove LargeTest tags from long
running stress tests which are not necessary in this context.
Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
Qiwen Zhao [Fri, 2 Aug 2013 19:19:55 +0000 (19:19 +0000)]
Initial empty repository
nicolasroard [Fri, 2 Aug 2013 18:35:32 +0000 (11:35 -0700)]
Fix display bug with highres
Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
nicolasroard [Fri, 2 Aug 2013 18:35:32 +0000 (11:35 -0700)]
Fix display bug with highres
Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
Ruben Brunk [Fri, 2 Aug 2013 02:05:18 +0000 (19:05 -0700)]
Add quality selector to export.
- Adds the option to change the quality of the jpeg compression
when flattening an exported bitmap.
Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
Ruben Brunk [Fri, 2 Aug 2013 02:05:18 +0000 (19:05 -0700)]
Add quality selector to export.
- Adds the option to change the quality of the jpeg compression
when flattening an exported bitmap.
Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
Sascha Haeberling [Fri, 2 Aug 2013 00:55:49 +0000 (17:55 -0700)]
Hide "View Photo Sphere" button by default.
Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
John Hoford [Fri, 2 Aug 2013 00:49:20 +0000 (00:49 +0000)]
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
John Hoford [Fri, 2 Aug 2013 00:49:20 +0000 (00:49 +0000)]
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
Angus Kong [Tue, 30 Jul 2013 18:36:00 +0000 (11:36 -0700)]
Add LocalDataAdapter and wrappers.
1. FixedFirstDataAdapter wraps another adapter and add a data at the first
position.
2. FixedLastDataAdapter wraps another adapter and add a data at the last
position.
3. Make the LocalData interface more complete.
- onFullScreen()
- canSwipeInFullScreen()
- getPath()
3. Add methods to the FilmStripView.DataAdapter to receive UI events.
- onDataCentered()
- onDataFullScreen()
Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
John Hoford [Tue, 30 Jul 2013 21:40:18 +0000 (14:40 -0700)]
add Per Channel Saturation
Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
John Hoford [Tue, 30 Jul 2013 21:40:18 +0000 (14:40 -0700)]
add Per Channel Saturation
Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
Sascha Haeberling [Thu, 1 Aug 2013 22:50:52 +0000 (22:50 +0000)]
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 1 Aug 2013 22:50:52 +0000 (22:50 +0000)]
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 31 Jul 2013 18:28:21 +0000 (11:28 -0700)]
Adds back the PhotoSphere View icon in filmstrip.
This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:
- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.
Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
Sascha Haeberling [Wed, 31 Jul 2013 18:28:21 +0000 (11:28 -0700)]
Adds back the PhotoSphere View icon in filmstrip.
This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:
- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.
Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
Ruben Brunk [Thu, 18 Jul 2013 23:37:30 +0000 (16:37 -0700)]
Refactoring Geometry handling.
Bug:
9170644
Bug:
9366654
Bug:
9366263
- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.
Change-Id: I59add51907459593244c9ebaadef585efc7486d5
Ruben Brunk [Thu, 18 Jul 2013 23:37:30 +0000 (16:37 -0700)]
Refactoring Geometry handling.
Bug:
9170644
Bug:
9366654
Bug:
9366263
- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.
Change-Id: I59add51907459593244c9ebaadef585efc7486d5
nicolasroard [Wed, 31 Jul 2013 23:22:59 +0000 (16:22 -0700)]
Fix problem with N-1 caching when no filters / one filter
- also fix equals() for geometry
Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
nicolasroard [Wed, 31 Jul 2013 23:22:59 +0000 (16:22 -0700)]
Fix problem with N-1 caching when no filters / one filter
- also fix equals() for geometry
Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
Angus Kong [Wed, 31 Jul 2013 22:21:21 +0000 (22:21 +0000)]
Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbad
nicolasroard [Wed, 31 Jul 2013 22:19:22 +0000 (22:19 +0000)]
Merge "Implements N-1 Caching" into gb-ub-photos-carlsbad
nicolasroard [Wed, 31 Jul 2013 22:19:22 +0000 (22:19 +0000)]
Merge "Implements N-1 Caching" into gb-ub-photos-carlsbad
nicolasroard [Wed, 31 Jul 2013 03:01:21 +0000 (20:01 -0700)]
Implements N-1 Caching
Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
nicolasroard [Wed, 31 Jul 2013 03:01:21 +0000 (20:01 -0700)]
Implements N-1 Caching
Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
Angus Kong [Wed, 31 Jul 2013 21:05:20 +0000 (14:05 -0700)]
Add wrapper for face detection listener.
bug:
10113532
Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
Doris Liu [Wed, 31 Jul 2013 18:25:09 +0000 (11:25 -0700)]
Set default video quality to the highest
Bug:
9886141
Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
Doris Liu [Wed, 31 Jul 2013 18:25:09 +0000 (11:25 -0700)]
Set default video quality to the highest
Bug:
9886141
Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
Doris Liu [Wed, 31 Jul 2013 18:25:09 +0000 (11:25 -0700)]
Set default video quality to the highest
Bug:
9886141
Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
Angus Kong [Wed, 31 Jul 2013 19:46:54 +0000 (12:46 -0700)]
Fix switching camera failure.
bug:
10110830
Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
Ruben Brunk [Wed, 31 Jul 2013 18:28:43 +0000 (18:28 +0000)]
Merge "Do antialiasing on wallpaper preview." into gb-ub-photos-carlsbad
Ruben Brunk [Wed, 31 Jul 2013 06:06:19 +0000 (23:06 -0700)]
Do antialiasing on wallpaper preview.
Bug:
9052851
Change-Id: I890fae2d4bb9907c7204cc6fa34c42c7fe7c7309
John Hoford [Tue, 30 Jul 2013 23:26:20 +0000 (23:26 +0000)]
Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
John Hoford [Tue, 30 Jul 2013 23:26:20 +0000 (23:26 +0000)]
Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
John Hoford [Tue, 30 Jul 2013 23:02:10 +0000 (16:02 -0700)]
clean up some bugs and update the icons
Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
John Hoford [Tue, 30 Jul 2013 23:02:10 +0000 (16:02 -0700)]
clean up some bugs and update the icons
Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
nicolasroard [Mon, 15 Jul 2013 18:24:36 +0000 (11:24 -0700)]
Add user presets saving/loading
Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
nicolasroard [Mon, 15 Jul 2013 18:24:36 +0000 (11:24 -0700)]
Add user presets saving/loading
Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
John Hoford [Tue, 30 Jul 2013 00:27:30 +0000 (00:27 +0000)]
Merge "add Grad filter" into gb-ub-photos-carlsbad
John Hoford [Tue, 30 Jul 2013 00:27:30 +0000 (00:27 +0000)]
Merge "add Grad filter" into gb-ub-photos-carlsbad
John Hoford [Sat, 20 Jul 2013 00:11:31 +0000 (17:11 -0700)]
add Grad filter
Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
John Hoford [Sat, 20 Jul 2013 00:11:31 +0000 (17:11 -0700)]
add Grad filter
Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
Angus Kong [Fri, 19 Jul 2013 01:04:19 +0000 (18:04 -0700)]
Refactor CameraManager.
1. CameraManager should be the only class accessing android.hardware.Camera.
2. For potential future upgrade in Camera HAL and android.hardward.Camera API
upgrade, CameraManager should be just an interface instead of concrete
implementation.
3. waitDone() in CameraProxy is removed.
4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are
wrapped by our own interfaces.
Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
Sascha Haeberling [Sat, 27 Jul 2013 00:20:15 +0000 (00:20 +0000)]
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
Sascha Haeberling [Sat, 27 Jul 2013 00:20:15 +0000 (00:20 +0000)]
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
nicolasroard [Fri, 26 Jul 2013 17:01:06 +0000 (10:01 -0700)]
Fix disappearing fragment
Change-Id: Ic478ad75a458bb36001c91f8627aab7643fa0a47
nicolasroard [Fri, 26 Jul 2013 14:51:29 +0000 (07:51 -0700)]
Fix geometry serialization
Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
nicolasroard [Fri, 26 Jul 2013 14:51:29 +0000 (07:51 -0700)]
Fix geometry serialization
Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
Ruben Brunk [Thu, 25 Jul 2013 03:06:20 +0000 (20:06 -0700)]
Added support to export to a flattened photo.
Bug:
10008212
- Adds a menu item to allow a photo with edits to be flattened
into a separate photo.
- Fixes bug where crop intents fail to save cropped images.
Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
Ruben Brunk [Thu, 25 Jul 2013 03:06:20 +0000 (20:06 -0700)]
Added support to export to a flattened photo.
Bug:
10008212
- Adds a menu item to allow a photo with edits to be flattened
into a separate photo.
- Fixes bug where crop intents fail to save cropped images.
Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
Sascha Haeberling [Wed, 24 Jul 2013 01:30:17 +0000 (18:30 -0700)]
Refocus integration phase 1.
Bug:
9966846
Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
Sascha Haeberling [Wed, 24 Jul 2013 01:30:17 +0000 (18:30 -0700)]
Refocus integration phase 1.
Bug:
9966846
Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
Angus Kong [Fri, 19 Jul 2013 21:55:07 +0000 (14:55 -0700)]
Remove legacy code ActivityBase.java.
Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
Angus Kong [Fri, 19 Jul 2013 21:55:07 +0000 (14:55 -0700)]
Remove legacy code ActivityBase.java.
Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
nicolasroard [Wed, 24 Jul 2013 00:10:18 +0000 (17:10 -0700)]
Fix geometry transform
Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab