OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoMerge "Change session API to support location inside a task." into gb-ub-photos-denali
Sascha Haeberling [Sat, 8 Mar 2014 00:36:46 +0000 (00:36 +0000)]
Merge "Change session API to support location inside a task." into gb-ub-photos-denali

10 years agoMerge "proper preview letterboxing for not-so-tall apsect ratios" into gb-ub-photos...
Spike Sprague [Fri, 7 Mar 2014 23:09:14 +0000 (23:09 +0000)]
Merge "proper preview letterboxing for not-so-tall apsect ratios" into gb-ub-photos-denali

10 years agoproper preview letterboxing for not-so-tall apsect ratios
Spike Sprague [Fri, 7 Mar 2014 18:43:18 +0000 (10:43 -0800)]
proper preview letterboxing for not-so-tall apsect ratios

bug: 13085409

Change-Id: If574ff5fe290f4b5eb5e2fdb75e9592e5018dce4

10 years agoMerge "fix touch to focus in option bar area" into gb-ub-photos-denali
Spike Sprague [Fri, 7 Mar 2014 19:11:36 +0000 (19:11 +0000)]
Merge "fix touch to focus in option bar area" into gb-ub-photos-denali

10 years agofix touch to focus in option bar area
Spike Sprague [Fri, 7 Mar 2014 19:07:52 +0000 (11:07 -0800)]
fix touch to focus in option bar area

bug: 13348926
Change-Id: Ibbf0f45f50d072e5251d49b9999642efc96b84bd

10 years agoMerge "Add extra space to undo bar." into gb-ub-photos-denali
Andy Huibers [Fri, 7 Mar 2014 19:03:29 +0000 (19:03 +0000)]
Merge "Add extra space to undo bar." into gb-ub-photos-denali

10 years agoAdd extra space to undo bar.
Andy Huibers [Fri, 7 Mar 2014 18:22:10 +0000 (10:22 -0800)]
Add extra space to undo bar.

Change-Id: I535c40bd89c39ba4e596ac1ecb757b8c76f2c0fb

10 years agoMerge "Manage location recording state only in CameraActivity. Bug: 13230126" into...
Kevin Gabayan [Fri, 7 Mar 2014 18:13:23 +0000 (18:13 +0000)]
Merge "Manage location recording state only in CameraActivity. Bug: 13230126" into gb-ub-photos-denali

10 years agoMerge "Remove video-size parameter setting causing 720p video issues on Palman."...
Andy Huibers [Fri, 7 Mar 2014 05:05:43 +0000 (05:05 +0000)]
Merge "Remove video-size parameter setting causing 720p video issues on Palman." into gb-ub-photos-denali

10 years agoManage location recording state only in CameraActivity.
Kevin Gabayan [Fri, 7 Mar 2014 01:20:18 +0000 (17:20 -0800)]
Manage location recording state only in CameraActivity.
Bug: 13230126

Change-Id: Ia36b55e6678d1caa2ab5ba553f991e26664ea9ba

10 years agoMerge "Hide video recording hint if starting in landscape" into gb-ub-photos-denali
Doris Liu [Fri, 7 Mar 2014 01:51:58 +0000 (01:51 +0000)]
Merge "Hide video recording hint if starting in landscape" into gb-ub-photos-denali

10 years agoHide video recording hint if starting in landscape
Doris Liu [Fri, 7 Mar 2014 01:44:36 +0000 (17:44 -0800)]
Hide video recording hint if starting in landscape

Change-Id: I591dacf9aa2646dd465273580a21890c6abb072b

10 years agoRemove video-size parameter setting causing 720p video issues on Palman.
Andy Huibers [Fri, 7 Mar 2014 01:11:11 +0000 (17:11 -0800)]
Remove video-size parameter setting causing 720p video issues on Palman.

Bug: 13304124
Change-Id: I3e449afe446941a5286f36fe739311a1bb9ab135

10 years agoMerge "Allow touch event goes down to view in filmstrip" into gb-ub-photos-denali
Angus Kong [Fri, 7 Mar 2014 01:10:38 +0000 (01:10 +0000)]
Merge "Allow touch event goes down to view in filmstrip" into gb-ub-photos-denali

10 years agoAllow touch event goes down to view in filmstrip
Angus Kong [Fri, 7 Mar 2014 01:03:31 +0000 (17:03 -0800)]
Allow touch event goes down to view in filmstrip

bug:13027352
Change-Id: Iee5783a3698bea2fc5cd695d3b671c0206d2fbf2

10 years agoMerge "Align the peek to capture button in landscape" into gb-ub-photos-denali
Angus Kong [Thu, 6 Mar 2014 23:39:33 +0000 (23:39 +0000)]
Merge "Align the peek to capture button in landscape" into gb-ub-photos-denali

10 years agoAlign the peek to capture button in landscape
Angus Kong [Thu, 6 Mar 2014 23:11:54 +0000 (15:11 -0800)]
Align the peek to capture button in landscape

bug:13165526
Change-Id: Ib8bb3a1bfc6edd209061cff71567b66f0fe6525c

10 years agoMerge "options bar ui fixes" into gb-ub-photos-denali
Spike Sprague [Thu, 6 Mar 2014 23:00:41 +0000 (23:00 +0000)]
Merge "options bar ui fixes" into gb-ub-photos-denali

10 years agoMerge "video intent ui" into gb-ub-photos-denali
Spike Sprague [Thu, 6 Mar 2014 23:00:24 +0000 (23:00 +0000)]
Merge "video intent ui" into gb-ub-photos-denali

10 years agooptions bar ui fixes
Spike Sprague [Thu, 6 Mar 2014 20:37:11 +0000 (12:37 -0800)]
options bar ui fixes

bug: 13331173
bug: 13330727
Change-Id: I270fd04feeb8f6a4db6fae21184fad150be5fcbe

10 years agoAdd null check for listeners in BottomBar.
Angus Kong [Thu, 6 Mar 2014 22:27:23 +0000 (14:27 -0800)]
Add null check for listeners in BottomBar.

bug:13210080
Change-Id: Idd94318cbaed0bbb386ffc14fbdd58bf25adefc3

10 years agoAlign the gridlines with the preview area.
Angus Kong [Thu, 6 Mar 2014 20:57:29 +0000 (12:57 -0800)]
Align the gridlines with the preview area.

1. Rename onPreviewAreaSizeChanged() to onPreviewAreaChanged() since it's
passing in the real preview area and is called when the area is changed
regardless of size changes.
2. GridLines.java now draws the lines based on the preview area.

bug:13098715
Change-Id: Idbd2ba03cad4698689cee46d2aa04588a415fa3d

10 years agovideo intent ui
Spike Sprague [Tue, 18 Feb 2014 19:14:12 +0000 (11:14 -0800)]
video intent ui

bug: 13194672
Change-Id: I55ca912a4de78e75f4f6e23cf448beab4430a606

10 years agoChange session API to support location inside a task.
Sascha Haeberling [Thu, 6 Mar 2014 00:03:36 +0000 (16:03 -0800)]
Change session API to support location inside a task.

  Bug: 13325568

Change-Id: I72f69803ab304d198e8c74c194a36bd0820ac187

10 years agoMerge "Add build version to settings and add settings headers." into gb-ub-photos...
Sascha Haeberling [Thu, 6 Mar 2014 19:44:23 +0000 (19:44 +0000)]
Merge "Add build version to settings and add settings headers." into gb-ub-photos-denali

10 years agoMerge "Align preview to bottom bar." into gb-ub-photos-denali
Angus Kong [Thu, 6 Mar 2014 19:34:53 +0000 (19:34 +0000)]
Merge "Align preview to bottom bar." into gb-ub-photos-denali

10 years agoAlign preview to bottom bar.
Angus Kong [Thu, 6 Mar 2014 07:57:03 +0000 (23:57 -0800)]
Align preview to bottom bar.

bug:13210080
Change-Id: I6ec4071e2f21ef351b2b16a53662c2a3c1b29721

10 years agoMerge "Update .gitignore file." into gb-ub-photos-denali
Andy Huibers [Thu, 6 Mar 2014 18:37:32 +0000 (18:37 +0000)]
Merge "Update .gitignore file." into gb-ub-photos-denali

10 years agoMerge "Add video recording hint to discourage vertical videos" into gb-ub-photos...
Doris Liu [Thu, 6 Mar 2014 18:35:33 +0000 (18:35 +0000)]
Merge "Add video recording hint to discourage vertical videos" into gb-ub-photos-denali

