OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoam 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camer...
Senpo Hu [Sat, 27 Jun 2015 21:25:21 +0000 (21:25 +0000)]
am 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

* commit '75dcaf3bd47ec093f5805dc422dcdd397d2d0e1a':
  Fix transform issue in CaptureIntent.

9 years agoam 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
Senpo Hu [Sat, 27 Jun 2015 21:18:47 +0000 (21:18 +0000)]
am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

* commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f':
  Fix transform issue in CaptureIntent.

9 years agoMerge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
Senpo Hu [Thu, 25 Jun 2015 17:32:49 +0000 (17:32 +0000)]
Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

9 years agoFix transform issue in CaptureIntent.
Senpo Hu [Fri, 12 Jun 2015 23:20:46 +0000 (16:20 -0700)]
Fix transform issue in CaptureIntent.

On M, EventOnTextureViewLayoutChanged comes earlier during app
initialization in StateForeground which doesn't handle it. So
here in StateReadyForCapture, we pull the current preview layout
size and inform ResourceSurfaceTexture to allow it to calculate
transform.

Noted that we also need to bring this fix to Ivvavik.

Bug: 21786937
Bug: 20173626
Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1

9 years agoam d3611d6a: AOSP Camera source should run camera2 API on M
Alan Newberger [Fri, 19 Jun 2015 22:34:42 +0000 (22:34 +0000)]
am d3611d6a: AOSP Camera source should run camera2 API on M

* commit 'd3611d6a86f46fb877e5260410ddd6389445be1e':
  AOSP Camera source should run camera2 API on M

9 years agoAOSP Camera source should run camera2 API on M
Alan Newberger [Fri, 19 Jun 2015 20:59:32 +0000 (13:59 -0700)]
AOSP Camera source should run camera2 API on M

In all cases has Camera2 app run in CaptureModule, using
capability levels to configure in either LEGACY or LIMITED
JPEG, or full ZSL mode.

BUG=21490086

Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa

9 years agoam e07a7e90: (-s ours) am 2399038f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 16 Jun 2015 20:06:40 +0000 (20:06 +0000)]
am e07a7e90: (-s ours) am 2399038f: (-s ours) Import translations. DO NOT MERGE

* commit 'e07a7e90a11a60e073ef55d3633671ca29177e6c':
  Import translations. DO NOT MERGE

9 years agoam 2399038f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 16 Jun 2015 14:39:12 +0000 (14:39 +0000)]
am 2399038f: (-s ours) Import translations. DO NOT MERGE

* commit '2399038f488c5ae0a4cd6fb45301ff8747a29be1':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 16 Jun 2015 14:26:13 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 01:33:49 +0000 (01:33 +0000)]
am 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgrade

* commit '71d368a9672dc366165a16d7f6a94797dafd92c9':
  Fix for invalidated resolutions via upgrade

9 years agoam 8d8b329d: Fix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 00:36:14 +0000 (00:36 +0000)]
am 8d8b329d: Fix for invalidated resolutions via upgrade

* commit '8d8b329da25456adb5ee45e0450680654114e125':
  Fix for invalidated resolutions via upgrade

9 years agoFix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 00:10:30 +0000 (17:10 -0700)]
Fix for invalidated resolutions via upgrade

Bug: 21758681

There was a upgrade bug where an valid resolution of the
previous version of the Camera App could then be invalidated
the subsequent version of the Camera App.  If there were no
other valid resolutions of the same aspect ratio available
to the app, the current Camera App would choose (0,0) as its
default size and then write this value into the saved settings.

This fix allows the current Camera App to consider other resolutions
not of aspect ratio as a fallback resolution setting.  Also, if
an invalid resolution valid has been saved to the settings, it
also ignores it and then resaves a valid resolution value to the
settings.

Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00

9 years agoam 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 21:30:39 +0000 (21:30 +0000)]
am 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip

* commit '5b76be0d5896711d4d8b08a23c8f86bc48583d2e':
  Refresh required for full-screen undo in filmstrip

9 years agoam e2323c53: Refresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 21:23:53 +0000 (21:23 +0000)]
am e2323c53: Refresh required for full-screen undo in filmstrip

* commit 'e2323c537f0ec4966ad58251a14e1437071ae085':
  Refresh required for full-screen undo in filmstrip

9 years agoRefresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 19:24:51 +0000 (12:24 -0700)]
Refresh required for full-screen undo in filmstrip

Bug: 21666018

A Glacier regression bug: when filmstrip is in full-screen mode,
and an deletion is undone, a blank screen is shown.  With the fix,
the undo forces the filmstrip into its "filmstrip" mode and
forces a refresh with the un-deleted image.

Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997

9 years agoam f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 18:29:42 +0000 (18:29 +0000)]
am f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGE

* commit 'f7fa07b1018362acd62c0aed6a773faaa4d124e5':
  Import translations. DO NOT MERGE

9 years agoam 43c0ecae: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 18:21:52 +0000 (18:21 +0000)]
am 43c0ecae: (-s ours) Import translations. DO NOT MERGE

* commit '43c0ecae9759eb19ab4485e367e1b09f7291578f':
  Import translations. DO NOT MERGE

9 years agoam 1c94fe67: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 16:43:06 +0000 (16:43 +0000)]
am 1c94fe67: (-s ours) Import translations. DO NOT MERGE

* commit '1c94fe675b519315f91a38c95412d334c8c23f05':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 12:36:01 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 12:34:54 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam d949816b: (-s ours) am f79704fb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 18:19:52 +0000 (18:19 +0000)]
am d949816b: (-s ours) am f79704fb: (-s ours) Import translations. DO NOT MERGE

* commit 'd949816b38b64bd62573a5ce15ddba0073f30918':
  Import translations. DO NOT MERGE

9 years agoam 78b74c20: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 17:42:05 +0000 (17:42 +0000)]
am 78b74c20: (-s ours) Import translations. DO NOT MERGE

* commit '78b74c2032b749395cbc37bc0f9993dfd4b2231c':
  Import translations. DO NOT MERGE

9 years agoam f79704fb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 17:35:54 +0000 (17:35 +0000)]
am f79704fb: (-s ours) Import translations. DO NOT MERGE

* commit 'f79704fb4a9798b11f7cb5f725903019b9701d1a':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 16:20:51 +0000 (09:20 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 16:18:50 +0000 (09:18 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:39:46 +0000 (13:39 +0000)]
am 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE

* commit '7081fd655bee82f050854aa9ec2cb6a461d95014':
  Import translations. DO NOT MERGE

9 years agoam 8fb1558e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:24:00 +0000 (13:24 +0000)]
am 8fb1558e: (-s ours) Import translations. DO NOT MERGE

* commit '8fb1558e59bd04e40b2d70731190e72e8efb25e1':
  Import translations. DO NOT MERGE

9 years agoam 4fa352a2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:23:35 +0000 (13:23 +0000)]
am 4fa352a2: (-s ours) Import translations. DO NOT MERGE

* commit '4fa352a29cb96fe72032a55222baae8ff4257f4c':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:07:40 +0000 (06:07 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:06:40 +0000 (06:06 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam ab2bc522: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 22:42:28 +0000 (22:42 +0000)]
am ab2bc522: (-s ours) Import translations. DO NOT MERGE

* commit 'ab2bc5228305da8da7576685692be06ea6481288':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 22:28:13 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 16:44:02 +0000 (16:44 +0000)]
am ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE

* commit 'ee1910d4d1fc3a73f10bc72c2233f10744499e15':
  Import translations. DO NOT MERGE

9 years agoam 818a2ecc: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 16:34:53 +0000 (16:34 +0000)]
am 818a2ecc: (-s ours) Import translations. DO NOT MERGE

* commit '818a2ecc3f9756866c03d462667499ae88ef2a2a':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 16:15:38 +0000 (09:15 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 862447f3: am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier...
Sascha Haeberling [Fri, 29 May 2015 23:57:51 +0000 (23:57 +0000)]
am 862447f3: am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.

* commit '862447f384ca4e210bafff498503b94ad72c0980':
  Use Google Feedback CrashBuilder API to make reports easier to consume.

9 years agoam 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.
Sascha Haeberling [Fri, 29 May 2015 23:42:00 +0000 (23:42 +0000)]
am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.

* commit '2eb8298b5fa99af132f6be6da920ed8867974488':
  Use Google Feedback CrashBuilder API to make reports easier to consume.

9 years agoUse Google Feedback CrashBuilder API to make reports easier to consume.
Sascha Haeberling [Fri, 29 May 2015 23:20:28 +0000 (16:20 -0700)]
Use Google Feedback CrashBuilder API to make reports easier to consume.

Manual Cherry-Pick Part 1 of http://ag/699672

Currently, Feedback reports don't include a stacktrace. You have to
download
a system log file to find it. This tweak allows us to see the stacktrace
on the Report page itself.

Example old report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517267704
Example new report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517601160

Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75

9 years agoam 7958ad5c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:11 +0000 (19:19 +0000)]
am 7958ad5c: (-s ours) Import translations. DO NOT MERGE

