OSDN Git Service
Yu Shan Emily Lau [Mon, 26 Aug 2013 23:07:28 +0000 (16:07 -0700)]
am
1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev
* commit '
1cc08feaf523d478dcf50bafdec0cf5b0a93c01b':
Adding back the camera tests to KLP-DEV after sorting them out in UB.
Yu Shan Emily Lau [Mon, 26 Aug 2013 23:03:26 +0000 (23:03 +0000)]
Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev
Sascha Haeberling [Mon, 26 Aug 2013 22:05:46 +0000 (15:05 -0700)]
am
d9114beb: am
3be7f94c: Make parsing integers for details dialog more robust.
* commit '
d9114beb2829c17f43c006bf368438834e71ce7a':
Make parsing integers for details dialog more robust.
Angus Kong [Mon, 26 Aug 2013 22:02:28 +0000 (15:02 -0700)]
am
919284cf: am
80af7dd8: Fix full-screen swipe layout.
* commit '
919284cf30980d0f2a01c2ca37046039e0b7d713':
Fix full-screen swipe layout.
Angus Kong [Mon, 26 Aug 2013 22:02:04 +0000 (15:02 -0700)]
am
dfb722fd: am
a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
* commit '
dfb722fd542d23b5908446fcc70c22caa7e08c8f':
Bring back undo delete confirmation.
Sascha Haeberling [Mon, 26 Aug 2013 21:56:40 +0000 (14:56 -0700)]
am
3be7f94c: Make parsing integers for details dialog more robust.
* commit '
3be7f94c1029728a8e236cfcde9c8bce68244095':
Make parsing integers for details dialog more robust.
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
Jason Noguchi [Thu, 22 Aug 2013 22:58:29 +0000 (15:58 -0700)]
Adding back the camera tests to KLP-DEV after sorting them out in UB.
Change-Id: I963aa71a31580fd42edc17a5f226b6d2c02b6f79
Angus Kong [Fri, 23 Aug 2013 21:44:22 +0000 (14:44 -0700)]
am
80af7dd8: Fix full-screen swipe layout.
* commit '
80af7dd871547d03ee9ff5023cbec00b1d8677ee':
Fix full-screen swipe layout.
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:43:05 +0000 (13:43 -0700)]
am
a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
* commit '
a2818f58b829f07021d69a36a831dcf339e9258a':
Bring back undo delete confirmation.
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 [Fri, 23 Aug 2013 00:51:29 +0000 (17:51 -0700)]
am
f2b312dd: am
e2fb9943: Proper I18N of the Details dialog, especially for RTL.
* commit '
f2b312ddb528d9faed743ed8d23d93789a572d34':
Proper I18N of the Details dialog, especially for RTL.
Sascha Haeberling [Fri, 23 Aug 2013 00:49:07 +0000 (17:49 -0700)]
am
e2fb9943: Proper I18N of the Details dialog, especially for RTL.
* commit '
e2fb9943fb2d5a51a651f138d88473bf7f62e0b9':
Proper I18N of the Details dialog, especially for RTL.
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 23:13:13 +0000 (16:13 -0700)]
am
779160b3: am
00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
* commit '
779160b3411588dfd018974f83414996dfb97665':
Speed up filmstrip by not decoding with default 3000px.
Doris Liu [Thu, 22 Aug 2013 23:13:13 +0000 (16:13 -0700)]
am
d567d7d5: am
ce2acbcb: Fix preview thumb orientation
* commit '
d567d7d51fc84b9abb9bb5b3c6bf46855234a480':
Fix preview thumb orientation
Angus Kong [Thu, 22 Aug 2013 23:13:12 +0000 (16:13 -0700)]
am
0174828e: am
f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
* commit '
0174828e574bc7c94c90be0dce7b3831983b0ff8':
Add support to "go-to-next" in film strip.
Doris Liu [Thu, 22 Aug 2013 23:13:12 +0000 (16:13 -0700)]
am
64335cf3: am
56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
* commit '
64335cf39cf7c94a6457160ef6d272b01f360167':
Fix video capture animation and video snapshot animation
Angus Kong [Thu, 22 Aug 2013 23:13:12 +0000 (16:13 -0700)]
am
10096771: am
15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
* commit '
10096771260244daedac89e70183c54bb577bd0c':
Fix delete animation in fullscreen mode.
Angus Kong [Thu, 22 Aug 2013 23:13:11 +0000 (16:13 -0700)]
am
0d9217b4: am
7e374eb0: Stop the MediaSaveService after unbinding.
* commit '
0d9217b4da9dab3b7e70c8df0a600f5601e9fee4':
Stop the MediaSaveService after unbinding.
Angus Kong [Thu, 22 Aug 2013 23:13:11 +0000 (16:13 -0700)]
am
ef851bf2: am
025136bb: Support filmstrip swipe in full-screen.
* commit '
ef851bf2984c3eba1db92e85f4e908ee56e192f9':
Support filmstrip swipe in full-screen.
Angus Kong [Thu, 22 Aug 2013 23:13:11 +0000 (16:13 -0700)]
am
78ad4a5a: am
87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
* commit '
78ad4a5af6f283bf358f75aaeef1231e74eaab12':
Update the final PhotoSphere result correctly.
Doris Liu [Thu, 22 Aug 2013 23:13:10 +0000 (16:13 -0700)]
am
de07dbb6: am
304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
* commit '
de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f':
Fix nav bar overlapping camera bottom UI controls
Sascha Haeberling [Thu, 22 Aug 2013 23:13:10 +0000 (16:13 -0700)]
am
fd791ba4: am
b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad
* commit '
fd791ba47fdca3f2c625293088c5869b221bfb1c':
Remove the "button" part of the shutter button description.
Doris Liu [Thu, 22 Aug 2013 23:13:10 +0000 (16:13 -0700)]
am
2acc6ac5: am
d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
* commit '
2acc6ac5e0720e484c2f860b1135b2165b1b5d19':
Fix video snapshot aspect ratio
Doris Liu [Thu, 22 Aug 2013 23:13:09 +0000 (16:13 -0700)]
am
b8ff43a2: am
2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
* commit '
b8ff43a2eef0aca35c685c5c6cbffa807944714c':
Make camera preview full screen
Sascha Haeberling [Thu, 22 Aug 2013 23:07:31 +0000 (16:07 -0700)]
am
00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
* commit '
00373f8a411042964f019a6355864a4c25fc2238':
Speed up filmstrip by not decoding with default 3000px.
Doris Liu [Thu, 22 Aug 2013 23:07:31 +0000 (16:07 -0700)]
am
ce2acbcb: Fix preview thumb orientation
* commit '
ce2acbcb77225b6d429a23e00f69aadde8c2378b':
Fix preview thumb orientation
Angus Kong [Thu, 22 Aug 2013 23:07:29 +0000 (16:07 -0700)]
am
f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
* commit '
f737ac489200f12b6a48c4d0f7b63c0731eb8713':
Add support to "go-to-next" in film strip.
Doris Liu [Thu, 22 Aug 2013 23:07:28 +0000 (16:07 -0700)]
am
56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
* commit '
56f16746c8b3208e12134fb51843dde988cc79bc':
Fix video capture animation and video snapshot animation
Angus Kong [Thu, 22 Aug 2013 23:07:28 +0000 (16:07 -0700)]
am
15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
* commit '
15396ca68c47a4ef14e6b23c6cd009d8915f8ea2':
Fix delete animation in fullscreen mode.
Angus Kong [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]
am
7e374eb0: Stop the MediaSaveService after unbinding.
* commit '
7e374eb0a450ed2689b556ab42a0a88c8f74df2e':
Stop the MediaSaveService after unbinding.
Angus Kong [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]
am
025136bb: Support filmstrip swipe in full-screen.
* commit '
025136bb4639d84b2a5a7b95367fabcc92b86415':
Support filmstrip swipe in full-screen.
Angus Kong [Thu, 22 Aug 2013 23:07:26 +0000 (16:07 -0700)]
am
87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
* commit '
870253516ce315888ac64e1921285e47154a75e7':
Update the final PhotoSphere result correctly.
Doris Liu [Thu, 22 Aug 2013 23:07:25 +0000 (16:07 -0700)]
am
304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
* commit '
304a6360c3b710a4a5781788b887ca479646c86f':
Fix nav bar overlapping camera bottom UI controls
Sascha Haeberling [Thu, 22 Aug 2013 23:07:25 +0000 (16:07 -0700)]
am
b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad
* commit '
b5ca24e7ce3aa1e3511f0bdf871fd7e41c247027':
Remove the "button" part of the shutter button description.
Doris Liu [Thu, 22 Aug 2013 23:07:24 +0000 (16:07 -0700)]
am
d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
* commit '
d7e01e25dab83af2fe093d73f8f5f705f1a27305':
Fix video snapshot aspect ratio
Doris Liu [Thu, 22 Aug 2013 23:07:24 +0000 (16:07 -0700)]
am
2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
* commit '
2b18ecece9ad0affe9054b2818722bf727fcde97':
Make camera preview full screen
Jason Noguchi [Thu, 22 Aug 2013 22:51:07 +0000 (15:51 -0700)]
am
17525fee: am
5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad
* commit '
17525fee654db267564485339b366356a8c42e91':
Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.
Jason Noguchi [Thu, 22 Aug 2013 22:47:12 +0000 (15:47 -0700)]
am
5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad
* commit '
5ad4114f1ad766fa0ec9a9e6469313dd000f426d':
Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.
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
Doris Liu [Tue, 20 Aug 2013 19:02:29 +0000 (12:02 -0700)]
am
d049c85e: am
13ca71eb: Fix squished preview
* commit '
d049c85e69dc388089deca097df3c5e58ce95371':
Fix squished preview
Doris Liu [Tue, 20 Aug 2013 18:59:47 +0000 (11:59 -0700)]
am
13ca71eb: Fix squished preview
* commit '
13ca71ebdbb2eb9c492da16262311b1290474f7d':
Fix squished preview
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 17:27:41 +0000 (10:27 -0700)]
am
9fd5ee8a: am
0819304b: Add "set as" capability in Film Strip
* commit '
9fd5ee8aae5f7aca69c65245007a10fe672422d7':
Add "set as" capability in Film Strip
nicolasroard [Tue, 20 Aug 2013 17:25:22 +0000 (10:25 -0700)]
am
0819304b: Add "set as" capability in Film Strip
* commit '
0819304bc06ffd3498d9fd0d8a148c50f0903c46':
Add "set as" capability in Film Strip
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 17:00:15 +0000 (10:00 -0700)]
am
cf43f817: am
722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'.
* commit '
cf43f817a0aff70ee126eb3c669584ef79824786':
Rename accessibility text for Photo Sphere mode from 'new panorama'.
Sascha Haeberling [Tue, 20 Aug 2013 16:58:05 +0000 (09:58 -0700)]
am
722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'.
* commit '
722c86077d15354ccf0d6e1acf5b6384df5da85f':
Rename accessibility text for Photo Sphere mode from 'new panorama'.
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:55:48 +0000 (14:55 -0700)]
am
49ab978a: am
b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
* commit '
49ab978ac5ee1d7188fefa18a5ebce1a016d2386':
Implement deletion in the menu.
Angus Kong [Mon, 19 Aug 2013 21:52:48 +0000 (14:52 -0700)]
am
b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
* commit '
b269061daf65d090e6836980b57c408f62039841':
Implement deletion in the menu.
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:40:30 +0000 (14:40 -0700)]
am
32ba33c6: am
b0a5929b: Add video details to the details menu
* commit '
32ba33c6b1f4735df00e57013a2fe0971defdc66':
Add video details to the details menu
Sascha Haeberling [Mon, 19 Aug 2013 21:37:40 +0000 (14:37 -0700)]
am
b0a5929b: Add video details to the details menu
* commit '
b0a5929b1dd0ddc2729e23ba95afdb43a1aecfd5':
Add video details to the details menu
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:25:22 +0000 (13:25 -0700)]
am
397586f0: am
99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad
* commit '
397586f086023ff3906cfcd5d3defd1b630af379':
Update the action bar style to match Bryce
ztenghui [Mon, 19 Aug 2013 20:23:10 +0000 (13:23 -0700)]
am
99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad
* commit '
99a5ef6f6158d0056c90135329da4af0dc8ca7f4':
Update the action bar style to match Bryce
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:53:32 +0000 (11:53 -0700)]
am
119bd7ec: am
e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
* commit '
119bd7ecb7724fae56989f92bb4b8f143bbfc5e0':
Don't refresh item on resume as it leads to a filmstrip bug.
Sascha Haeberling [Mon, 19 Aug 2013 18:50:07 +0000 (11:50 -0700)]
am
b030d20d: am
58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
* commit '
b030d20df5f95ab5078fefc77bb59138d45b0605':
Enable switching cameras in video mode.
Sascha Haeberling [Mon, 19 Aug 2013 18:49:38 +0000 (11:49 -0700)]
am
e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
* commit '
e98a59afc89fc97bc619ef8c3aa66781061592f8':
Don't refresh item on resume as it leads to a filmstrip bug.
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:46:48 +0000 (11:46 -0700)]
am
2c9dc8eb: am
88ef7664: Bring back the bottom controls in Filmstrip.
* commit '
2c9dc8eb28dcb508855002b0643526824fd51eb4':
Bring back the bottom controls in Filmstrip.
Sascha Haeberling [Mon, 19 Aug 2013 18:46:19 +0000 (11:46 -0700)]
am
58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
* commit '
58dfa0fb61e0499fdb108143da90014c463f05a2':
Enable switching cameras in video mode.
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:11 +0000 (11:43 -0700)]
am
88ef7664: Bring back the bottom controls in Filmstrip.
* commit '
88ef7664ba6a888fa5da8693091674e152b56192':
Bring back the bottom controls in Filmstrip.
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:57:51 +0000 (09:57 -0700)]
am
1a7fed5f: am
1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
* commit '
1a7fed5fdf84a3c796f50739b2f2842111b099fd':
Add the trim functionality back to FilmStripView
ztenghui [Mon, 19 Aug 2013 16:52:39 +0000 (09:52 -0700)]
am
1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
* commit '
1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f':
Add the trim functionality back to FilmStripView
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 01:03:17 +0000 (18:03 -0700)]
am
c5541a55: am
e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
* commit '
c5541a555c185a3ea665003eb085f7778028412e':
Add image 1:1 support
OSDN Git Service