10 years agoAvoid 720P video recording on Palman.
Andy Huibers [Thu, 6 Mar 2014 06:27:22 +0000 (22:27 -0800)]
Avoid 720P video recording on Palman.

Bug: 13304124
Change-Id: I107a8669308f857df5970628872e702b142b14d0

10 years agoAdd video recording hint to discourage vertical videos
Doris Liu [Fri, 28 Feb 2014 18:35:45 +0000 (10:35 -0800)]
Add video recording hint to discourage vertical videos

Bug: 8654023
Change-Id: I336f9e6af2393985e223a44a8e877e2878add76d

10 years agoAdd build version to settings and add settings headers.
Sascha Haeberling [Thu, 6 Mar 2014 01:30:12 +0000 (17:30 -0800)]
Add build version to settings and add settings headers.

  Bug: 13329975
  Bug: 13025151

Change-Id: I0259ec91da68efe1eed07b396f42fc69631413fd

10 years agoMerge "Tell the module it's visible when we start dragging out the filmstrip." into...
Sascha Haeberling [Wed, 5 Mar 2014 23:25:43 +0000 (23:25 +0000)]
Merge "Tell the module it's visible when we start dragging out the filmstrip." into gb-ub-photos-denali

10 years agoTell the module it's visible when we start dragging out the filmstrip.
Sascha Haeberling [Wed, 5 Mar 2014 23:19:27 +0000 (15:19 -0800)]
Tell the module it's visible when we start dragging out the filmstrip.

  Bug: 13327997

Change-Id: I56193472ad80246c8a1fe98e2d2d350231d208ec

10 years agoMerge "Add placeholder to use for tutorial screens across modules." into gb-ub-photos...
Sascha Haeberling [Wed, 5 Mar 2014 22:13:33 +0000 (22:13 +0000)]
Merge "Add placeholder to use for tutorial screens across modules." into gb-ub-photos-denali

10 years agoMerge "No switch camera when switching camera" into gb-ub-photos-denali
Angus Kong [Wed, 5 Mar 2014 22:07:33 +0000 (22:07 +0000)]
Merge "No switch camera when switching camera" into gb-ub-photos-denali

10 years agoMerge "Add details open event to logs." into gb-ub-photos-denali
Andy Huibers [Wed, 5 Mar 2014 21:29:04 +0000 (21:29 +0000)]
Merge "Add details open event to logs." into gb-ub-photos-denali

10 years agoMerge "implement capture options animation" into gb-ub-photos-denali
Spike Sprague [Wed, 5 Mar 2014 20:50:25 +0000 (20:50 +0000)]
Merge "implement capture options animation" into gb-ub-photos-denali

10 years agoMerge "Flatten the parameter in calling thread." into gb-ub-photos-denali
Angus Kong [Wed, 5 Mar 2014 20:47:48 +0000 (20:47 +0000)]
Merge "Flatten the parameter in calling thread." into gb-ub-photos-denali

10 years agoAdd details open event to logs.
Andy Huibers [Wed, 5 Mar 2014 19:36:26 +0000 (11:36 -0800)]
Add details open event to logs.

Change-Id: I6a468bcbb5dde0fb5703c629d0b305c0bc32f6cb

10 years agoRemove onPreviewReadyToStart from PhotoModule
Alan Newberger [Wed, 5 Mar 2014 19:50:40 +0000 (11:50 -0800)]
Remove onPreviewReadyToStart from PhotoModule

Removing this call results in no jank or loss of function on tested
devices, and resolves an issue on certain devices where starting the
callback prior to the preview results in a permanent mode cover. This
issue was not observed in any other mode, i.e. video is working on
warm start for all tested devices before and after this change.

Bug: 13078926
Change-Id: I7a63011dd96d40466d6bc3bb7f6867552a2b0dc8

10 years agoUpdate .gitignore file.
Andy Huibers [Wed, 5 Mar 2014 17:42:49 +0000 (09:42 -0800)]
Update .gitignore file.

Change-Id: I85a9319d50c1cc5465e338967bc2a3c09a643fa7

10 years agoAdd placeholder to use for tutorial screens across modules.
Sascha Haeberling [Wed, 5 Mar 2014 16:46:55 +0000 (08:46 -0800)]
Add placeholder to use for tutorial screens across modules.

  Bug: 13076376