* commit '7958ad5c113e056de683dfd365b086e660622c8c':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:16:03 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 3d908f59: am e6b00bf3: Fix for unusable camera after quick pause/resume and HDR...
Gabriel Nava [Fri, 29 May 2015 02:23:12 +0000 (02:23 +0000)]
am 3d908f59: am e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

* commit '3d908f59f7640d2d352bb35476338d1ac52f2806':
  Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

9 years agoam e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera...
Gabriel Nava [Fri, 29 May 2015 00:07:42 +0000 (00:07 +0000)]
am e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

* commit 'e6b00bf3c0319cba17ce23161402568c8e3c3547':
  Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

9 years agoFix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)
Gabriel Nava [Thu, 28 May 2015 16:36:23 +0000 (09:36 -0700)]
Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

- Removing the hack for b/18854352
- Running the camera reopen camera operations and onReadyForCapture callback in a non-UI thread to avoid dead-locks

Bug: 21025113
Change-Id: I5545148769d92e5a87ffa9b693397fd7737edee6

9 years agoam 3609a80b: am dad39b12: Add logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:37:41 +0000 (00:37 +0000)]
am 3609a80b: am dad39b12: Add logging for when a session knowingly failed.

* commit '3609a80b8671b38a282f59795301fd9885b401ff':
  Add logging for when a session knowingly failed.

9 years agoam dad39b12: Add logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:27:21 +0000 (00:27 +0000)]
am dad39b12: Add logging for when a session knowingly failed.

* commit 'dad39b12816f05468476804b7caf3ef39a4aa682':
  Add logging for when a session knowingly failed.

9 years agoAdd logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:04:28 +0000 (17:04 -0700)]
Add logging for when a session knowingly failed.

 Bug: 21169512

Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9

9 years agoam 7c4ad98a: am 14d92c34: Merge "Log capture session canceled events." into ub-camera...
Paul Rohde [Wed, 27 May 2015 23:58:02 +0000 (23:58 +0000)]
am 7c4ad98a: am 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala

* commit '7c4ad98a4068e88491bddfe948610e58341d7f4c':
  Log capture session canceled events.

9 years agoam 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala
Paul Rohde [Wed, 27 May 2015 23:47:34 +0000 (23:47 +0000)]
am 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala

* commit '14d92c346e1890cf3eeb0fb9c846d834e2c59179':
  Log capture session canceled events.

9 years agoMerge "Log capture session canceled events." into ub-camera-haleakala
Paul Rohde [Wed, 27 May 2015 23:36:28 +0000 (23:36 +0000)]
Merge "Log capture session canceled events." into ub-camera-haleakala

9 years agoLog capture session canceled events.
Paul Rohde [Wed, 27 May 2015 22:14:59 +0000 (15:14 -0700)]
Log capture session canceled events.

This will handle the edgecase where capture sessions may be
canceled inbetween the time the button is pressed and the capture
actually starts so that it is possible to subtract these cases
out of the unsaved image data.

Bug: 21169512
Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6

9 years agoam 84a379ff: am d927492a: Handling the GcamService timeout due to application in...
Gabriel Nava [Wed, 27 May 2015 21:08:02 +0000 (21:08 +0000)]
am 84a379ff: am d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala)

* commit '84a379fffdc439e49623178e81b9535904de0030':
  Handling the GcamService timeout due to application in paused state (camera-Haleakala)

9 years agoam d927492a: Handling the GcamService timeout due to application in paused state...
Gabriel Nava [Wed, 27 May 2015 20:50:21 +0000 (20:50 +0000)]
am d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala)

* commit 'd927492ade2e253ccc620effd5602582eaa6dd2d':
  Handling the GcamService timeout due to application in paused state (camera-Haleakala)

9 years agoHandling the GcamService timeout due to application in paused state (camera-Haleakala)
Gabriel Nava [Wed, 27 May 2015 17:42:03 +0000 (10:42 -0700)]
Handling the GcamService timeout due to application in paused state (camera-Haleakala)

- When GcamService times out due to a pause state, all resources are released.
- Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera

Bug: 21025113
Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913

9 years agoam fefb0259: (-s ours) am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:28:44 +0000 (14:28 +0000)]
am fefb0259: (-s ours) am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE

* commit 'fefb025973e2bffcbeb02666339fb7797513d82e':
  Import translations. DO NOT MERGE

