OSDN Git Service
Doris Liu [Thu, 30 Jan 2014 21:11:29 +0000 (13:11 -0800)]
Fix NPE
This NPE is caused by not having a PreviewStatusListener in
photosphere module. Hooking up PreviewStatusListener in
photosphere requires a refactor which is non-trivial amount
of work.
So for now, a null check is added here to prevent NPE
and the logic of detecting and handling device flip will be
added into photosphere to properly handle device flp.
Part II at ag/412607
Bug:
12679997
Change-Id: I5392674e387800e6a2a3114ec3f834b439aed31e
Doris Liu [Wed, 29 Jan 2014 07:31:58 +0000 (07:31 +0000)]
Merge "Use mutable drawable to avoid sharing drawable states" into gb-ub-photos-denali
Doris Liu [Wed, 29 Jan 2014 02:22:51 +0000 (18:22 -0800)]
Use mutable drawable to avoid sharing drawable states
Bug:
12594617
Change-Id: I798b67ed42a5593c346643d42ebf1143d54551e6
Erin Dahlgren [Wed, 29 Jan 2014 01:49:27 +0000 (01:49 +0000)]
Merge "Fix secure camera launch crash." into gb-ub-photos-denali
Erin Dahlgren [Wed, 29 Jan 2014 01:40:28 +0000 (17:40 -0800)]
Fix secure camera launch crash.
Bug:
12783858
Change-Id: Iff5cfecff986966f63b40d2db4bc1d31037f12d4
Doris Liu [Wed, 29 Jan 2014 01:19:50 +0000 (01:19 +0000)]
Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
Doris Liu [Sat, 18 Jan 2014 01:21:42 +0000 (17:21 -0800)]
Fix mode transition jank and stretched video preview
Bug:
11963674
Change-Id: I9cb292aa3dea6b0073dfc19af8105dce1f0c9865
Seth Raphael [Tue, 28 Jan 2014 22:14:24 +0000 (22:14 +0000)]
Merge "Clearcut Logs" into gb-ub-photos-denali
Seth Raphael [Wed, 18 Dec 2013 21:45:03 +0000 (13:45 -0800)]
Clearcut Logs
Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
Spike Sprague [Sat, 25 Jan 2014 02:08:33 +0000 (02:08 +0000)]
Merge "reset capture button state on swipes" into gb-ub-photos-denali
Spike Sprague [Fri, 24 Jan 2014 23:41:28 +0000 (15:41 -0800)]
reset capture button state on swipes
bug:
12550678
Change-Id: I9678e55cdd19ca319686665b69e76a9984fa7a6a
Spike Sprague [Sat, 25 Jan 2014 00:59:25 +0000 (16:59 -0800)]
restore video bottom bar on app background during video capture
bug:
12726013
Change-Id: I3e69daad21835e7ce46427398531d0236703cb5a
Doris Liu [Fri, 24 Jan 2014 22:11:50 +0000 (14:11 -0800)]
Fix NPE by adding a onPause check
Bug:
12682478
Change-Id: Ida9c79287751089449569ec26dcf1c1f195afde9
Sascha Haeberling [Fri, 24 Jan 2014 02:28:57 +0000 (02:28 +0000)]
Merge "Adds an API for temporary session storage." into gb-ub-photos-denali
Sascha Haeberling [Thu, 23 Jan 2014 02:45:43 +0000 (18:45 -0800)]
Adds an API for temporary session storage.
Bug:
12064183
This is required so that we can have all modules that have sessions
use the same logic for creating and deleting them.
Change-Id: I20591310d6b4534e564ab60608049eec87f823f9
Erin Dahlgren [Thu, 23 Jan 2014 19:13:30 +0000 (19:13 +0000)]
Merge "Use ninepatch for indicator background." into gb-ub-photos-denali
Baligh Uddin [Thu, 23 Jan 2014 18:15:09 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81642c60b0380b70e6d0556ae47f0421853ddee4
Auto-generated-cl: translation import
Erin Dahlgren [Thu, 23 Jan 2014 02:14:21 +0000 (18:14 -0800)]
Use ninepatch for indicator background.
Bug:
12602711
Change-Id: Id513f526331b4dbefcfae1f2bff548cbf4bbac94
Sascha Haeberling [Wed, 22 Jan 2014 22:16:25 +0000 (22:16 +0000)]
Merge "Move focus overlay into generic_module." into gb-ub-photos-denali
Sascha Haeberling [Sat, 18 Jan 2014 03:03:52 +0000 (19:03 -0800)]
Move focus overlay into generic_module.
Bug:
12563457
Also cleans up the focus overlay API.
Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6
Erin Dahlgren [Wed, 22 Jan 2014 19:49:33 +0000 (11:49 -0800)]
Switch to gcam module only if gcam is supported.
Bug:
12682385
Bug:
12594403
Change-Id: I86b8156ea5027818135ccfce03a1d23f377055f2
Erin Dahlgren [Wed, 22 Jan 2014 17:43:29 +0000 (09:43 -0800)]
Fix the build: limit hdr icons.
Change-Id: I64772bc1cae76487e2d13b3a7f5f666b99a66124
Erin Dahlgren [Wed, 22 Jan 2014 17:26:09 +0000 (17:26 +0000)]
Merge "Add hdr option and indicator" into gb-ub-photos-denali
Erin Dahlgren [Wed, 22 Jan 2014 00:32:43 +0000 (00:32 +0000)]
Merge "Fix the build: use exported panorama values in helper class." into gb-ub-photos-denali
Erin Dahlgren [Wed, 22 Jan 2014 00:16:06 +0000 (16:16 -0800)]
Fix the build: use exported panorama values in helper class.
Change-Id: I5b22fe0504fa113f3867d7e626087c9880bbccdd
Angus Kong [Tue, 21 Jan 2014 23:45:56 +0000 (23:45 +0000)]
Merge "Adjust bottom control button positions." into gb-ub-photos-denali
Angus Kong [Sat, 18 Jan 2014 09:44:10 +0000 (01:44 -0800)]
Adjust bottom control button positions.
bug:
12138517
Change-Id: Ife7511e232ba9f02ac83800df129fafaf65c0f46
Erin Dahlgren [Tue, 21 Jan 2014 22:04:55 +0000 (14:04 -0800)]
Add hdr option and indicator
Bug:
12440745
Change-Id: I2e5b8d860a19cd1fd1299dc42d13b26b6b5e88ec
Erin Dahlgren [Tue, 21 Jan 2014 17:31:11 +0000 (09:31 -0800)]
Support for panorama and photosphere bottom bar ui.
Bug:
12438294
Change-Id: If8a6f3b8aafd81980290655fb3ad461928f9c520
Erin Dahlgren [Tue, 14 Jan 2014 23:58:52 +0000 (15:58 -0800)]
Remove global UI elements based on supported camera parameters.
Bug:
12192238
Change-Id: I6373adeaa9c95385a2a4ca8d81cf7656550911f2
Doris Liu [Sat, 18 Jan 2014 01:36:59 +0000 (01:36 +0000)]
Merge "Improve responsiveness of mode selection highlight" into gb-ub-photos-denali
Sascha Haeberling [Sat, 18 Jan 2014 01:33:32 +0000 (17:33 -0800)]
Change order of modules to spec.
Bug:
12607061
Change-Id: Iff142b2571f17f71f7a76d629119ac4c8c7f2764
Doris Liu [Sat, 18 Jan 2014 01:24:38 +0000 (17:24 -0800)]
Improve responsiveness of mode selection highlight
Bug:
12449459
Change-Id: Ifc5e42119e216827a187f6bb0b6f3c7d2f2bf672
Spike Sprague [Fri, 17 Jan 2014 22:55:22 +0000 (22:55 +0000)]
Merge "black background in image_capture intent review ui." into gb-ub-photos-denali
Spike Sprague [Fri, 17 Jan 2014 22:38:58 +0000 (14:38 -0800)]
black background in image_capture intent review ui.
bug:
12606986
Change-Id: I1ee01eba431b7576094445c86c5c577a851c90c3
Andy Huibers [Fri, 17 Jan 2014 22:09:03 +0000 (22:09 +0000)]
Merge "Fix for video parameter setting bug on Nexus 5. Fixes b/
12250181 and b/
12481202." into gb-ub-photos-denali
Kevin Gabayan [Fri, 17 Jan 2014 22:01:38 +0000 (22:01 +0000)]
Merge "Measure time to first valid preview frame in testImageCapture. Bug:
11999851" into gb-ub-photos-denali
Kevin Gabayan [Wed, 15 Jan 2014 23:21:13 +0000 (15:21 -0800)]
Measure time to first valid preview frame in testImageCapture.
Bug:
11999851
Change-Id: Iec695d7de98454435fc9ae239a500fedb9eee894
Spike Sprague [Fri, 17 Jan 2014 21:59:02 +0000 (21:59 +0000)]
Merge "3 dots press state in bottom bar should be sticky" into gb-ub-photos-denali
Andy Huibers [Wed, 15 Jan 2014 06:25:52 +0000 (22:25 -0800)]
Fix for video parameter setting bug on Nexus 5.
Fixes b/
12250181 and b/
12481202.
Change-Id: I64da29470a0c9e2a418fd614e41d181c42ece388
Spike Sprague [Fri, 17 Jan 2014 20:28:50 +0000 (12:28 -0800)]
Change the press state transparency value in the video bottom bar
bug:
12600857
Change-Id: I12852fb936443bef67211ba21ed51a4fb9feae28
Spike Sprague [Fri, 17 Jan 2014 20:22:04 +0000 (12:22 -0800)]
3 dots press state in bottom bar should be sticky
bug:
12600702
Change-Id: Ibd6725e8441775d6d6bced08280430e180bd1c37
Doris Liu [Fri, 17 Jan 2014 02:03:18 +0000 (18:03 -0800)]
Hide focus UI during recording
Bug:
12584173
Change-Id: Ibca621b9b961a480b48950f668eb7f6da9055619
Carlos Hernandez [Thu, 16 Jan 2014 21:10:00 +0000 (13:10 -0800)]
Pass CameraServices to ProcessingTask
Change-Id: Ie9c06fe4e03afc6eb051a9bb17ee985251b53d62
Carlos Hernandez [Thu, 16 Jan 2014 22:49:46 +0000 (22:49 +0000)]
Merge "Pass CameraServices to ProcessingTask" into gb-ub-photos-denali
Spike Sprague [Thu, 16 Jan 2014 22:31:05 +0000 (22:31 +0000)]
Merge "video capture button tweak" into gb-ub-photos-denali
Spike Sprague [Thu, 16 Jan 2014 22:28:25 +0000 (14:28 -0800)]
build break fix
Change-Id: I0178453fc19acb76cb612e84e43a0530d2fb7e49
Spike Sprague [Thu, 16 Jan 2014 19:39:23 +0000 (11:39 -0800)]
video capture button tweak
bug:
12563852
Change-Id: I39a242ca4cd3832eefd2e205d287d64ceba309b1
Erin Dahlgren [Thu, 16 Jan 2014 22:12:35 +0000 (22:12 +0000)]
Merge "Set the shutter button icon across all modes." into gb-ub-photos-denali
Spike Sprague [Thu, 16 Jan 2014 22:09:13 +0000 (22:09 +0000)]
Merge "button background press states" into gb-ub-photos-denali
Erin Dahlgren [Thu, 16 Jan 2014 21:29:42 +0000 (13:29 -0800)]
Set the shutter button icon across all modes.
Bug:
12552362
Change-Id: I55d4238b0ddbc4bb3ea206dc577381b6de2f68a7
Sascha Haeberling [Thu, 16 Jan 2014 21:56:36 +0000 (21:56 +0000)]
Merge "Add 10MP Moto X resolution." into gb-ub-photos-denali
Sascha Haeberling [Thu, 16 Jan 2014 21:11:46 +0000 (13:11 -0800)]
Add 10MP Moto X resolution.
Bug:
12586353
Change-Id: Ie29227df3dbaca1eed52ced222c8d1868710aa9d
Carlos Hernandez [Thu, 16 Jan 2014 21:10:00 +0000 (13:10 -0800)]
Pass CameraServices to ProcessingTask
Change-Id: Ie9c06fe4e03afc6eb051a9bb17ee985251b53d62
Angus Kong [Thu, 16 Jan 2014 19:58:44 +0000 (19:58 +0000)]
Merge "Change refocus icon asset." into gb-ub-photos-denali
Angus Kong [Thu, 16 Jan 2014 19:06:46 +0000 (11:06 -0800)]
Change refocus icon asset.
bug:
12550183
Change-Id: Iad54468a1f88bcc23e68ebda39931c93c5ee407d
Spike Sprague [Wed, 15 Jan 2014 18:11:54 +0000 (10:11 -0800)]
button background press states
bug:
12450227
Change-Id: I9008a4d57545bd081a4c6539c64d23b939d4ab95
Doris Liu [Thu, 16 Jan 2014 03:55:57 +0000 (03:55 +0000)]
Merge "Fix focus indicator slightly off center during CAF" into gb-ub-photos-denali
Doris Liu [Thu, 16 Jan 2014 03:50:40 +0000 (03:50 +0000)]
Merge "Add quick switch support for advanced camera" into gb-ub-photos-denali
Doris Liu [Thu, 16 Jan 2014 03:29:34 +0000 (19:29 -0800)]
Fix focus indicator slightly off center during CAF
Change-Id: I5eaf14682e81d95f738a356985eb8d40bdc54524
Doris Liu [Thu, 16 Jan 2014 03:17:38 +0000 (19:17 -0800)]
Add quick switch support for advanced camera
Bug:
12429444
Change-Id: I62d5a5b3ce2b8d0ca8d19c8f3a35363114815b20
Sascha Haeberling [Thu, 16 Jan 2014 02:23:55 +0000 (02:23 +0000)]
Merge "Disables swipe during video recording and during photo sphere sessions." into gb-ub-photos-denali
Angus Kong [Thu, 16 Jan 2014 00:55:38 +0000 (00:55 +0000)]
Merge "Make up affordance dependent on installed packages" into gb-ub-photos-denali
Angus Kong [Wed, 15 Jan 2014 22:40:27 +0000 (14:40 -0800)]
Make up affordance dependent on installed packages
bug:
12549744
Change-Id: I3b39ccb45518f1044c2149bd5b8c633a6899d96c
Sascha Haeberling [Thu, 16 Jan 2014 00:33:59 +0000 (16:33 -0800)]
Disables swipe during video recording and during photo sphere sessions.
Bug:
12554964
Change-Id: I2ab1ae34ae6964371680418eac3583b2e766b26c
Spike Sprague [Wed, 15 Jan 2014 23:55:35 +0000 (23:55 +0000)]
Merge "adjusted capture button highlight as per comments in b/
12560596" into gb-ub-photos-denali
Spike Sprague [Wed, 15 Jan 2014 23:10:07 +0000 (15:10 -0800)]
adjusted capture button highlight as per comments in b/
12560596
Change-Id: I9326121e8836898035ecfc6254467567f7b4c431
Spike Sprague [Wed, 15 Jan 2014 23:14:31 +0000 (23:14 +0000)]
Merge "snappier video bottom bar animation" into gb-ub-photos-denali
Doris Liu [Wed, 15 Jan 2014 21:56:56 +0000 (21:56 +0000)]
Merge "Open mode draw at a constant speed when there's a fast fling" into gb-ub-photos-denali
Doris Liu [Wed, 15 Jan 2014 20:26:17 +0000 (12:26 -0800)]
Open mode draw at a constant speed when there's a fast fling
Bug:
12544207
Change-Id: I104d81c0a74bb46f38ff8cd61dd9f13a2d615ed7
Erin Dahlgren [Wed, 15 Jan 2014 21:11:04 +0000 (13:11 -0800)]
Remove conflicting refocus pngs.
Bug:
12567150
Change-Id: I56f6639cab5933e5e672572d4cd5a84042893f54
Spike Sprague [Wed, 15 Jan 2014 20:15:03 +0000 (12:15 -0800)]
snappier video bottom bar animation
bug:
12568407
Change-Id: I827b5d6c0e39ad704bd0b8aef1a8feaad7d6614f
Angus Kong [Wed, 15 Jan 2014 18:57:37 +0000 (18:57 +0000)]
Merge "Fix size of filmstrip bottom controls sizes." into gb-ub-photos-denali
Erin Dahlgren [Wed, 15 Jan 2014 18:39:48 +0000 (18:39 +0000)]
Merge "On screen indicators in top right in landscape." into gb-ub-photos-denali
Spike Sprague [Wed, 15 Jan 2014 18:21:41 +0000 (10:21 -0800)]
refine capture button hilight area
bug:
12560596
Change-Id: Ib0032bc6be21107361605f109caa5e5de7e4b682
Angus Kong [Wed, 15 Jan 2014 17:44:16 +0000 (09:44 -0800)]
Fix size of filmstrip bottom controls sizes.
bug:
12550232
Change-Id: Ib73d0ccf16304b706781ea2760d22c668cde2aa8
Doris Liu [Wed, 15 Jan 2014 01:51:32 +0000 (17:51 -0800)]
Fix face view in simple camera
Part II at ag/407562
Bug:
12460604
Change-Id: I9532d5dae7c156568fef944b81127c6ff194a394
Angus Kong [Wed, 15 Jan 2014 01:03:24 +0000 (01:03 +0000)]
Merge "Returns unwrapped refreshed in-progress data." into gb-ub-photos-denali
Angus Kong [Wed, 15 Jan 2014 00:37:26 +0000 (16:37 -0800)]
Returns unwrapped refreshed in-progress data.
bug:
12550918
Change-Id: Ia5794abb96abb980c06e874f4fd5d08ca5884343
Angus Kong [Tue, 14 Jan 2014 22:25:45 +0000 (14:25 -0800)]
Up affordance should act as back key in 1up view.
bug:
12549094
Change-Id: Id19e2532d9aae929ee15e518a6cd125ff4e550ac
Erin Dahlgren [Tue, 14 Jan 2014 23:24:46 +0000 (15:24 -0800)]
On screen indicators in top right in landscape.
Bug:
12525286
Change-Id: I5c56d0498504b2ec37211523c6212b6925ec7bf5
Angus Kong [Mon, 13 Jan 2014 23:06:17 +0000 (15:06 -0800)]
Add more filmstrip fullscreen states.
And callbacks for new state events also.
bug:
12468756
Change-Id: I0ebdd99f251394a871c1e050e565fc5cd1706324
Erin Dahlgren [Tue, 14 Jan 2014 19:14:27 +0000 (19:14 +0000)]
Merge "Fix stale button references." into gb-ub-photos-denali
Erin Dahlgren [Tue, 14 Jan 2014 19:08:59 +0000 (11:08 -0800)]
Fix stale button references.
Bug:
12537343
Change-Id: I9c48f9dcfe82afbf89562010daf94b767d53911c
Spike Sprague [Tue, 14 Jan 2014 19:07:22 +0000 (11:07 -0800)]
fix for bottom bar not taking set color immediately
half of b/
12537343
Change-Id: Ib9fe344be9c6d24af6b6b246f13070d4c21d00f1
Doris Liu [Tue, 14 Jan 2014 01:29:40 +0000 (17:29 -0800)]
Add aggressive continuous auto focus to video preview
Also added touch to focus for video preview
Part II is at ag/407029
Bug:
12368866
Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
Spike Sprague [Tue, 14 Jan 2014 02:10:54 +0000 (18:10 -0800)]
capture button pressed colors
Change-Id: Ia568be11e6f9b6160f3f8332b504866cbe6ac94f
Spike Sprague [Mon, 13 Jan 2014 22:22:18 +0000 (14:22 -0800)]
new video bottom bar ui
crossfade record <-> stop
full bar <-> single button cicle wipe
Change-Id: I58e0ddd94221374809acd52a6f0649e419203f54
Angus Kong [Tue, 14 Jan 2014 01:58:53 +0000 (01:58 +0000)]
Merge "Move external view button to the bottom" into gb-ub-photos-denali
Angus Kong [Tue, 14 Jan 2014 01:38:34 +0000 (17:38 -0800)]
Move external view button to the bottom
Change-Id: Ic7a213335b6a5bddacb2ea5ed450626fc5bdbc69
Erin Dahlgren [Tue, 14 Jan 2014 01:30:43 +0000 (01:30 +0000)]
Merge "Sync dependencies between bottom bar options." into gb-ub-photos-denali
Erin Dahlgren [Tue, 14 Jan 2014 00:26:00 +0000 (00:26 +0000)]
Merge "Match dimens of TopRightMostOverlay child with the ReferenceView." into gb-ub-photos-denali
Erin Dahlgren [Fri, 10 Jan 2014 06:17:38 +0000 (22:17 -0800)]
Sync dependencies between bottom bar options.
* Centralizes the bottom bar button customization.
* Makes HDR+ and front camera exclusive.
Bug:
12469207
Change-Id: I65e3d16d314a26889f04e9bcc26fa4bf095150b7
Conflicts:
src/com/android/camera/ButtonManager.java
Angus Kong [Mon, 13 Jan 2014 22:44:25 +0000 (22:44 +0000)]
Merge "Clear the camera instance before switching." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 21:51:25 +0000 (21:51 +0000)]
Merge "Sync new ux-assets." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 20:39:56 +0000 (12:39 -0800)]
Sync new ux-assets.
Change-Id: I12bf5f8b058cda17517943c76a826ce9887392ed
Erin Dahlgren [Mon, 13 Jan 2014 20:25:45 +0000 (12:25 -0800)]
Match dimens of TopRightMostOverlay child with the ReferenceView.
Change-Id: I356059893bcc3bb8ffda1aef9726f8df4466f42c
Erin Dahlgren [Mon, 13 Jan 2014 20:12:26 +0000 (20:12 +0000)]
Merge "Ensure that SharedPreference listeners respond to known keys." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 19:38:37 +0000 (19:38 +0000)]
Merge "Make Front and back camera a mode specific setting." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 19:35:16 +0000 (11:35 -0800)]
Ensure that SharedPreference listeners respond to known keys.
Bug:
12439970
Change-Id: Ic4cbfd9823a17294af3b2d3eecd654131bf92cd5
OSDN Git Service