Change-Id: Ia157040b460a296a61ce1c84e637c36f24072a15

10 years agoNo switch camera when switching camera
Angus Kong [Wed, 5 Mar 2014 02:44:49 +0000 (18:44 -0800)]
No switch camera when switching camera

bug:13234553
Change-Id: I1f26c2c69e5a0aee0ea1962a9cb2837bde94e02e

10 years agoOnly allow simple capture for image intents.
Erin Dahlgren [Wed, 5 Mar 2014 01:08:37 +0000 (17:08 -0800)]
Only allow simple capture for image intents.

Bug: 13289606
Change-Id: Id753def11f6499940a284b6bc3d33f5e45363183

10 years agoImplement return to hdr plus after switch to front facing camera.
Erin Dahlgren [Mon, 3 Mar 2014 20:05:57 +0000 (12:05 -0800)]
Implement return to hdr plus after switch to front facing camera.

Bug: 12894444
Change-Id: Ia9c0cba83f0ee99f2156e9e58f4fff1af9b6100f

10 years agoReduce the amount of peek animation.
Angus Kong [Tue, 4 Mar 2014 22:34:30 +0000 (14:34 -0800)]
Reduce the amount of peek animation.

bug:13165526
Change-Id: I3a338c0a770be2d53b8caa5f287d06e64f4549ef

10 years agoFlatten the parameter in calling thread.
Angus Kong [Tue, 4 Mar 2014 21:59:28 +0000 (13:59 -0800)]
Flatten the parameter in calling thread.

bug:13246321
Change-Id: Id88714b7c8d9ff00c4ab85781f44d1e5ec5a0bae

10 years agoimplement capture options animation
Spike Sprague [Thu, 27 Feb 2014 22:33:21 +0000 (14:33 -0800)]
implement capture options animation

bug: 13100962
Change-Id: I1baf64693d0e01e99bfa19d0bd8699fd33d5812a

10 years agoMerge "Don't show peek anim after 20 swipes to filmstrip." into gb-ub-photos-denali
Angus Kong [Tue, 4 Mar 2014 21:54:40 +0000 (21:54 +0000)]
Merge "Don't show peek anim after 20 swipes to filmstrip." into gb-ub-photos-denali

10 years agoMerge "Keep an reference count for CameraManager." into gb-ub-photos-denali
Angus Kong [Tue, 4 Mar 2014 20:46:00 +0000 (20:46 +0000)]
Merge "Keep an reference count for CameraManager." into gb-ub-photos-denali

10 years agoDon't show peek anim after 20 swipes to filmstrip.
Angus Kong [Mon, 3 Mar 2014 23:47:18 +0000 (15:47 -0800)]
Don't show peek anim after 20 swipes to filmstrip.

bug:13165526
Change-Id: I7e74ba9a92bb0e145ffda753c8a3475f1ea04417

10 years agoKeep an reference count for CameraManager.
Angus Kong [Tue, 4 Mar 2014 01:12:19 +0000 (17:12 -0800)]
Keep an reference count for CameraManager.

bug:13286589
Change-Id: Id4b44041044cb7439a4826c78b07411e68e2801e

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Mar 2014 20:54:48 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic1b3d688201df2039aa11844348ca188a913ae9c
Auto-generated-cl: translation import

10 years agoMerge "Add 'Details' menu item in filmstrip" into gb-ub-photos-denali
Sascha Haeberling [Sat, 1 Mar 2014 22:46:46 +0000 (22:46 +0000)]
Merge "Add 'Details' menu item in filmstrip" into gb-ub-photos-denali

10 years agoAdd 'Details' menu item in filmstrip
Sascha Haeberling [Sat, 1 Mar 2014 05:27:27 +0000 (21:27 -0800)]
Add 'Details' menu item in filmstrip

  Bug: 13029695
  Bug: 13176584

ALso fixes the chevron color on the home button.

Change-Id: I7f57da4ad94c5c89163fd6dfc724372ac84d0212

10 years agoMerge "New Shimmy" into gb-ub-photos-denali
Doris Liu [Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)]
Merge "New Shimmy" into gb-ub-photos-denali