9 years agoam 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:22:06 +0000 (14:22 +0000)]
am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE

* commit '7ca4f1a488c01a649bf39fae1848cd31b1dfaa65':
  Import translations. DO NOT MERGE

9 years agoam b14ca683: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 14:16:11 +0000 (14:16 +0000)]
am b14ca683: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'b14ca683faeb243119363f51206133d8391c921f':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 14:09:50 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:42:33 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:41:30 +0000 (06:41 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam f8b9b59a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 13:31:14 +0000 (13:31 +0000)]
am f8b9b59a: (-s ours) Import translations. DO NOT MERGE

* commit 'f8b9b59adb97d30f3c778587c3069bc90a5c1998':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 04:21:54 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 08f4a90f: am 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug...
Spike Sprague [Thu, 21 May 2015 01:29:49 +0000 (01:29 +0000)]
am 08f4a90f: am 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434

* commit '08f4a90f4e4d0416612a138568b2a931c14a9d91':
  Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434

9 years agoam 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434
Spike Sprague [Thu, 21 May 2015 01:20:59 +0000 (01:20 +0000)]
am 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434

* commit '090f2fce636d45d8e32d3e8cb665c0880d5a9e70':
  Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434

9 years agoFill out more EXIF data, closer parity to Nexus HAL
Spike Sprague [Wed, 20 May 2015 02:03:23 +0000 (19:03 -0700)]
Fill out more EXIF data, closer parity to Nexus HAL
bug: 21277434

Change-Id: I4e4d9b4bffa6b0a8ccb3e870d553643dd27d2356

9 years agoam a344634f: am fa77628e: Merge "Don\'t attempt to update thumbnail if session is...
Sascha Haeberling [Wed, 20 May 2015 22:14:30 +0000 (22:14 +0000)]
am a344634f: am fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala

* commit 'a344634f121d245d2096af445d3f4e5afe94f6f4':
  Don't attempt to update thumbnail if session is finished.

9 years agoam 5266ca5c: am 51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in botto...
Gabriel Nava [Wed, 20 May 2015 22:14:29 +0000 (22:14 +0000)]
am 5266ca5c: am 51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

* commit '5266ca5cdbb0a024449769317e09a441e13e6ddf':
  Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

9 years agoam fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into...
Sascha Haeberling [Wed, 20 May 2015 22:00:54 +0000 (22:00 +0000)]
am fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala

* commit 'fa77628ec03fcd74af79da7a85437b0fd14bdae2':
  Don't attempt to update thumbnail if session is finished.

9 years agoam 51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera...
Gabriel Nava [Wed, 20 May 2015 22:00:53 +0000 (22:00 +0000)]
am 51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

* commit '51495cc98578dda7ea2e9eafd5271f2dc0bc2d97':
  Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

9 years agoMerge "Don't attempt to update thumbnail if session is finished." into ub-camera...
Sascha Haeberling [Wed, 20 May 2015 21:54:13 +0000 (21:54 +0000)]
Merge "Don't attempt to update thumbnail if session is finished." into ub-camera-haleakala

9 years agoDon't attempt to update thumbnail if session is finished.
Sascha Haeberling [Wed, 20 May 2015 21:41:53 +0000 (14:41 -0700)]
Don't attempt to update thumbnail if session is finished.

  Bug: 21167342

Change-Id: If2e4db523aa66e82809d30aa35fb9a30d124d9df

9 years agoFix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Gabriel Nava [Wed, 20 May 2015 19:39:02 +0000 (12:39 -0700)]
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

Bug: 20957536
Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e

9 years agoam a93b4225: am 76ab7148: Merge "Log capture started and bytes on disk" into ub-camer...
Paul Rohde [Wed, 20 May 2015 19:35:45 +0000 (19:35 +0000)]
am a93b4225: am 76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala

* commit 'a93b4225a5b965dbd00a85864a7b6ce345a1eefe':
  Log capture started and bytes on disk

9 years agoam 76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala
Paul Rohde [Wed, 20 May 2015 19:21:07 +0000 (19:21 +0000)]
am 76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala

* commit '76ab7148d30b5eab605f3448ac4ff1613f2f019d':
  Log capture started and bytes on disk

9 years agoam 3e2860f4: am 95a80b6b: Make filmstrip grey squares less common.
Paul Rohde [Wed, 20 May 2015 19:19:01 +0000 (19:19 +0000)]
am 3e2860f4: am 95a80b6b: Make filmstrip grey squares less common.

