OSDN Git Service
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: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.
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 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: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 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: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: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: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: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: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: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:01:53 +0000 (18:01 -0700)]
am
e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
* commit '
e9d3428f605ef90efbf94c18abf5bba3ac64d870':
Add image 1:1 support
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:55:22 +0000 (16:55 -0700)]
am
856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad
* commit '
856d7ec4eac95a9411970228795945f0dae66af5':
Add back intent-filter for default category and main action.
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 [Fri, 16 Aug 2013 00:01:09 +0000 (17:01 -0700)]
am
4ff5a1ab: Set views in filmstrip invisible when alpha = 0.
* commit '
4ff5a1ab360577c6a7ec953f9197778c84c9d334':
Set views in filmstrip invisible when alpha = 0.
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 23:07:58 +0000 (16:07 -0700)]
am
394023fb: Single-tap in fullscreen view toggles ActionBar.
* commit '
394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7':
Single-tap in fullscreen view toggles ActionBar.
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 22:32:22 +0000 (15:32 -0700)]
am
fae11a16: 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.
* commit '
fae11a165e344a38811770c7d348eda214683edc':
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.
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:44:00 +0000 (14:44 -0700)]
am
29a27c76: 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
* commit '
29a27c76f2f581cdf5ab5c7e196312f635669420':
Brings back the details menu with most EXIF data in it. Some are still missing and will come back later.
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 18:10:12 +0000 (11:10 -0700)]
am
fca1c5ec: 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
* commit '
fca1c5ece5450914ed49115443e1d45737f2ee40':
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.
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 [Thu, 15 Aug 2013 00:02:02 +0000 (17:02 -0700)]
am
7e1c5fe2: Single tap to full screen mode.
* commit '
7e1c5fe26bc861d979b85014a511ba35bc1f4110':
Single tap to full screen mode.
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:13:36 +0000 (16:13 -0700)]
am
0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad
* commit '
0689254ef810c502c65852a7c54bf902e975b38a':
Make current view center in filmstrip.
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 [Wed, 14 Aug 2013 22:29:14 +0000 (15:29 -0700)]
am
92ae10ec: 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 reso
* commit '
92ae10ec320405d07c85a9e80be40293c65d85e0':
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.
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:39:18 +0000 (13:39 -0700)]
am
18a29449: Merge "Handle unexpected exceptions when loading videos." into gb-ub-photos-carlsbad
* commit '
18a29449cf72bb693eb63e30ba2b7e70853c454b':
Handle unexpected exceptions when loading videos.
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:44:52 +0000 (11:44 -0700)]
am
a1a52fc2: Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad." into gb-ub-photos-carlsbad
* commit '
a1a52fc26adbfa7f464b996cc5ea420d3f29a324':
Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad.
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:17:11 +0000 (11:17 -0700)]
am
0270ab73: Add back DisableCameraReceiver
* commit '
0270ab7337570c3dbd42a1a97a046a4459844fee':
Add back DisableCameraReceiver
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:15:50 +0000 (21:15 -0700)]
am
a34e8c7d: Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbad
* commit '
a34e8c7d439d17355df51e5e536bdbbd1744cc74':
Add activity-alias for Camera.
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 [Wed, 14 Aug 2013 03:28:36 +0000 (20:28 -0700)]
am
dcccc510: Fix camera preview stopped after onResume().
* commit '
dcccc510652b835fdbd39310a07849af8203052a':
Fix camera preview stopped after onResume().
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
ztenghui [Wed, 14 Aug 2013 00:27:17 +0000 (17:27 -0700)]
am
5894ec25: Fix view jumps when action bar is hiding
* commit '
5894ec256d231e5167239176cc90b96a49cb9148':
Fix view jumps when action bar is hiding
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:34:45 +0000 (16:34 -0700)]
am
1e335342: Merge "Don\'t take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad
* commit '
1e3353427a04b945bfc6e167e38b63e814329a9f':
Don't take a snapshot if video recording is not in progress.
Sascha Haeberling [Tue, 13 Aug 2013 23:34:45 +0000 (16:34 -0700)]
am
e96a4ad8: Merge "Clean up unused code." into gb-ub-photos-carlsbad
* commit '
e96a4ad86489b86d0ce2f7ce156723f4d9d94dba':
Clean up unused code.
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:23:39 +0000 (16:23 -0700)]
am
0abbdb37: Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad
* commit '
0abbdb370b4cd722a739cf65c7b5845ceef535b8':
Hide the actionbar and title at the beginning
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:58:31 +0000 (15:58 -0700)]
am
02ed1b27: Merge "Add the menu items back" into gb-ub-photos-carlsbad
* commit '
02ed1b27b8cd2d0493ed18aea1ce304b6837ef64':
Add the menu items back
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:45:20 +0000 (15:45 -0700)]
am
f9296614: Merge "Check for device support before taking video snapshots" into gb-ub-photos-carlsbad
* commit '
f9296614d552ccf9af1331748c42e8f59f0cda9e':
Check for device support before taking video snapshots
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 21:00:20 +0000 (14:00 -0700)]
am
6d8bb279: Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos-carlsbad
* commit '
6d8bb2792391182cf75783acaff5acb1c38d9be4':
Remove old video camera icon and label from Camera2