OSDN Git Service
Doris Liu [Wed, 21 Aug 2013 20:42:22 +0000 (13:42 -0700)]
Fix video capture animation and video snapshot animation
Also removed unused effects recording code
Bug:
10326106
Bug:
10414112
Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
Doris Liu [Wed, 21 Aug 2013 00:45:36 +0000 (00:45 +0000)]
Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 21 Aug 2013 00:43:07 +0000 (00:43 +0000)]
Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad
Doris Liu [Wed, 21 Aug 2013 00:36:39 +0000 (17:36 -0700)]
Fix nav bar overlapping camera bottom UI controls
Bug:
10394750
Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497
Doris Liu [Wed, 21 Aug 2013 00:29:10 +0000 (00:29 +0000)]
Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 21 Aug 2013 00:26:37 +0000 (17:26 -0700)]
Remove the "button" part of the shutter button description.
Bug:
10081355
Talkback automatically appends "button" to a clickable ImageView.
Change-Id: I7d20b96965a5542277cb27b0fd8d255251b2cb3c
Doris Liu [Tue, 20 Aug 2013 23:50:08 +0000 (23:50 +0000)]
Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
Doris Liu [Tue, 20 Aug 2013 23:31:29 +0000 (16:31 -0700)]
Fix video snapshot aspect ratio
Bug:
10312002
Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701
Jason Noguchi [Tue, 20 Aug 2013 23:11:36 +0000 (23:11 +0000)]
Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad
Jason Noguchi [Tue, 20 Aug 2013 21:20:35 +0000 (14:20 -0700)]
Updating the Camera tests makefile and source to reflect recent split between camera and gallery
apps.
Change-Id: Ie5b3eb918c67b1f9e77f9a1f53d3cb562d78a001
Doris Liu [Tue, 20 Aug 2013 21:06:50 +0000 (14:06 -0700)]
Make camera preview full screen
Bug:
10328123
Change-Id: I4a72b7d7d35dba7cceecd61db9879265617c511e
Doris Liu [Tue, 20 Aug 2013 18:14:07 +0000 (11:14 -0700)]
Fix squished preview
Bug:
10330209
Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6
nicolasroard [Tue, 20 Aug 2013 16:19:23 +0000 (09:19 -0700)]
Add "set as" capability in Film Strip
bug:
10367174
Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552
Sascha Haeberling [Tue, 20 Aug 2013 02:00:02 +0000 (19:00 -0700)]
Rename accessibility text for Photo Sphere mode from 'new panorama'.
Bug:
10075811
Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962
Angus Kong [Mon, 19 Aug 2013 21:50:23 +0000 (21:50 +0000)]
Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
Angus Kong [Mon, 19 Aug 2013 21:46:20 +0000 (14:46 -0700)]
Implement deletion in the menu.
bug:
10367402
Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24
Sascha Haeberling [Mon, 19 Aug 2013 21:02:19 +0000 (14:02 -0700)]
Add video details to the details menu
Bug:
10330505
Also fix a potential NPE issue and some minor reformatting.
Change-Id: I89a32645a497d1f19d935b96bd1997e6fdf902b2
ztenghui [Mon, 19 Aug 2013 20:21:26 +0000 (20:21 +0000)]
Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad
ztenghui [Mon, 19 Aug 2013 18:54:12 +0000 (11:54 -0700)]
Update the action bar style to match Bryce
bug:
10347330
Change-Id: I9a3e6f5cac0003cce4b19cba28904d539faa94a9
Sascha Haeberling [Mon, 19 Aug 2013 18:47:10 +0000 (18:47 +0000)]
Merge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 19 Aug 2013 18:45:44 +0000 (11:45 -0700)]
Don't refresh item on resume as it leads to a filmstrip bug.
Instead we should listen to the proper events when something is changed
with the media.
Change-Id: Ia5337a4a83de73962070148e0a10f0a12f769345
Sascha Haeberling [Mon, 19 Aug 2013 18:43:06 +0000 (18:43 +0000)]
Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 16 Aug 2013 00:19:22 +0000 (17:19 -0700)]
Bring back the bottom controls in Filmstrip.
Bug:
10367172
Bug:
10074320
Also hooks up the Edit button and the edit menu item.
Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
Sascha Haeberling [Mon, 19 Aug 2013 18:29:04 +0000 (11:29 -0700)]
Enable switching cameras in video mode.
Bug:
10313018
Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
ztenghui [Mon, 19 Aug 2013 16:50:34 +0000 (16:50 +0000)]
Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
Doris Liu [Sat, 17 Aug 2013 00:59:26 +0000 (00:59 +0000)]
Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
Doris Liu [Fri, 16 Aug 2013 00:34:41 +0000 (17:34 -0700)]
Add image 1:1 support
Bug:
10308195
Change-Id: I7b7fcf3b46475a2d39bac27095d01d438582e516
ztenghui [Fri, 16 Aug 2013 23:21:22 +0000 (16:21 -0700)]
Add the trim functionality back to FilmStripView
At the same time, disable the mute for now.
bug:
10313015
Change-Id: Ic2139f509ddb4ed57f3a4d67782eadb150e88ea5
Mangesh Ghiware [Fri, 16 Aug 2013 23:54:06 +0000 (23:54 +0000)]
Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad
Mangesh Ghiware [Fri, 16 Aug 2013 23:49:32 +0000 (16:49 -0700)]
Add back intent-filter for default category and main action.
Bug:
10349073
Change-Id: I06c24cebc50fe555ec150813117955da09814fb4
Angus Kong [Wed, 14 Aug 2013 23:07:54 +0000 (16:07 -0700)]
Set views in filmstrip invisible when alpha = 0.
bug:
10096747
Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
Sascha Haeberling [Thu, 15 Aug 2013 22:57:29 +0000 (15:57 -0700)]
Single-tap in fullscreen view toggles ActionBar.
Bug:
10347286
Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
Sascha Haeberling [Thu, 15 Aug 2013 21:29:49 +0000 (14:29 -0700)]
Implent show-on-map functionality.
Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
Bug:
10346208
Bug:
10330505
Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
Sascha Haeberling [Thu, 15 Aug 2013 21:38:07 +0000 (21:38 +0000)]
Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 14 Aug 2013 23:23:18 +0000 (16:23 -0700)]
Brings back the details menu with most EXIF data in it.
Some are still missing and will come back later.
Bug:
10330505
Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
Dan Aminzade [Thu, 15 Aug 2013 00:36:56 +0000 (17:36 -0700)]
Defining broadcast intent strings as constants in CameraUtil.java.
For now I'm leaving the definition within the Camera application. If
we decide we want to publicize and document these intents as part of
the Android API, we could move the definitions to Camera.java.
Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
Angus Kong [Wed, 14 Aug 2013 23:44:51 +0000 (16:44 -0700)]
Single tap to full screen mode.
bug:
10308911
Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
Angus Kong [Wed, 14 Aug 2013 23:10:46 +0000 (23:10 +0000)]
Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad
Angus Kong [Wed, 14 Aug 2013 22:24:00 +0000 (15:24 -0700)]
Make current view center in filmstrip.
bug:
10096746
Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
Dan Aminzade [Tue, 13 Aug 2013 21:44:25 +0000 (14:44 -0700)]
Add support for remote shutter control via broadcast intents.
Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to
notify Gem to hide and show the camera card, and receive the SHUTTER
broadcast intent to trigger the shutter.
This change resolves b/
10185077.
Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
Angus Kong [Wed, 14 Aug 2013 20:37:48 +0000 (20:37 +0000)]
Merge "Handle unexpected exceptions when loading videos." into gb-ub-photos-carlsbad
Angus Kong [Wed, 14 Aug 2013 17:52:40 +0000 (10:52 -0700)]
Handle unexpected exceptions when loading videos.
bug:
10313671
bug:
9757517
Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
Sascha Haeberling [Wed, 14 Aug 2013 18:42:54 +0000 (18:42 +0000)]
Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 14 Aug 2013 18:20:34 +0000 (11:20 -0700)]
Copy over libjni_mosaic from Camera. We need to support the SRI pano
mode for Carlsbad.
Change-Id: Id14e64d8248236e8170c12cfca2cbf2ca952e993
Mangesh Ghiware [Wed, 14 Aug 2013 18:03:39 +0000 (11:03 -0700)]
Add back DisableCameraReceiver
Bug:
10314435
Change-Id: Ic8ba05e6bfecfff365b2fd759d7669c1015a3845
Mangesh Ghiware [Wed, 14 Aug 2013 04:14:35 +0000 (04:14 +0000)]
Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbad
Angus Kong [Fri, 9 Aug 2013 00:06:03 +0000 (17:06 -0700)]
Fix camera preview stopped after onResume().
This fix is for the blank camera preview blank after onPause() -> onResume().
1. Refined camera start up procedure by removing redundant camera startup
thread.
2. Cleanup unused calls after aparted from gallery.
bug:
10189998
Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
Mangesh Ghiware [Wed, 14 Aug 2013 00:10:58 +0000 (17:10 -0700)]
Add activity-alias for Camera.
Similar to the one in Gallery2 manifest.
Bug:
10312966
Change-Id: I5325f8cfeba2a3825cd5604d4fee7c209067aba1
ztenghui [Tue, 13 Aug 2013 23:32:24 +0000 (16:32 -0700)]
Fix view jumps when action bar is hiding
bug:
10245009
Change-Id: Ie596132dfc7790ff371d032701475aa742bd31fa
Sascha Haeberling [Tue, 13 Aug 2013 23:31:10 +0000 (23:31 +0000)]
Merge "Don't take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 13 Aug 2013 23:28:20 +0000 (23:28 +0000)]
Merge "Clean up unused code." into gb-ub-photos-carlsbad
ztenghui [Tue, 13 Aug 2013 23:21:49 +0000 (23:21 +0000)]
Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad
ztenghui [Tue, 13 Aug 2013 22:53:57 +0000 (15:53 -0700)]
Hide the actionbar and title at the beginning
bug:
10245009
Change-Id: I39640e9f7add0c8ae20257dd5c71cefd4a927a0e
Sascha Haeberling [Tue, 13 Aug 2013 23:10:01 +0000 (16:10 -0700)]
Don't take a snapshot if video recording is not in progress.
Bug:
10312841
Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
Sascha Haeberling [Tue, 13 Aug 2013 21:41:10 +0000 (14:41 -0700)]
Clean up unused code.
Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
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
OSDN Git Service