* commit '3e2860f4a66e3048126ce4d2791c01a69652e17b':
  Make filmstrip grey squares less common.

9 years agoam b1f23f9b: am 10aea802: Merge "Workaround of the face detection failure on L and...
Pengchong Jin [Wed, 20 May 2015 19:19:00 +0000 (19:19 +0000)]
am b1f23f9b: am 10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala

* commit 'b1f23f9b60e28c814828e3a87652ef5580c647f4':
  Workaround of the face detection failure on L and N5

9 years agoam f5e47427: am 83160a84: Merge "Increase the default JPG buffer size." into ub-camer...
Paul Rohde [Wed, 20 May 2015 19:18:59 +0000 (19:18 +0000)]
am f5e47427: am 83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala

* commit 'f5e47427300ffc5e667765621d801d80f6873d22':
  Increase the default JPG buffer size.

9 years agoam 47e2f28a: am a5813069: Dynamic configuration management for Camera2
Alan Newberger [Wed, 20 May 2015 19:18:58 +0000 (19:18 +0000)]
am 47e2f28a: am a5813069: Dynamic configuration management for Camera2

* commit '47e2f28a64e5b52c6fadb459336c182751b72751':
  Dynamic configuration management for Camera2

9 years agoam 95a80b6b: Make filmstrip grey squares less common.
Paul Rohde [Wed, 20 May 2015 19:04:48 +0000 (19:04 +0000)]
am 95a80b6b: Make filmstrip grey squares less common.

* commit '95a80b6bd97d306cafc74fb96be00ea0eeba1842':
  Make filmstrip grey squares less common.

9 years agoam 10aea802: Merge "Workaround of the face detection failure on L and N5" into ub...
Pengchong Jin [Wed, 20 May 2015 19:04:47 +0000 (19:04 +0000)]
am 10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala

* commit '10aea802d1ab9e2a05e65b347fdb89153bbd2e5a':
  Workaround of the face detection failure on L and N5

9 years agoam 83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala
Paul Rohde [Wed, 20 May 2015 19:04:45 +0000 (19:04 +0000)]
am 83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala

* commit '83160a849de1488a602f08821ee14353ef67973f':
  Increase the default JPG buffer size.

9 years agoam a5813069: Dynamic configuration management for Camera2
Alan Newberger [Wed, 20 May 2015 19:04:44 +0000 (19:04 +0000)]
am a5813069: Dynamic configuration management for Camera2

* commit 'a5813069b90628f20dca2184dbb579200a958670':
  Dynamic configuration management for Camera2

9 years agoMerge "Log capture started and bytes on disk" into ub-camera-haleakala
Paul Rohde [Wed, 20 May 2015 18:43:37 +0000 (18:43 +0000)]
Merge "Log capture started and bytes on disk" into ub-camera-haleakala

9 years agoam beb40ca9: Declare that Camera2 does not use cleartext network traffic.
Alex Klyubin [Wed, 20 May 2015 16:22:50 +0000 (16:22 +0000)]
am beb40ca9: Declare that Camera2 does not use cleartext network traffic.

* commit 'beb40ca95cc4acc2045fb0fe8faa32be2df3ef66':
  Declare that Camera2 does not use cleartext network traffic.

9 years agoLog capture started and bytes on disk
Paul Rohde [Fri, 15 May 2015 22:29:26 +0000 (15:29 -0700)]
Log capture started and bytes on disk

Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890

9 years agoDeclare that Camera2 does not use cleartext network traffic.
Alex Klyubin [Thu, 2 Apr 2015 19:40:54 +0000 (12:40 -0700)]
Declare that Camera2 does not use cleartext network traffic.

This declares to the platform and tools that this app does not use
cleartext network traffic. The platform and tools will be blocking
(on best effort basis) attempts to use such traffic by this app.
For example, attempts to use HTTP (rather than HTTPS) will be blocked.

Bug: 19215516
Change-Id: Icaad30144192b13df87726445e19c37e0fd824bf
(cherry picked from commit 2cd1529cd3ae0aa03e9e28d20b07ac072fc065c0)

9 years agoMake filmstrip grey squares less common.
Paul Rohde [Mon, 18 May 2015 18:27:40 +0000 (11:27 -0700)]
Make filmstrip grey squares less common.

Increase the encoding priority of the intermediate thumbnails
by changing the task priority to "Average". This causes the
intermediate thumbs to run on their own thread pool, after
the tiny thumbs are generated but allow them to not get
prempted by slow, full jpg encoding tasks.

Bug: 21169512

Change-Id: I2862acac724cf6302c896feeeb04702170cbf030

9 years agoMerge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
Pengchong Jin [Fri, 15 May 2015 23:12:21 +0000 (23:12 +0000)]
Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala

9 years agoMerge "Increase the default JPG buffer size." into ub-camera-haleakala
Paul Rohde [Fri, 15 May 2015 22:55:21 +0000 (22:55 +0000)]
Merge "Increase the default JPG buffer size." into ub-camera-haleakala

9 years agoIncrease the default JPG buffer size.
Paul Rohde [Fri, 15 May 2015 22:30:13 +0000 (15:30 -0700)]
Increase the default JPG buffer size.

BUG: 21162720
Change-Id: Ie9d634533778c254a000da92f0af2948d814b1dd

9 years agoDynamic configuration management for Camera2
Alan Newberger [Fri, 15 May 2015 22:05:00 +0000 (15:05 -0700)]
Dynamic configuration management for Camera2

Ensure Camera2 app selects the appropriate OneCamera per
feature configuration.

Bug: 21204365
Change-Id: I47671a91c89f20e2add2f1f3889d4411341fa1dc

9 years agoWorkaround of the face detection failure on L and N5
Pengchong Jin [Fri, 15 May 2015 20:07:10 +0000 (13:07 -0700)]
Workaround of the face detection failure on L and N5

This patch is a workaround of the face detection failure on L
and Nexus 5. For Nexus 5 on L, the current FD only works when
the preview stream is configured as the first stream before the
JPEG stream. This change lock the order by creating a capture
session with the preview stream first, and then creating the
normal capture session with preview and JPEG.

Bug: b/21039466

Change-Id: Icb7f1f758bc9d7ca428c7a4748223072d39dd57f

9 years agoam e3ef956f: keep history after reset to ub-camera-haleakala
Alex Cheung [Fri, 15 May 2015 18:51:03 +0000 (18:51 +0000)]
am e3ef956f: keep history after reset to ub-camera-haleakala

* commit 'e3ef956f23cf797ba59f9eb5c04abb6d5277fb6f':

9 years agokeep history after reset to ub-camera-haleakala
Alex Cheung [Fri, 15 May 2015 18:17:02 +0000 (11:17 -0700)]
keep history after reset to ub-camera-haleakala

9 years agoam 1e9a2942: am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
Eino-Ville Talvala [Fri, 15 May 2015 17:38:15 +0000 (17:38 +0000)]
am 1e9a2942: am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier

* commit '1e9a294273b5d22e2fbf3bb52d805783cf700d0b':

9 years agoam e75df71e: am 29a009c9: Add additional lifecycle logging to Camera
Alan Newberger [Fri, 15 May 2015 17:38:05 +0000 (17:38 +0000)]
am e75df71e: am 29a009c9: Add additional lifecycle logging to Camera

* commit 'e75df71e5b38d314a958279e8fb110dc4fb792c1':

9 years agoam df435d0e: am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s...
Sascha Haeberling [Fri, 15 May 2015 17:37:55 +0000 (17:37 +0000)]
am df435d0e: am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier

* commit 'df435d0e26b6fa5f0d8443b2d9098d61b54a9f00':

9 years agoam 2615ec28: am eacf9460: Merge "remove stray bool resource for determining if OS...
Spike Sprague [Fri, 15 May 2015 17:37:42 +0000 (17:37 +0000)]
am 2615ec28: am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier

* commit '2615ec286fe2b14e0c5ab59b08aa8a570dca049f':

9 years agoam db943ef7: am 17d9084e: Add short flash animation and shutter sound to ZSL camera.
Andy Huibers [Fri, 15 May 2015 17:37:32 +0000 (17:37 +0000)]
am db943ef7: am 17d9084e: Add short flash animation and shutter sound to ZSL camera.

* commit 'db943ef7dc6c6882a77dca49e1628f484ae591ad':

9 years agoam 45e49681: (-s ours) am f096e898: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 15 May 2015 17:37:30 +0000 (17:37 +0000)]
am 45e49681: (-s ours) am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '45e496813c438886b1cca69d61ddb48d00eb7c86':

9 years agoam e069d11a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
Baligh Uddin [Fri, 15 May 2015 17:37:28 +0000 (17:37 +0000)]
am e069d11a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala

* commit 'e069d11a272e54f0b2fa3bb6dd370199dba0b425':
  Import translations. DO NOT MERGE