OSDN Git Service
Geoff Mendal [Mon, 13 Jul 2015 23:37:30 +0000 (23:37 +0000)]
am
a06a903f: (-s ours) am
5d806912: (-s ours) am
e27c079d: (-s ours) Import translations. DO NOT MERGE
* commit '
a06a903fa4f414bd5a1aa0c6061a5b46b7739013':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:37:29 +0000 (23:37 +0000)]
am
718859d8: (-s ours) am
0462d5b1: (-s ours) Import translations. DO NOT MERGE
* commit '
718859d892a1b0fae7cfe470e42a028f46da9000':
Import translations. DO NOT MERGE
Alan Newberger [Mon, 13 Jul 2015 23:34:32 +0000 (23:34 +0000)]
am
ca758103: am
c9b45d41: am
01c3f7ad: am
e25f675a: Shorten location startup dialog string
* commit '
ca758103543d7f5145ee93e876b7cf5b17b0fb37':
Shorten location startup dialog string
Geoff Mendal [Mon, 13 Jul 2015 23:00:23 +0000 (23:00 +0000)]
am
5d806912: (-s ours) am
e27c079d: (-s ours) Import translations. DO NOT MERGE
* commit '
5d806912451dd81453aac72c9b7b2fa53e4f6096':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:00:22 +0000 (23:00 +0000)]
am
0462d5b1: (-s ours) Import translations. DO NOT MERGE
* commit '
0462d5b16c7e6c00ecc6bf74df57fca7ba5a3c19':
Import translations. DO NOT MERGE
Alan Newberger [Mon, 13 Jul 2015 22:30:17 +0000 (22:30 +0000)]
am
c9b45d41: am
01c3f7ad: am
e25f675a: Shorten location startup dialog string
* commit '
c9b45d41b93f0e31ed88cf22db387006b8219333':
Shorten location startup dialog string
Geoff Mendal [Mon, 13 Jul 2015 15:09:29 +0000 (15:09 +0000)]
am
1fee657d: (-s ours) Import translations. DO NOT MERGE
* commit '
1fee657d480865262f8e4659624b1ae40f2963a6':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 16:51:55 +0000 (09:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77039d1b70cd2caa6f758fd1773e40289198b552
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 12:35:25 +0000 (12:35 +0000)]
am
e27c079d: (-s ours) Import translations. DO NOT MERGE
* commit '
e27c079d3634309d3d709a6bd8b1a2e5b032ec65':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:25:19 +0000 (05:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: If81760a295e909e517fe103cdd0fbe014d647dc5
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 12:24:20 +0000 (05:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4b769451a358ff48a35ec059b2574462fd2ddd65
Auto-generated-cl: translation import
Alan Newberger [Sat, 11 Jul 2015 00:34:29 +0000 (00:34 +0000)]
am
01c3f7ad: am
e25f675a: Shorten location startup dialog string
* commit '
01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0':
Shorten location startup dialog string
Alan Newberger [Sat, 11 Jul 2015 00:28:45 +0000 (00:28 +0000)]
am
e25f675a: Shorten location startup dialog string
* commit '
e25f675a189f56df57d08b62fa3604843dfee4a8':
Shorten location startup dialog string
Alan Newberger [Fri, 10 Jul 2015 23:46:40 +0000 (16:46 -0700)]
Shorten location startup dialog string
BUG=
21706101
Change-Id: I66164d43830cb71bb3a24f0f996a533358cb7d7e
Alan Newberger [Fri, 10 Jul 2015 17:15:34 +0000 (17:15 +0000)]
am
981eb996: am
ade8896d: am
2fc4970c: am
00720781: Null check when evaluating valid resolution size
* commit '
981eb996de64e9e798fa76c59e50d52e6dc1aa8f':
Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 17:06:43 +0000 (17:06 +0000)]
am
ade8896d: am
2fc4970c: am
00720781: Null check when evaluating valid resolution size
* commit '
ade8896d12cb0c250c24e38e81848f5fb9032310':
Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:55:18 +0000 (16:55 +0000)]
am
2fc4970c: am
00720781: Null check when evaluating valid resolution size
* commit '
2fc4970c2631ec5593c4566a72d4524014b49a29':
Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:48:42 +0000 (16:48 +0000)]
am
00720781: Null check when evaluating valid resolution size
* commit '
00720781f6703de532ddbc05238db5bf5fd7cd2d':
Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:39:13 +0000 (09:39 -0700)]
Null check when evaluating valid resolution size
Guard against nonexistent size so that logic to reset size
preference can proceed
BUG=
22396405
Change-Id: Id508713ef91f632867366934e72fe939a839e228
zafir [Thu, 9 Jul 2015 01:35:27 +0000 (01:35 +0000)]
am
c28abdb8: am
dfd3ecb1: am
148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit '
c28abdb81256db38f8a6ee4780d7e3d091d65991':
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
zafir [Thu, 9 Jul 2015 01:21:54 +0000 (01:21 +0000)]
am
dfd3ecb1: am
148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit '
dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3':
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
zafir [Thu, 9 Jul 2015 01:12:05 +0000 (01:12 +0000)]
am
148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit '
148d0b8e3fd412fa6a666e75484fe6b7e0465f5a':
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
zafir [Wed, 8 Jul 2015 23:12:02 +0000 (16:12 -0700)]
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
Bug:
22358833
Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987
Alan Newberger [Wed, 8 Jul 2015 20:16:53 +0000 (20:16 +0000)]
am
b01de9c3: am
6e0e81f3: am
5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '
b01de9c315cd69ee995d034475e5470c677b3105':
Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 20:07:55 +0000 (20:07 +0000)]
am
6e0e81f3: am
5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '
6e0e81f33fb78722474ee139c99c8f2e94af5592':
Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 19:59:53 +0000 (19:59 +0000)]
am
5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '
5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233':
Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 19:42:04 +0000 (12:42 -0700)]
Clear permissions check after successful PermissionsActivity
If the permissions activity indicates the user was successful,
mark mHasCriticalPermissions true to allow the app to resume normally.
BUG=
22347017
Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b
Alan Newberger [Wed, 8 Jul 2015 18:36:59 +0000 (18:36 +0000)]
am
b462c3ca: am
f2bdf276: am
c2d5d078: Restrict permission checks to M devices
* commit '
b462c3ca45c1daafa1b2bb4461959b55734cf544':
Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:19:47 +0000 (18:19 +0000)]
am
f2bdf276: am
c2d5d078: Restrict permission checks to M devices
* commit '
f2bdf2767617415e476ecab683e1fc05704174e7':
Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:11:50 +0000 (18:11 +0000)]
am
c2d5d078: Restrict permission checks to M devices
* commit '
c2d5d078821ca5e8de0c0d03b6603bf7c505c53f':
Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 16:51:04 +0000 (09:51 -0700)]
Restrict permission checks to M devices
Add an ApiHelper check and only call checkSelfPermission if we
are on M and the methods exist.
BUG=
22345681
Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
Geoff Mendal [Wed, 8 Jul 2015 13:31:15 +0000 (13:31 +0000)]
am
3f3dfcb1: (-s ours) am
ccb925b1: (-s ours) am
a5380779: (-s ours) Import translations. DO NOT MERGE
* commit '
3f3dfcb15b9d0dca041b935cc46946acbfa2ff06':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:31:14 +0000 (13:31 +0000)]
am
03d7cde4: (-s ours) am
a532005c: (-s ours) Import translations. DO NOT MERGE
* commit '
03d7cde4c5ba0eb4195b7b91266ef10c3e85a574':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:24:12 +0000 (13:24 +0000)]
am
ccb925b1: (-s ours) am
a5380779: (-s ours) Import translations. DO NOT MERGE
* commit '
ccb925b17d751735427c44e05acc871b02d0028e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:15:12 +0000 (13:15 +0000)]
am
a532005c: (-s ours) Import translations. DO NOT MERGE
* commit '
a532005ce9d17b0d89a16ea94106cc3e9ca8b25c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:13:52 +0000 (13:13 +0000)]
am
a5380779: (-s ours) Import translations. DO NOT MERGE
* commit '
a5380779fdb646b295dd84a0db4cb48c0d98b63a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:02:29 +0000 (06:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e278d51be24e50c7b97e94929914bb982ff1ebe
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Jul 2015 13:01:30 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45b02325512d117d47e0aee868b0d13bc4538aa2
Auto-generated-cl: translation import
zafir [Tue, 7 Jul 2015 01:38:02 +0000 (01:38 +0000)]
am
ad44cda8: Minimum viable Android M runtime permissions handling for H.
* commit '
ad44cda82fe6ec5ee090115129223c6314f9e1bb':
Minimum viable Android M runtime permissions handling for H.
zafir [Mon, 29 Jun 2015 05:08:22 +0000 (00:08 -0500)]
Minimum viable Android M runtime permissions handling for H.
Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.
Bug:
21273463
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
Alan Newberger [Mon, 29 Jun 2015 18:06:04 +0000 (18:06 +0000)]
am
fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
* commit '
fd6f316adc5abfa071534642688bdf46f47a3925':
Ensure CaptureModule/API2 works without front camera
Alan Newberger [Mon, 29 Jun 2015 17:52:46 +0000 (17:52 +0000)]
am
62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
* commit '
62240e14e310aa06601b4d069f30c0190e7b5ef3':
Update filmstrip item on metadata update
Alan Newberger [Mon, 29 Jun 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
Alan Newberger [Mon, 29 Jun 2015 17:32:35 +0000 (17:32 +0000)]
Merge "Update filmstrip item on metadata update" 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.
Alan Newberger [Thu, 25 Jun 2015 20:58:33 +0000 (13:58 -0700)]
Ensure CaptureModule/API2 works without front camera
Add a check in both first run dialogs, and the generated HardwareSpec,
so that front cameras are only used if detected.
BUG=
21781461
Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da
Alan Newberger [Thu, 25 Jun 2015 18:40:32 +0000 (11:40 -0700)]
Update filmstrip item on metadata update
Due to async metadata loading, when viewing an image progress bar,
after progress completion the main handler hiding progress bar would
also hide filmstrip buttons if in secure mode, but the async metadata
handler was calling a restricted handler that would only update the
controls, not hiding for secure, or updating overflow menu. This
change ensures all UI aspects of the item update are processed upon
metadata loading.
BUG=
21499182
Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77
Senpo Hu [Thu, 25 Jun 2015 17:32:49 +0000 (17:32 +0000)]
Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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
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
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)
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
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.
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
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.
Paul Rohde [Wed, 27 May 2015 23:36:28 +0000 (23:36 +0000)]
Merge "Log capture session canceled events." into ub-camera-haleakala
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
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)
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
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
Geoff Mendal [Thu, 21 May 2015 14:09:50 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
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
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
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
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
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.
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)
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
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
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
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
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.
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
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.
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
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
Paul Rohde [Fri, 15 May 2015 22:29:26 +0000 (15:29 -0700)]
Log capture started and bytes on disk
Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890
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)