10 years agoMerge "Force chooser for sharing actions" into gb-ub-photos-denali
Alan Newberger [Sat, 1 Mar 2014 01:59:47 +0000 (01:59 +0000)]
Merge "Force chooser for sharing actions" into gb-ub-photos-denali

10 years agoForce chooser for sharing actions
Alan Newberger [Sat, 1 Mar 2014 00:50:19 +0000 (16:50 -0800)]
Force chooser for sharing actions

User should not be able to select 'always' in the Camera filmstrip, so this
uses the system chooser. This does not do the same for panoramas. This is a
simple implementation, no querying for counts of intent receivers, but having
just one for images or videos is a corner case, showing the list is safe.

Bug: 13229214
Change-Id: I0b7a8327b157828e03edf65579318b758e1873e8

10 years agoNew Shimmy
Doris Liu [Wed, 26 Feb 2014 18:18:47 +0000 (10:18 -0800)]
New Shimmy

- Two step shimmy: first show the mode switcher, then hide it
  with a shimmy animation.
- Hiding will not start until after all the popups are dismissed

TODO:
- When mode switcher is shown for shimmy, text should be hidden (
  this involves cooridnating the timing to show text with user
  interaction)
- Need to have a graceful transition if user grabs the list on its
  way out

Bug: 13183433
Change-Id: Idda5520c3c3663864be0f478787ef603fdb0f6da

10 years agoMerge "Refine the logic in CameraController." into gb-ub-photos-denali
Angus Kong [Fri, 28 Feb 2014 21:41:21 +0000 (21:41 +0000)]
Merge "Refine the logic in CameraController." into gb-ub-photos-denali

10 years agoRefine the logic in CameraController.
Angus Kong [Fri, 28 Feb 2014 20:23:49 +0000 (12:23 -0800)]
Refine the logic in CameraController.

Define a constant for empty request and also add some documentation.

bug:13234553
Change-Id: Ib491dc94304451a215dd09995233edf340f57d2b

10 years agoMerge "Change progress bar color" into gb-ub-photos-denali
Angus Kong [Fri, 28 Feb 2014 20:30:04 +0000 (20:30 +0000)]
Merge "Change progress bar color" into gb-ub-photos-denali

10 years agoMerge "Remove unused refocus drawable." into gb-ub-photos-denali
Sascha Haeberling [Fri, 28 Feb 2014 20:23:56 +0000 (20:23 +0000)]
Merge "Remove unused refocus drawable." into gb-ub-photos-denali

10 years agoRemove unused refocus drawable.
Sascha Haeberling [Fri, 28 Feb 2014 20:22:16 +0000 (12:22 -0800)]
Remove unused refocus drawable.

Change-Id: I38922d8d8f3f98694d273b7902085ae6b828f359

10 years agoMerge "Make undo bar a bit wider to be more consistent with Android conventions....
Andy Huibers [Fri, 28 Feb 2014 20:19:28 +0000 (20:19 +0000)]
Merge "Make undo bar a bit wider to be more consistent with Android conventions." into gb-ub-photos-denali

10 years agoMerge "Add disabled capture icons for implementing disabled shutter." into gb-ub...
Erin Dahlgren [Fri, 28 Feb 2014 19:50:44 +0000 (19:50 +0000)]
Merge "Add disabled capture icons for implementing disabled shutter." into gb-ub-photos-denali

10 years agoAdd disabled capture icons for implementing disabled shutter.
Erin Dahlgren [Fri, 28 Feb 2014 18:36:24 +0000 (10:36 -0800)]
Add disabled capture icons for implementing disabled shutter.

Bug: 13244592
Change-Id: Ifb0c3181ef91e1fcd47b6ee6f6d2256a8a420e54

10 years agoMake undo bar a bit wider to be more consistent with Android conventions.
Andy Huibers [Fri, 28 Feb 2014 19:35:15 +0000 (11:35 -0800)]
Make undo bar a bit wider to be more consistent with Android conventions.

Change-Id: I2854c71f93009e3cbbb3d63319e2ca338c846df4

10 years agoMerge "Prevent crash during rapid switching camera" into gb-ub-photos-denali
Angus Kong [Fri, 28 Feb 2014 19:34:11 +0000 (19:34 +0000)]
Merge "Prevent crash during rapid switching camera" into gb-ub-photos-denali

