OSDN Git Service
Spike Sprague [Tue, 7 Oct 2014 00:58:20 +0000 (00:58 +0000)]
Merge "implement proper mode color for cancel button" into ub-camera-glacier
Sascha Haeberling [Mon, 6 Oct 2014 23:27:28 +0000 (23:27 +0000)]
Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
Andy Huibers [Fri, 3 Oct 2014 22:22:47 +0000 (15:22 -0700)]
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
Bug:
17740679
Change-Id: Ia15749971f45f6579a19c379ee95c83c9ce20ccc
Alan Newberger [Mon, 6 Oct 2014 18:10:18 +0000 (11:10 -0700)]
Re-run settings files migrations
Increment version number for upgrade and re-run copying. This will
be a no-op for a first time glacier upgrader, copying runs in the
same sequence for this case. For alpha users who hit crashes, this
will re-run the copy, potentially overwriting some values but
ensuring all values are valid. Tested both N4 and N5 upgrade
scenarios that had previously seen issues, this addresses issues
without the need to clear data.
Bug:
17875895
Change-Id: I37c469c1b03151d03ee0d32ce0ba62983af32a36
Sascha Haeberling [Mon, 6 Oct 2014 17:39:21 +0000 (10:39 -0700)]
Make Camera V2 creation more robust agains failures.
Bug:
17878708
Change-Id: I9e64f89a1b3eb56e7f3afc774d8823a7666d8208
Alan Newberger [Mon, 6 Oct 2014 15:54:09 +0000 (08:54 -0700)]
Fix preference copy migration and incorrect HDR+ sticky bit
A sticky bit upgrader particularly for HDR+ was looking in
globals but was actually a module setting. The copy migrator
was not properly handling booleans! Modified the copy migrator
to properly handle supported types and removed the custom
incorrect upgrader.
Bug:
17875895
Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c
Alan Newberger [Sat, 4 Oct 2014 01:27:50 +0000 (18:27 -0700)]
Only set preview size before starting preview
Remove recursive call to startPreview when updating preview size.
Avoid invoking preview size parameter updates for all calls to
updateCameraParametersPreference, and only adjust preview size
immediately before starting preview. Also added info logging
for all call paths into startPreview() to better diagnose
sequence of events in logs if we still see any races or
ordering issues.
Bug:
17809876
Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52
Alan Newberger [Sat, 4 Oct 2014 00:48:43 +0000 (17:48 -0700)]
Fix incorrect key translation in Settings refactor
Bug:
17832052
Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652
Alan Newberger [Sat, 4 Oct 2014 00:39:45 +0000 (00:39 +0000)]
Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier
Alan Newberger [Sat, 4 Oct 2014 00:34:09 +0000 (17:34 -0700)]
Avoid porting null keys when copying preferences into new system
Testing on Fishlake shows certain preferences are of 'null' type
in shared preferences. Avoid an NPE on porting a null. From testing,
this can happen with focus mode, best to just skip porting the key
and let the app use a default.
Bug:
17829562
Change-Id: I483cb5beb160d3fb7fc8a42aa5085531e3fccb63
Puneet Lall [Fri, 3 Oct 2014 23:32:56 +0000 (23:32 +0000)]
Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
Puneet Lall [Thu, 25 Sep 2014 22:05:47 +0000 (15:05 -0700)]
Use singleTask to improve unsecure lockscreen startup
This enables warm-starts from the lockscreen by reusing the same
activity if possible.
Bug:
16035858
Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
Alan Newberger [Fri, 3 Oct 2014 19:31:54 +0000 (12:31 -0700)]
Suppress 'help feedback' message pre-L in secure camera
Becase we see issues when starting activities above lockscreen
from filmstrip menu in K, disable unless we are on L.
Bug:
17767821
Change-Id: Ic59defd3fef5e283b356e94a952a2b75f4e9f1d6
Andy Huibers [Thu, 2 Oct 2014 22:51:49 +0000 (22:51 +0000)]
Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier
Puneet Lall [Thu, 2 Oct 2014 22:35:10 +0000 (22:35 +0000)]
Merge "Close dangling camera proxy" into ub-camera-glacier
Puneet Lall [Thu, 2 Oct 2014 22:28:51 +0000 (15:28 -0700)]
Close dangling camera proxy
Bug:
17677971
Change-Id: I2cf2df7a12a44b3f9f33d0d9eac479c5281da356
Andy Huibers [Thu, 2 Oct 2014 21:56:34 +0000 (14:56 -0700)]
Add zoom value and timer duration to capture parameters, for logging.
Bug:
17204955
Change-Id: I13e087a8e87c9722b83b83d90af491966ff30c9e
Spike Sprague [Thu, 2 Oct 2014 20:39:24 +0000 (13:39 -0700)]
implement proper mode color for cancel button
bug:
17780517
Change-Id: I522fb223b4aa78d1acd8f18ebf20dbfe20ea8c99
Alan Newberger [Thu, 2 Oct 2014 17:50:07 +0000 (10:50 -0700)]
Trap CameraAgentFactory RTEs during recycle
Bug:
17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
Alan Newberger [Wed, 1 Oct 2014 23:52:56 +0000 (16:52 -0700)]
Trap camera close exceptions on pause
Bug:
17759456
Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55
Alan Newberger [Thu, 2 Oct 2014 00:18:35 +0000 (17:18 -0700)]
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
To ensure items are placed in separate affinity in document mode.
Bug:
17758840
Change-Id: I7ea1c9c841f3e60271307ed67e760be494835855
Alan Newberger [Wed, 1 Oct 2014 16:49:03 +0000 (09:49 -0700)]
Fix error in settings key from refactor
PANO_ORIENTATION indicator icon was using an
incorrect key to sync state.
Bug:
17752154
Change-Id: I587b2ee7eeab3758b05386540f62b79ca48299f2
Alan Newberger [Tue, 30 Sep 2014 21:59:32 +0000 (14:59 -0700)]
Only allow one draw call pending at a time
If modules call draw aggressively, there should only be one pending
at a time. If we get another, just drop it, there will be a draw
momentarily.
Bug:
17703978
Change-Id: I60b3b9e257ae4e064287a97973b1de878ce66de1
Senpo Hu [Tue, 30 Sep 2014 05:31:42 +0000 (05:31 +0000)]
Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
Spike Sprague [Mon, 22 Sep 2014 21:53:04 +0000 (14:53 -0700)]
Let VideoModule override default mode options enable/disable
bug:
17553759
Change-Id: Iadb2690d81e3efce4e84c8c49f6e684a700c247b
Senpo Hu [Tue, 30 Sep 2014 01:49:10 +0000 (18:49 -0700)]
Stability: call stopPreview() before switching off video module.
If the preview is not stopped, the following camera operations posted
by other modules such as "apply settings" will turn camera object
in turmoil. The camera object could start throwing exception and eventually
hang.
Bug:
16300704
Bug:
17403384
Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9
Puneet Lall [Fri, 26 Sep 2014 18:42:54 +0000 (11:42 -0700)]
Cleanup: Move api check to ApiHelper
Change-Id: Ifc0b080713329d09cdeaeec5ccdf88d8515e5543
Spike Sprague [Mon, 29 Sep 2014 23:38:10 +0000 (23:38 +0000)]
Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
Spike Sprague [Mon, 29 Sep 2014 23:36:54 +0000 (23:36 +0000)]
Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
Spike Sprague [Mon, 29 Sep 2014 23:32:12 +0000 (16:32 -0700)]
tweaking peephole animation time from 350 to 500, per in-person request
Change-Id: I13cd63b00217f8beb079a3ea219d878971756c67
Alan Newberger [Mon, 29 Sep 2014 22:01:04 +0000 (22:01 +0000)]
Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier
Spike Sprague [Mon, 29 Sep 2014 21:58:51 +0000 (21:58 +0000)]
Merge "new share icon" into ub-camera-glacier
Alan Newberger [Thu, 25 Sep 2014 05:57:48 +0000 (22:57 -0700)]
Avoid building filmstrip item data if activity is destroyed
Multiple AsyncTasks result in Glide execution after CameraActivity
is destroyed, via FilmstripView.buildItemData. Return early if
destroyed so that no Glide tasks are initiated and no views are
added to the hierarchy.
Bug:
17527470
Bug:
17339652
Change-Id: I7d24197791df812dc012d8b4fadff9246b289b81
Alan Newberger [Mon, 29 Sep 2014 21:05:09 +0000 (21:05 +0000)]
Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
Spike Sprague [Mon, 29 Sep 2014 18:00:44 +0000 (11:00 -0700)]
new share icon
bug:
17671676
Change-Id: I1b681efdb3129cdd532002d85ad3257cef962d92
Senpo Hu [Sun, 28 Sep 2014 11:30:15 +0000 (04:30 -0700)]
Fix crash in VideoModule - Method called after release()
Completely eliminate the runtime exception caused by monkey.
Sample stack trace:
java.lang.RuntimeException: Method called after release()
at android.media.MediaRecorder.setCamera(Native Method)
at com.android.camera.VideoModule.initializeRecorder(VideoModule.java:1101)
at com.android.camera.VideoModule.access$2000(VideoModule.java:88)
at com.android.camera.VideoModule$10.onStorageUpdateDone(VideoModule.java:1320)
at com.android.camera.CameraActivity$20.onPostExecute(CameraActivity.java:2014)
Bug:
17313985
Change-Id: I7ecaf375c26ebd1608d7098599ab1528609287ce
Puneet Lall [Fri, 26 Sep 2014 04:35:15 +0000 (21:35 -0700)]
Synchronize CaptureModule camera open/close operations
This fixes a race condition in which CaptureModule gets a pause()
immediately after it is asked to open the camera. pause() MUST
wait/block to close the camera to ensure that we can later open it (a
fast open()->pause() sequence is reproducible via the lockscreen under
certain cases when we get a rapid onResume()->onPause()->onResume),
so this adds the necessary threading logic to wait, if necessary,
for the camera to finish opening so that it can be closed.
Bug:
17642065
Change-Id: Ic88bd32fc5acc2b333de367019085a8cd539c5a5
Senpo Hu [Fri, 26 Sep 2014 20:21:01 +0000 (20:21 +0000)]
Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
Senpo Hu [Fri, 26 Sep 2014 18:05:08 +0000 (11:05 -0700)]
Stability: add null check for all CameraProxy obj references in
VideoModule.
Bug:
17657161
Bug:
17653725
Change-Id: Icca2b9dffdfe954e979d9af7e47d78b539dc2b9d
Andy Huibers [Fri, 26 Sep 2014 19:42:54 +0000 (12:42 -0700)]
Revert app workaround for bug
17614203 now that HAL is fixed.
This reverts ag/543302.
Bug:
17614203
Bug:
17145703
Change-Id: I3ec21902e59156ea30c181ecd6a7728f7262110a
Alan Newberger [Thu, 25 Sep 2014 18:27:01 +0000 (18:27 +0000)]
Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
Alan Newberger [Thu, 25 Sep 2014 18:21:01 +0000 (11:21 -0700)]
Force filmstrip images to generate in JPEG compression format
Due to https://github.com/bumptech/glide/issues/156, we sometimes
were getting PNG cache image generation which greatly increased
latency and introduced jank. As workaround, explicitly forcing
images to utilize JPEG format.
Bug:
17597861
Change-Id: I49d7266d4ff0173d253877612b3076489a6b385a
Puneet Lall [Thu, 25 Sep 2014 18:14:23 +0000 (18:14 +0000)]
Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
Senpo Hu [Thu, 25 Sep 2014 17:53:12 +0000 (10:53 -0700)]
Stability: add null check for all CameraProxy obj references in PhotoModule.
Bug:
17643705
Bug:
17604028
Change-Id: I6073f32bae286168c040f5667494ede1384ce3fc
Puneet Lall [Thu, 25 Sep 2014 04:30:53 +0000 (21:30 -0700)]
Recreate a OneCameraManager instance for each Activity.
Bug:
17484715
Change-Id: If484e3b40ef32324fa77629b1687cd4317466e2e
Alan Newberger [Thu, 25 Sep 2014 01:23:13 +0000 (18:23 -0700)]
Skip disk caching for session data
Bring back full color depth but don't bother with a disk cache
for temporary session images, since they will go away and be
replaced by mediastore entries anyway.
Bug:
17642071
Change-Id: I1a8483b71d69967033074fc4d8c69c9dfb17651e
Alan Newberger [Thu, 25 Sep 2014 01:09:03 +0000 (01:09 +0000)]
Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
Alan Newberger [Thu, 25 Sep 2014 00:59:02 +0000 (17:59 -0700)]
Revert temporary session images in filmstrip to RGB_565
A simple way to avoid performance issues for now until we get around
the significant load issues seen in writing ARGB_8888 to disk cache.
Bug:
17642071
Change-Id: I6017980fce6e633b52dce93f3f46931e5bcc3d9c
Alan Newberger [Thu, 25 Sep 2014 00:19:25 +0000 (17:19 -0700)]
Ensure Camera doesn't attempt access of back camera on Nakasi
Bug:
17647004
Change-Id: I823f98cfdfcc7429b6acf98215e4a08787bc1bb9
Alan Newberger [Wed, 24 Sep 2014 21:23:30 +0000 (14:23 -0700)]
Don't show aspect ratio UI if using API2 portability
Avoid preview size changes due to current state of locking in API2
portability implementation.
Bug:
17462976
Change-Id: I9426380699988d67b21ce86850ef00736e84a5d6
Spike Sprague [Wed, 27 Aug 2014 19:01:36 +0000 (12:01 -0700)]
new sounds for timer ticker and pano / photosphere intermediate captures
companions CL: ag/534823
bug:
17281234
Change-Id: I9d98d8e869dcefdbd0f7e0b53dea6b8e024a8e3b
Spike Sprague [Sat, 20 Sep 2014 00:43:13 +0000 (17:43 -0700)]
for intent capture and pano,
fix the redo/ok/cancel button sizes so touch ripples show up right.
bug:
17505149
Change-Id: I29d8222ff0588d0410cf1f8a94bed963b4bf32f6
Spike Sprague [Wed, 24 Sep 2014 00:44:00 +0000 (00:44 +0000)]
Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
Alan Newberger [Tue, 23 Sep 2014 20:41:49 +0000 (13:41 -0700)]
WIP: Add recursive thumbnail call to LocalMediaData
This should allow for flicker free scaling once glide is submitted.
Bug:
17597861
Change-Id: I7a4d874a95f884bc54bea940facc68fd9a1ad7b5
Alan Newberger [Tue, 23 Sep 2014 16:43:58 +0000 (16:43 +0000)]
Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
Alan Newberger [Mon, 22 Sep 2014 19:30:08 +0000 (12:30 -0700)]
Cleanup gesture UI hide code
Relocate show/hide of zoom UI in the onScaleBegin/onScaleEnd classes.
Bug:
17613719
Change-Id: I400161c95c08c7f3b6b36487de703296236595bb
Alan Newberger [Mon, 22 Sep 2014 19:05:56 +0000 (12:05 -0700)]
Clean up unused code
This UI code is completely unused, and has no reference from rest of
app. Delete for cleanup.
Bug:
17613719
Change-Id: I1d9d443ef6642cd434725fe71e59fa0220258789
Spike Sprague [Mon, 22 Sep 2014 17:52:32 +0000 (10:52 -0700)]
monkey test NPE fix, another null check on mCameraDevice
bug:
17604028
Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd
Alan Newberger [Sun, 21 Sep 2014 23:11:29 +0000 (16:11 -0700)]
Fix filmstrip item bounds to filmstrip scale
There's no reason to scale filmstrip items to anything other
than the fixed filmstrip scale, and doing otherwise interferes
with Glide caching and introduces flickers upon zoom.
Bug:
17597708
Change-Id: Ia143b4d95a48e9e23bbf36ec0edf93599caaa01b
Baligh Uddin [Fri, 19 Sep 2014 22:33:35 +0000 (22:33 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Jiawen Chen [Fri, 19 Sep 2014 22:17:29 +0000 (22:17 +0000)]
Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
Alan Newberger [Fri, 19 Sep 2014 20:59:46 +0000 (20:59 +0000)]
Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
Spike Sprague [Fri, 19 Sep 2014 20:54:55 +0000 (20:54 +0000)]
Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
Spike Sprague [Fri, 19 Sep 2014 18:22:56 +0000 (18:22 +0000)]
Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
Spike Sprague [Fri, 19 Sep 2014 18:18:46 +0000 (11:18 -0700)]
add null check to updateCameraParametersPreferences to apease the monkey
bug:
17580046
Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0
Spike Sprague [Fri, 19 Sep 2014 02:44:07 +0000 (19:44 -0700)]
portability layer doesn't work well with startPreviewWithCallback()
here's a dirty dirty workaround.
bug:
17576554
Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9
Spike Sprague [Mon, 8 Sep 2014 17:43:04 +0000 (10:43 -0700)]
mode switch jank fixes
puts many ValueAnimators news into initialize methods
changes startPreview() calls to startPreviewWithCallback()
puts MultToggleImageButton's bitmap combine into an AsyncTask
bug:
17070332
Change-Id: Idea6396264588b345ed27b9f96f9434ff3e7e77c
Spike Sprague [Thu, 18 Sep 2014 17:52:35 +0000 (10:52 -0700)]
implement new trash icon, plus some asset cleanup
bug:
17566685
Change-Id: Ia7b55ad3b6fed939c19abcde12cbf34726ba919c
Jiawen Chen [Wed, 17 Sep 2014 00:05:37 +0000 (17:05 -0700)]
Changed tap-to-meter rectangle and weights.
Bug:
17417649
- Clarified widths in Settings3A.
- For Gcam only, reduced AE box to 12.25% of the shorter edge of the crop
rectangle. This matches the setting on Nexus 5.
- For Gcam only, changed AE weight to 22 after consultations with Ryan.
- Tested with Gcam and it final shots look great in HDR scenes.
- Does not fully address b/
17417649: ISP AE ignores the weight completely and
overcompensates for the tap region.
- Changed AutoFocusHelper to take touch points in normalized portrait
coordinates along with a sensor orientation. The output is a MeteringRectangle
in sensor pixels.
- Fixed a bug where a digital-zoomed tap doesn't work when the rect intersects
edges. It should have been clamp, not check for intersection and return the
full crop rectangle if it doesn't intersect.
- Submit simultaneously with ag/549706.
Change-Id: If084e64ecbfc4a08ece96a7cebfcaf835d92b9d1
Baligh Uddin [Wed, 17 Sep 2014 04:45:54 +0000 (21:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6541f685bfc16e910b5689acbe74e15e07c5bd5b
Auto-generated-cl: translation import
Alan Newberger [Wed, 17 Sep 2014 03:54:56 +0000 (20:54 -0700)]
Fix CameraSettingsActivityHelper
Previous hack to allow activity up button to work, interfered with
custom preference merging we use to conditonally add items to
Settings. Now fixed by allowing internal control of whether the
full preference tree is returned by the fragment or just the
desired subtree, so that the Helper can access the full tree.
Bug:
17534830
Change-Id: I11510f365b9e212f07009b2233bb5d8036228774
Puneet Lall [Mon, 15 Sep 2014 21:41:55 +0000 (21:41 +0000)]
Merge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacier
Puneet Lall [Mon, 15 Sep 2014 18:29:59 +0000 (11:29 -0700)]
Don't set mCameraAppUI to null in onDestroy
BUG:
17408047
Note that we originally set this to null to address BUG:
12805279
which involved leaking Views. However, this has regressed and will
require another look regardless. The number of views leaked
with and without the null assignment is the same, so this change
does not make the regression any worse.
Change-Id: If90aeebb081073eb4f5b928919fc67ef710e1054
Spike Sprague [Fri, 12 Sep 2014 22:01:04 +0000 (15:01 -0700)]
set proper alpha on shutter button on mode switch,
eliminates a janky alpha flash
bug:
17487040
Change-Id: I08e66b5be53e58e9e16d32c09ef50081e90e9284
Puneet Lall [Fri, 12 Sep 2014 00:33:21 +0000 (17:33 -0700)]
Don't send redundant requests to start the preview
Change-Id: I43d8a2917bbe0140f1e9367cce21f68b19807aa8
Alan Newberger [Thu, 11 Sep 2014 23:29:20 +0000 (16:29 -0700)]
Revert layout change for Camera
Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of
Action Bar.
Bug:
17477202
Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde
Alan Newberger [Thu, 11 Sep 2014 21:39:22 +0000 (14:39 -0700)]
Move launcher icons to mipmap
Bug:
17457682
Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040
Alan Newberger [Thu, 11 Sep 2014 17:25:54 +0000 (10:25 -0700)]
Establish synchronous camera closing when app utilizes API1/API2
To ensure API1 and API2 portability implementations coordinate together,
if app uses API2 for any mode, lock both modes into synchronouse camera
closing.
Bug:
17464089
Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a
Baligh Uddin [Thu, 11 Sep 2014 15:48:57 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Andy Huibers [Thu, 11 Sep 2014 04:08:56 +0000 (21:08 -0700)]
If we are using CaptureModule for Gcam only, turn off flash.
Bug:
17460394
Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
Alan Newberger [Thu, 11 Sep 2014 01:26:18 +0000 (01:26 +0000)]
Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
Alan Newberger [Thu, 11 Sep 2014 01:26:01 +0000 (01:26 +0000)]
Revert "Delay PhotoModule preview cover removal to address jank"
This CL introduced PhotoModule state corruption, multiple picture taking was not possible. Need to deal with stopPreview during picture taking vs module initialization.
Bug:
17451185
This reverts commit
49fb93b5517e12606eb747f0a5d218b4d03df821.
Change-Id: I0a1eec8147ce859d2e83ee7bdd17655b4054f904
Alan Newberger [Wed, 10 Sep 2014 22:03:27 +0000 (15:03 -0700)]
Reset aspect ratio on pause
When resuming the app we do resize things but the old aspect
ratio is cached, thus skipping a reset of the transform matrices
because the app thinks it is already at the correct aspect ratio.
In certain cases (changing orientation when paused) this leads to
layout bugs.
Bug:
17304671
Change-Id: Ia171190b3c76dc05519bdf4d1947d9664d5fb604
Spike Sprague [Wed, 10 Sep 2014 23:07:48 +0000 (23:07 +0000)]
Merge "workaround fix" into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 22:53:06 +0000 (22:53 +0000)]
Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 22:44:01 +0000 (15:44 -0700)]
Delay PhotoModule preview cover removal to address jank
Cover should stay in place at least until startPreview completes.
Since it is async, we should call handlers in a callback.
Bug:
17451185
Change-Id: I220c49b9bb75ad977d92780c6eea0ff126a7dcb8
Spike Sprague [Wed, 10 Sep 2014 18:31:09 +0000 (11:31 -0700)]
workaround fix
change View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN to View.SYSTEM_UI_FLAG_FULLSCREEN
on L, with View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN the entire camera app window is shifted down by the height of the status bar.
with View.SYSTEM_UI_FLAG_FULLSCREEN thw window lays out correctly.
note: with either flag on KitKat the window lays out correctly.
bug:
17457492
Change-Id: I6534fcedaafbbb525967289db7fb759ba50fca42
Senpo Hu [Wed, 10 Sep 2014 22:11:15 +0000 (22:11 +0000)]
Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
Senpo Hu [Wed, 10 Sep 2014 21:43:16 +0000 (14:43 -0700)]
Return to filmstrip when video playback finishes.
Bug:
17091348
Change-Id: I9703d014029bf29431b099b129b1ed8bce0ffa03
Senpo Hu [Wed, 10 Sep 2014 21:15:00 +0000 (14:15 -0700)]
Fix the upside-down orienation bug in CaptureModule.
Bug:
17369697
Change-Id: I5beb0ec45f2dbf372dda88ffd8a92b1632b3ab90
Alan Newberger [Wed, 10 Sep 2014 21:13:54 +0000 (21:13 +0000)]
Merge "Remove jank on camera options switching" into ub-camera-glacier
Jiawen Chen [Tue, 9 Sep 2014 21:14:39 +0000 (14:14 -0700)]
Changed double to float. viewFinder -> viewfinder.
Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
Alan Newberger [Wed, 10 Sep 2014 20:07:18 +0000 (13:07 -0700)]
Reinitialize shutter button in Camera mode upon preview start
VideoModule already does this here, and by adding to PhotoModule we
address a bug where pausing when capturing leaves the button
disabled on resume.
Bug:
17426670
Change-Id: I8333b52a72c0da8b58070d689406975332ae632e
Alan Newberger [Wed, 10 Sep 2014 18:22:19 +0000 (11:22 -0700)]
Reduce logging for unknown camera scope
Still log a warning, but remove stack trace logging.
Change-Id: I28e47feb5d2700fd05e7ff4e6faeb1d5a9e38de5
Andy Huibers [Wed, 10 Sep 2014 15:55:10 +0000 (15:55 +0000)]
Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
Qiwen Zhao [Wed, 10 Sep 2014 15:20:46 +0000 (15:20 +0000)]
Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
Nicolas Prevot [Wed, 10 Sep 2014 09:42:35 +0000 (09:42 +0000)]
Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 01:47:37 +0000 (18:47 -0700)]
Remove jank on camera options switching
There are two main causes of jank on encountered on options switching:
1. When requesting camera in requestCamera, a portability refactor
introduced a regression where we blocked in the main thread to close
the camera. This main thread blockage is unacceptable as it caused a
preview freeze in addition to the freeze we were trying to create during
the switch, leading to a two-frame preview freeze.
2. The mode options animations which delay the button state transition,
also resulted in preview stutters. Unsure of cause but reverting first
and will assess fixes and reintroduce.
Bug:
17414652
Change-Id: Ib72e331f1bbb5d3b608d8bdc5656c2ff2836ed42
Andy Huibers [Wed, 10 Sep 2014 01:45:28 +0000 (18:45 -0700)]
Remove toast.
This reverts commit
779414e8bfe23d66de310570ff2314654e45ec9f.
Change-Id: Idf04e0bbb69822792327fd17634a4f95f7eb2092
Senpo Hu [Wed, 10 Sep 2014 00:22:10 +0000 (00:22 +0000)]
Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier