OSDN Git Service
Sascha Haeberling [Wed, 4 Sep 2013 23:59:43 +0000 (16:59 -0700)]
Increase char limit.
Bug:
10590844
Change-Id: Ib30d348c1806e5c1b174bdd5198b880a2dca14e5
Mangesh Ghiware [Fri, 23 Aug 2013 20:28:21 +0000 (13:28 -0700)]
Bring back 'share 360 photosphere' to filmstrip
Bug:
10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
Doris Liu [Tue, 3 Sep 2013 23:03:16 +0000 (16:03 -0700)]
Double tap to zoom all the way in and out
Bug:
10308195
Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55
Baligh Uddin [Wed, 4 Sep 2013 05:03:40 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 4 Sep 2013 00:02:11 +0000 (17:02 -0700)]
Use app_name label now that we have the correct translations.
Bug:
10509882
Change-Id: I58e7d26afb5636fa156ec22b7c1cfa21262dd9f7
Baligh Uddin [Tue, 3 Sep 2013 21:39:33 +0000 (14:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib04bd2f74b2812001a26d50dfca2a27351e6cbe3
Auto-generated-cl: translation import
ztenghui [Tue, 3 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad
ztenghui [Tue, 3 Sep 2013 18:27:21 +0000 (11:27 -0700)]
Don't show action bar when in camera preview.
There are 3 cases we need to toggle the action bar.
1. Touch in full screen mode. onToggleActionBarVisibility()
2. Swipe back and forth to film stripe from preview. onSwitchMode()
3. In full screen mode, current data becomes the preview.
onCurrentDataChanged()
bug:
10563392
Change-Id: I576c49b767cd863da725cf991238c27440d85b9b
ztenghui [Tue, 3 Sep 2013 18:30:11 +0000 (11:30 -0700)]
Don't show the action bar in the capture intent.
bug:
10571262
Change-Id: I85ed9c632f76084db95ce24277fb303c67c3949f
Baligh Uddin [Sat, 31 Aug 2013 01:48:09 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4ef8cf1acece5a8413feffbbecc2e3713e28332
Auto-generated-cl: translation import
Sascha Haeberling [Sat, 31 Aug 2013 01:11:20 +0000 (18:11 -0700)]
Rename renering message from panorama to photo sphere.
Bug:
7695145
Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315
Doris Liu [Sat, 31 Aug 2013 00:34:33 +0000 (00:34 +0000)]
Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
Angus Kong [Sat, 31 Aug 2013 00:34:22 +0000 (00:34 +0000)]
Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
Angus Kong [Sat, 31 Aug 2013 00:09:46 +0000 (17:09 -0700)]
Make the preview thumbnail clicable after scaling.
bug:
10552110
Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa
Doris Liu [Fri, 30 Aug 2013 23:20:58 +0000 (16:20 -0700)]
Reset zoom view when user exits app or rotate device
Bug:
10308195
Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
Sascha Haeberling [Fri, 30 Aug 2013 23:35:52 +0000 (23:35 +0000)]
Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 23:30:18 +0000 (23:30 +0000)]
Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
Angus Kong [Fri, 30 Aug 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 23:25:00 +0000 (16:25 -0700)]
Measure all children to ensure correct layout position
Bug:
10412775
Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
Angus Kong [Fri, 30 Aug 2013 22:10:38 +0000 (15:10 -0700)]
Skip bitmaps with 0 dimension.
bug:
10514553
Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
Alan Newberger [Fri, 30 Aug 2013 22:19:48 +0000 (15:19 -0700)]
Add back button handlng to CameraActivity.
This CL first detects whether user is in filmstrip mode i.e. not in Camera,
if so brings user back to the first item which is the Camera. If in Camera,
we route back handling to the current Camera module which enables already-
written module handling for back button e.g. backing out of pie menus.
Bug:
8781981
Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
Alan Newberger [Fri, 30 Aug 2013 21:22:55 +0000 (21:22 +0000)]
Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 23 Aug 2013 17:10:30 +0000 (10:10 -0700)]
add up button support for filmstrip
This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue
10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed.
Bug:
10414498
Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
Sascha Haeberling [Fri, 30 Aug 2013 17:24:38 +0000 (17:24 +0000)]
Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 30 Aug 2013 03:32:08 +0000 (20:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27af5d736c885d9dbadfb635c5c6ea3a8f570543
Auto-generated-cl: translation import
Doris Liu [Fri, 30 Aug 2013 01:54:47 +0000 (01:54 +0000)]
Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 01:06:45 +0000 (18:06 -0700)]
Fix gap between camera controls and nav bar
Bug:
10097187
Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
Sascha Haeberling [Fri, 30 Aug 2013 00:47:49 +0000 (00:47 +0000)]
Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 30 Aug 2013 00:28:49 +0000 (17:28 -0700)]
Fix of memory issues with bitmaps in filmstrip.
Bug:
10495593
We should use the bigger scale factor of the two, and not the smaller.
Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
Sascha Haeberling [Fri, 30 Aug 2013 00:20:15 +0000 (00:20 +0000)]
Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
Doris Liu [Fri, 23 Aug 2013 20:35:24 +0000 (13:35 -0700)]
1:1 zoom integration
Bug:
10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
Sascha Haeberling [Thu, 29 Aug 2013 00:49:00 +0000 (17:49 -0700)]
Disable shutter button while picture is being taken.
Bug:
7328018
Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
Doris Liu [Thu, 29 Aug 2013 00:02:22 +0000 (00:02 +0000)]
Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
Doris Liu [Wed, 28 Aug 2013 21:28:45 +0000 (14:28 -0700)]
Flip capture thumb when using front facing camera
Bug:
10495008
Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
Sascha Haeberling [Wed, 28 Aug 2013 22:28:57 +0000 (15:28 -0700)]
Let the Camera app remember which mode it was started in last.
Bug:
7320368
Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
Sascha Haeberling [Wed, 28 Aug 2013 21:51:53 +0000 (14:51 -0700)]
Automatic versioning for Camera.
Bug:
10461009
This is the scheme copied from GMS Core and modified by Babel, which
allows us to generate version number more easily and also incorporate
build numbers into it.
Change-Id: I6ed4bf03e545a22423cb9936a5fcb67a50133490
ztenghui [Wed, 28 Aug 2013 20:52:25 +0000 (20:52 +0000)]
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
ztenghui [Fri, 23 Aug 2013 18:47:56 +0000 (11:47 -0700)]
Add rotate support in Film Strip
Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.
bug:
10367037
Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
Tenghui Zhu [Wed, 28 Aug 2013 16:50:48 +0000 (16:50 +0000)]
Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad
Tenghui Zhu [Wed, 28 Aug 2013 16:47:42 +0000 (16:47 +0000)]
Revert "Add rotate support in Film Strip"
This reverts commit
568ad02f9fd3993abf4b973bdd49a34737267c77.
Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
ztenghui [Wed, 28 Aug 2013 16:28:13 +0000 (16:28 +0000)]
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
ztenghui [Fri, 23 Aug 2013 18:47:56 +0000 (11:47 -0700)]
Add rotate support in Film Strip
Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.
bug:
10367037
Change-Id: I0b8128a806fa9e777a87967b294555daadced1c5
Sascha Haeberling [Tue, 27 Aug 2013 19:54:17 +0000 (12:54 -0700)]
Use the well-translated camera_label instead of app_name.
Bug:
10509953
Change-Id: Ia5522fce1892e521c12fcc2f152afe7009026ac5
Mangesh Ghiware [Tue, 27 Aug 2013 17:08:51 +0000 (17:08 +0000)]
Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 00:39:40 +0000 (00:39 +0000)]
Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 00:21:48 +0000 (17:21 -0700)]
Remove RefocusHelper.
Bug:
10494566
Change-Id: I0e5c665867fe324883ff199327df1ef3736cc7c7
Sascha Haeberling [Tue, 27 Aug 2013 00:20:12 +0000 (00:20 +0000)]
Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 26 Aug 2013 23:55:53 +0000 (16:55 -0700)]
Remove Refocus string and icon
Bug:
10494566
Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
Mangesh Ghiware [Fri, 23 Aug 2013 20:28:21 +0000 (13:28 -0700)]
Bring back Share to filmstrip
Bug:
10367406
Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
Sascha Haeberling [Mon, 26 Aug 2013 21:40:03 +0000 (14:40 -0700)]
Make parsing integers for details dialog more robust.
Bug:
7141309
Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd
Angus Kong [Fri, 23 Aug 2013 04:00:19 +0000 (21:00 -0700)]
Fix full-screen swipe layout.
bug:
10428905
Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
Angus Kong [Fri, 23 Aug 2013 20:21:59 +0000 (20:21 +0000)]
Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
Angus Kong [Thu, 22 Aug 2013 01:28:43 +0000 (18:28 -0700)]
Bring back undo delete confirmation.
Also corrects the default decoding size.
bug:
10413110
bug:
10330214
Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
Sascha Haeberling [Thu, 22 Aug 2013 20:49:46 +0000 (13:49 -0700)]
Proper I18N of the Details dialog, especially for RTL.
Bug:
7141309
Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
Sascha Haeberling [Thu, 22 Aug 2013 18:06:39 +0000 (18:06 +0000)]
Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 22 Aug 2013 01:57:10 +0000 (18:57 -0700)]
Speed up filmstrip by not decoding with default 3000px.
Bug:
10330214
Bug:
10430152
We need to tell the wrapped data adapters about the size we need. Also,
use a more efficient way to determine the sample size.
Change-Id: Ie2c6fb438f06d97d6e5420afdceccccf41040020
Doris Liu [Thu, 22 Aug 2013 01:45:29 +0000 (18:45 -0700)]
Fix preview thumb orientation
Bug:
10428123
Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
Angus Kong [Thu, 22 Aug 2013 01:19:40 +0000 (01:19 +0000)]
Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
Angus Kong [Wed, 21 Aug 2013 22:25:05 +0000 (15:25 -0700)]
Add support to "go-to-next" in film strip.
bug:
10328123
Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
Doris Liu [Thu, 22 Aug 2013 01:04:50 +0000 (01:04 +0000)]
Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
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
Angus Kong [Wed, 21 Aug 2013 23:14:36 +0000 (23:14 +0000)]
Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
Angus Kong [Wed, 21 Aug 2013 18:03:38 +0000 (11:03 -0700)]
Fix delete animation in fullscreen mode.
bug:
10414539
Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530
Angus Kong [Wed, 21 Aug 2013 18:27:35 +0000 (11:27 -0700)]
Stop the MediaSaveService after unbinding.
bug:
10361258
Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
Angus Kong [Wed, 21 Aug 2013 07:38:05 +0000 (00:38 -0700)]
Support filmstrip swipe in full-screen.
bug:
10341731
Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
Angus Kong [Wed, 21 Aug 2013 04:32:51 +0000 (04:32 +0000)]
Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
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
Angus Kong [Tue, 20 Aug 2013 06:25:48 +0000 (23:25 -0700)]
Update the final PhotoSphere result correctly.
bug:
10400557
Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062
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