10 years agoRemove animation when going from pressed to selected state
Doris Liu [Fri, 28 Feb 2014 18:41:22 +0000 (10:41 -0800)]
Remove animation when going from pressed to selected state

Bug: 13097259
Change-Id: I2098366fe68d11c68d8fb958680dcc33da7b4391

10 years agoPrevent crash during rapid switching camera
Angus Kong [Fri, 28 Feb 2014 18:38:20 +0000 (10:38 -0800)]
Prevent crash during rapid switching camera

1. Don't request new camera when the previous request is not fulfilled yet.
2. Send camera open message through dispatch thread also.

bug:13234553
Change-Id: I9962cf084bc7f39bcbf05946800fc28a39d204c7

10 years agoChange progress bar color
Angus Kong [Wed, 26 Feb 2014 06:50:27 +0000 (22:50 -0800)]
Change progress bar color

bug:13026663
Change-Id: I81171fee34c8cba21a74c1fbadc25f82e853143d

10 years agoAdd missing import
Carlos Hernandez [Fri, 28 Feb 2014 03:38:28 +0000 (19:38 -0800)]
Add missing import

Change-Id: Iaf8905808270399c35fa0c63f4839acc1edafaa3

10 years agoMerge "Add IsRGBZ to RefocusHelper" into gb-ub-photos-denali
Carlos Hernandez [Fri, 28 Feb 2014 03:18:21 +0000 (03:18 +0000)]
Merge "Add IsRGBZ to RefocusHelper" into gb-ub-photos-denali

10 years agoRemove spinner for in-progress data.
Angus Kong [Fri, 28 Feb 2014 01:29:49 +0000 (17:29 -0800)]
Remove spinner for in-progress data.

bug:13195977
Change-Id: I5083c191583945192e2417ad208d1bfaf2f19be1

10 years agoMerge "Show progress UI in secure camera." into gb-ub-photos-denali
Angus Kong [Fri, 28 Feb 2014 01:36:28 +0000 (01:36 +0000)]
Merge "Show progress UI in secure camera." into gb-ub-photos-denali

10 years agoShow progress UI in secure camera.
Angus Kong [Fri, 28 Feb 2014 00:58:11 +0000 (16:58 -0800)]
Show progress UI in secure camera.

bug:13226795
Change-Id: I9de44b1c802094b88797ab90ceb022a42b3589f9

10 years agoMerge "Add exif util file." into gb-ub-photos-denali
Sascha Haeberling [Fri, 28 Feb 2014 01:16:14 +0000 (01:16 +0000)]
Merge "Add exif util file." into gb-ub-photos-denali

10 years agoAdd exif util file.
Sascha Haeberling [Fri, 28 Feb 2014 01:07:40 +0000 (17:07 -0800)]
Add exif util file.

  Bug: 12067030

Change-Id: If5898b44335c004e3e750598f55a98516065a0ae

10 years agoAdd IsRGBZ to RefocusHelper
Carlos Hernandez [Fri, 28 Feb 2014 00:32:04 +0000 (16:32 -0800)]
Add IsRGBZ to RefocusHelper

Bug: 12210770

Change-Id: I4d030318f44b906a2f0e0d3f7c7d7387634098be

10 years agoMerge "30% transparent fill pressed state" into gb-ub-photos-denali
Doris Liu [Thu, 27 Feb 2014 23:29:57 +0000 (23:29 +0000)]
Merge "30% transparent fill pressed state" into gb-ub-photos-denali

10 years agoMerge "Make message more clear." into gb-ub-photos-denali
Sascha Haeberling [Thu, 27 Feb 2014 21:57:01 +0000 (21:57 +0000)]
Merge "Make message more clear." into gb-ub-photos-denali

10 years agoMake message more clear.
Sascha Haeberling [Thu, 27 Feb 2014 21:50:28 +0000 (13:50 -0800)]
Make message more clear.

Change-Id: Id7d08bb544a7f8adf15d8ecbbfddc75f52f92def

10 years agoMerge "Check whether the camera is opened when releasing" into gb-ub-photos-denali
Angus Kong [Thu, 27 Feb 2014 21:08:49 +0000 (21:08 +0000)]
Merge "Check whether the camera is opened when releasing" into gb-ub-photos-denali

10 years agoMerge "Only use a media retriever when necessary." into gb-ub-photos-denali
Seth Raphael [Thu, 27 Feb 2014 19:38:06 +0000 (19:38 +0000)]
Merge "Only use a media retriever when necessary." into gb-ub-photos-denali

10 years agoOnly use a media retriever when necessary.
Seth Raphael [Thu, 27 Feb 2014 19:08:34 +0000 (11:08 -0800)]
Only use a media retriever when necessary.

Previously we created a media retriever to query
the width and height of every video when making
the filmstrip data model.

This is extremely slow.  Now we query the content
resolver first, and only create a media retriever
if it seems that the content resolver has poor
values.

Bug: 13225572
Change-Id: Ic366adbc8f82036ddd727fafe04077ccdee37c80

10 years agoCheck whether the camera is opened when releasing
Angus Kong [Thu, 27 Feb 2014 06:52:05 +0000 (22:52 -0800)]
Check whether the camera is opened when releasing

bug:13213439
Change-Id: I7360aca7de7533c920c1a1f5c7293a99a571a247

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Thu, 27 Feb 2014 04:48:29 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

10 years ago30% transparent fill pressed state
Doris Liu [Wed, 26 Feb 2014 18:53:25 +0000 (10:53 -0800)]
30% transparent fill pressed state

Bug: 13097259
Change-Id: I2d22e78fd80b3069df74df1bee53ec6276aedc73

10 years agoMerge "Fix potential crash by moving OrientationManager init." into gb-ub-photos...
Sascha Haeberling [Thu, 27 Feb 2014 01:07:40 +0000 (01:07 +0000)]
Merge "Fix potential crash by moving OrientationManager init." into gb-ub-photos-denali

10 years agoFix potential crash by moving OrientationManager init.
Sascha Haeberling [Thu, 27 Feb 2014 00:43:19 +0000 (16:43 -0800)]
Fix potential crash by moving OrientationManager init.

  Bug: 13195324

Change-Id: I620c192495317d5268823bc4cf4c8ff3e75f45b5

10 years agoMerge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
Angus Kong [Thu, 27 Feb 2014 00:58:39 +0000 (00:58 +0000)]
Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali

10 years agoFirst sweep to clean up unused preference code.
Sascha Haeberling [Wed, 26 Feb 2014 22:10:48 +0000 (14:10 -0800)]
First sweep to clean up unused preference code.

Change-Id: I7caa89c8b5cb70824821d7fba5d05fbaadc39a2f

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Feb 2014 20:33:37 +0000 (12:33 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id8f1e6ae069115045a5152304f109b2561a77b31
Auto-generated-cl: translation import

10 years agoGeneralize shutter button listeners and add one for mode options.
Erin Dahlgren [Wed, 26 Feb 2014 03:16:12 +0000 (19:16 -0800)]
Generalize shutter button listeners and add one for mode options.

Bug: 13099000
Change-Id: Ib0726c70a9e4aa06197550f29360bacb2dda4783

10 years agoMerge "Pass Activity to GServices to launch panorama viewer." into gb-ub-photos-denali
Erin Dahlgren [Wed, 26 Feb 2014 19:19:54 +0000 (19:19 +0000)]
Merge "Pass Activity to GServices to launch panorama viewer." into gb-ub-photos-denali

10 years agoPass Activity to GServices to launch panorama viewer.
Erin Dahlgren [Wed, 26 Feb 2014 18:48:08 +0000 (10:48 -0800)]
Pass Activity to GServices to launch panorama viewer.

Bug: 13206692
Change-Id: Ie3d76fa7b3fd427d9cd3c1cf283e48173a06f41c

10 years agoHide action bar upon filmstrip is off position.
Angus Kong [Wed, 26 Feb 2014 07:45:52 +0000 (23:45 -0800)]
Hide action bar upon filmstrip is off position.

bug:13184003
Change-Id: I6ad2bf2c4d0da45764907d819a5d4651a9887209

10 years agoAlign progress bar with filmstrip bottom controls.
Angus Kong [Tue, 25 Feb 2014 18:37:39 +0000 (10:37 -0800)]
Align progress bar with filmstrip bottom controls.

bug:13026663
Change-Id: Ic751bf26475fd27237690678715e399f0d987e82