OSDN Git Service
Sascha Haeberling [Sat, 11 Oct 2014 00:17:00 +0000 (00:17 +0000)]
Merge "Make temp session directory creation more robust and efficient." into ub-camera-haleakala
Sascha Haeberling [Thu, 9 Oct 2014 18:55:23 +0000 (11:55 -0700)]
Make temp session directory creation more robust and efficient.
Also rename some methods for clarity.
Change-Id: Ic6d3e7902ae5396f33231f1471df9eae89234132
Sascha Haeberling [Fri, 10 Oct 2014 22:55:08 +0000 (22:55 +0000)]
am
4d4585da: Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
* commit '
4d4585da32d9b5a47bffad1deeb08fc5cd128311':
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
Senpo Hu [Fri, 10 Oct 2014 22:55:08 +0000 (22:55 +0000)]
am
ac9070ee: Migrate old CameraErrorCallback class to agent\'s CameraExceptionHandler.
* commit '
ac9070ee24d2db6e7804cdd26df578e7ab76895e':
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
Sascha Haeberling [Fri, 10 Oct 2014 22:53:02 +0000 (22:53 +0000)]
Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
Senpo Hu [Fri, 10 Oct 2014 22:18:58 +0000 (15:18 -0700)]
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
Per ag/565603, clean up the old CameraErrorCallback.
Bug:
17931297
Change-Id: Id750581850680ed6cf85738daf5ebdebf67f4800
Sascha Haeberling [Fri, 10 Oct 2014 22:20:35 +0000 (15:20 -0700)]
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
Bug:
15289634
Change-Id: I551f73f5f0ceecf2d8a1e3b379dd34fd06b044d8
Alan Newberger [Fri, 10 Oct 2014 20:25:50 +0000 (20:25 +0000)]
am
4fe4680c: Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
* commit '
4fe4680cca29994e0c070b9b5ea5ef9bcf087a65':
Add verbose logging for os/apk debug builds
Alan Newberger [Fri, 10 Oct 2014 20:23:33 +0000 (20:23 +0000)]
Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
Alan Newberger [Fri, 10 Oct 2014 20:15:25 +0000 (13:15 -0700)]
Add verbose logging for os/apk debug builds
Relax VERBOSE screening so that by default, we log more when not
in a release configuration.
Bug:
17950234
Change-Id: I30250974456607b4fb64c15d6ecfa288ceb2f133
Spike Sprague [Thu, 9 Oct 2014 22:20:42 +0000 (22:20 +0000)]
am
a9731952: Merge "change text color to white for tutorial and onboarding screens." into ub-camera-glacier
* commit '
a9731952fb824f78d033ae360ff8324ae6cf2d6a':
change text color to white for tutorial and onboarding screens.
Spike Sprague [Thu, 9 Oct 2014 22:18:23 +0000 (22:18 +0000)]
Merge "change text color to white for tutorial and onboarding screens." into ub-camera-glacier
Spike Sprague [Thu, 9 Oct 2014 21:56:52 +0000 (14:56 -0700)]
change text color to white for tutorial and onboarding screens.
Change-Id: If431ce0b321991e15f33f850acc3cc6c4474ffb4
Alan Newberger [Thu, 9 Oct 2014 01:55:59 +0000 (01:55 +0000)]
Merge "resolved conflicts for merge of
d0927687 to lmp-mr1-dev-plus-aosp" into ub-camera-haleakala
Puneet Lall [Thu, 9 Oct 2014 00:48:56 +0000 (00:48 +0000)]
am
59d337b4: Use a separate activity for capture intents
* commit '
59d337b422cc373666609fb0ef7fcc422884b683':
Use a separate activity for capture intents
Puneet Lall [Wed, 8 Oct 2014 23:36:20 +0000 (16:36 -0700)]
Use a separate activity for capture intents
Bug:
17911061
Change-Id: Id5d3e5347c1830dc43b8962c1494bb4bf5195136
Sascha Haeberling [Wed, 8 Oct 2014 01:36:16 +0000 (01:36 +0000)]
am
e11ad6d6: Make sure a null mimetype is not crashing the app.
* commit '
e11ad6d67ad95a9ecab8a594bcb55a05708abc0f':
Make sure a null mimetype is not crashing the app.
Sascha Haeberling [Wed, 8 Oct 2014 01:27:47 +0000 (18:27 -0700)]
Make sure a null mimetype is not crashing the app.
Bug:
17398971
Though at this point something else is already horribly wrong with
mediaserver, otherwise this cannot happen.
Change-Id: I837dfd5992611ded0c34ea7cc1e677ac1456c0c0
Puneet Lall [Wed, 8 Oct 2014 00:58:42 +0000 (00:58 +0000)]
am
0d4cdba2: Revert "More lockscreen tuning"
* commit '
0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144':
Revert "More lockscreen tuning"
Puneet Lall [Wed, 8 Oct 2014 00:47:36 +0000 (00:47 +0000)]
Revert "More lockscreen tuning"
This reverts commit
7ac13f5f3644c8de53ebd625f195d757166bf9c9.
Change-Id: I3c59f4d71efe80290731e55421011c16e5dd4a41
Spike Sprague [Wed, 8 Oct 2014 00:43:31 +0000 (00:43 +0000)]
am
fe7eb164: reverting b/559979
* commit '
fe7eb1640b1aca8500b2cab152648a699833d6fd':
reverting b/559979
Spike Sprague [Wed, 8 Oct 2014 00:38:33 +0000 (17:38 -0700)]
reverting b/559979
Change-Id: If4e58c67d4424ade68198a16c1d2d21595504efd
Jiawen Chen [Tue, 7 Oct 2014 22:45:03 +0000 (22:45 +0000)]
am
fd8c804c: Merge "Tweaked constants for Gcam." into ub-camera-glacier
* commit '
fd8c804c9429f150f6028c6f371d34352934f964':
Tweaked constants for Gcam.
Jiawen Chen [Tue, 7 Oct 2014 22:41:03 +0000 (22:41 +0000)]
Merge "Tweaked constants for Gcam." into ub-camera-glacier
Senpo Hu [Tue, 7 Oct 2014 22:02:17 +0000 (22:02 +0000)]
am
2a0e18e2: Adopt the new error handling mechanism in portability.
* commit '
2a0e18e280dfe541d4740345511ad299099cda79':
Adopt the new error handling mechanism in portability.
Senpo Hu [Tue, 7 Oct 2014 01:35:44 +0000 (18:35 -0700)]
Adopt the new error handling mechanism in portability.
Show camera fatal dialog to guide users exiting the app when
1) camera framework throws RTE or
2) DispatchThread job is timeout.
If users hit home button while error dialog is shown, just exit
the app.
Bug:
16189216
Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65
Sascha Haeberling [Tue, 7 Oct 2014 20:47:33 +0000 (20:47 +0000)]
am
1b19bc80: Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
* commit '
1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2':
Catch error where framework is broken and returns no cameras.
Sascha Haeberling [Tue, 7 Oct 2014 20:45:34 +0000 (20:45 +0000)]
Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
Sascha Haeberling [Tue, 7 Oct 2014 17:53:18 +0000 (10:53 -0700)]
Catch error where framework is broken and returns no cameras.
Bug:
17868174
Exit the app with the "Cannot connect to camera" error.
Change-Id: Ic5a6e0af222a3740b8bd3f6e66ee575f9443008e
Puneet Lall [Tue, 7 Oct 2014 19:14:49 +0000 (19:14 +0000)]
am
b2f15652: Merge "More lockscreen tuning" into ub-camera-glacier
* commit '
b2f156527da437c1c4901c03bd004eb49eae23f6':
More lockscreen tuning
Puneet Lall [Tue, 7 Oct 2014 19:11:51 +0000 (19:11 +0000)]
Merge "More lockscreen tuning" into ub-camera-glacier
Puneet Lall [Tue, 7 Oct 2014 18:59:53 +0000 (11:59 -0700)]
More lockscreen tuning
Delay all onResume calls since we cannot always determine if we
will be immediately paused due to a lockscreen start.
Bug:
16035858
Change-Id: I96928814708eb8026bea8d0087341fda4b04bcbc
Spike Sprague [Tue, 7 Oct 2014 19:03:40 +0000 (19:03 +0000)]
am
c9a33037: Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier
* commit '
c9a3303761d72edd579406bdf6b6a1f29a16a8bc':
adjust margin on TextViews and ImageViews in onboarding and tutorial screens
Spike Sprague [Tue, 7 Oct 2014 19:01:23 +0000 (19:01 +0000)]
Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier
Spike Sprague [Sat, 4 Oct 2014 01:58:07 +0000 (18:58 -0700)]
adjust margin on TextViews and ImageViews in onboarding and tutorial screens
bug:
17654418
Change-Id: I10633495ae04fd00ac97c055094a6097f5f7c0a0
Puneet Lall [Tue, 7 Oct 2014 17:40:53 +0000 (17:40 +0000)]
am
3e236cc8: Lockscreen workaround tuning
* commit '
3e236cc8e33be40e434e73f7777bd81446277512':
Lockscreen workaround tuning
Puneet Lall [Tue, 7 Oct 2014 01:05:07 +0000 (18:05 -0700)]
Lockscreen workaround tuning
* Remove delay of onStartTasks. This fixes b/
17868175, and appears to
result in ~50ms improvements to cold starts from the lockscreen and
warm starts from the secure lockscreen.
* Disabled double-onResume() workaround for non-secure lockscreen launches
since this no longer happens when singleTask is enabled.
* Reduced the delay for the double-onResume() workaround by eliminating
the delay on the second call to onResume()
Bug:
17868175
Bug:
16035858
Change-Id: I7f7611901133e429def9a03d4009e1a99caaabd0
Spike Sprague [Tue, 7 Oct 2014 17:21:42 +0000 (17:21 +0000)]
am
0dd0d5ef: Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
* commit '
0dd0d5ef549b489d7711d60ea1988834313851a5':
disable all user interactions (including mode switching) on SD Card errors
Spike Sprague [Tue, 7 Oct 2014 17:17:55 +0000 (17:17 +0000)]
Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
Spike Sprague [Thu, 2 Oct 2014 17:14:55 +0000 (10:14 -0700)]
disable all user interactions (including mode switching) on SD Card errors
bug:
15841887
Change-Id: I8e7e92a884dda54d9b8385b29d9ef4b7bb7fbd14
Spike Sprague [Tue, 7 Oct 2014 17:09:26 +0000 (17:09 +0000)]
am
97563a79: color changes for modes, onboarding screens, and tutorial screens
* commit '
97563a7926f87ac350bff7f644d43209fe874185':
color changes for modes, onboarding screens, and tutorial screens
Spike Sprague [Fri, 3 Oct 2014 21:03:52 +0000 (14:03 -0700)]
color changes for modes, onboarding screens, and tutorial screens
bug:
17785834
Change-Id: Idaf26517399a07471f2b6a98fdb9629baf41afcf
Spike Sprague [Tue, 7 Oct 2014 00:59:51 +0000 (00:59 +0000)]
am
39fe5d96: Merge "implement proper mode color for cancel button" into ub-camera-glacier
* commit '
39fe5d96cc0787f0ea3f8eb0b18108ef2abd3be6':
implement proper mode color for cancel button
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:31:11 +0000 (23:31 +0000)]
am
2dcf912d: Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
* commit '
2dcf912d17f2ed7197c783d1273ff6200709e6d3':
Make Camera V2 creation more robust agains failures.
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 [Mon, 6 Oct 2014 22:44:50 +0000 (22:44 +0000)]
am
877c2b65: Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
* commit '
877c2b65415ad43eb424f8a4a27bbeee7771d5bf':
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
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
Jiawen Chen [Thu, 25 Sep 2014 00:26:59 +0000 (17:26 -0700)]
Tweaked constants for Gcam.
Bug:
17629128
Bug:
17550818
- In HDR+ mode only, change tap-to-expose/focus rectangle to 12% of the
viewfinder - works much better and matches final output.
- Changed post-shot return-to-continuous-AF constant to 1 second (3 seconds was
too long).
Submit together with ag/554414.
Change-Id: I56afb19e4378dbfa25f38376b05293fdb3908d47
Alan Newberger [Mon, 6 Oct 2014 18:38:32 +0000 (18:38 +0000)]
am
5381549f: Re-run settings files migrations
* commit '
5381549fe58cd3c5a28dc18e2416c37d3c2d300b':
Re-run settings files migrations
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 17:16:46 +0000 (17:16 +0000)]
am
90672aa0: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
90672aa08379e598426c12b529a86afd4b61011e':
Fix preference copy migration and incorrect HDR+ sticky bit
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 20:56:25 +0000 (20:56 +0000)]
am
19597371: Only set preview size before starting preview
* commit '
19597371a18921bb03337e4fa24c28dd2d8f06ed':
Only set preview size before starting preview
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:55:58 +0000 (00:55 +0000)]
am
4032a773: Fix incorrect key translation in Settings refactor
* commit '
4032a773c4605894a2b6137590c7124ea16b7ab2':
Fix incorrect key translation in Settings refactor
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:42:48 +0000 (00:42 +0000)]
am
6c1ef468: Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier
* commit '
6c1ef468d480520f706efe3264c5da48238f878d':
Avoid porting null keys when copying preferences into new system
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:54:21 +0000 (23:54 +0000)]
am
64cb0bf0: Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
* commit '
64cb0bf0e5c3efb62b34cd2871723a56f3cc7787':
Use singleTask to improve unsecure lockscreen startup
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 20:56:12 +0000 (20:56 +0000)]
am
365ef4ca: Suppress \'help feedback\' message pre-L in secure camera
* commit '
365ef4ca63d2c3e988cb54887f0f58a33d92aacc':
Suppress 'help feedback' message pre-L in secure camera
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:53:50 +0000 (22:53 +0000)]
am
edb2c4bb: Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier
* commit '
edb2c4bb2acbc0dcfbb32ef9c14cdede37868662':
Add zoom value and timer duration to capture parameters, for logging.
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:38:38 +0000 (22:38 +0000)]
am
42c6acb6: Merge "Close dangling camera proxy" into ub-camera-glacier
* commit '
42c6acb68103692ce4142d1b013dfced203c2271':
Close dangling camera proxy
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:59:22 +0000 (17:59 +0000)]
am
4d0fe41c: Trap CameraAgentFactory RTEs during recycle
* commit '
4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1':
Trap CameraAgentFactory RTEs during recycle
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 [Thu, 2 Oct 2014 17:42:07 +0000 (17:42 +0000)]
am
48d4c8f1: Trap camera close exceptions on pause
* commit '
48d4c8f1856503d88f4e2e42fa729f2556173694':
Trap camera close exceptions on pause
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:34:17 +0000 (00:34 +0000)]
am
437a1869: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
437a186929173ad576e0eac04bd5b79939816158':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
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 17:05:43 +0000 (17:05 +0000)]
am
5c9d7f34: Fix error in settings key from refactor
* commit '
5c9d7f34039ac96b3a136ccd6b16162e3b220848':
Fix error in settings key from refactor
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 23:31:58 +0000 (23:31 +0000)]
am
5db8e20d: Only allow one draw call pending at a time
* commit '
5db8e20db77bf86eba25ec713c76da783dd98b19':
Only allow one draw call pending at a time
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:36:05 +0000 (05:36 +0000)]
am
31d816f6: Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
* commit '
31d816f64eebfd24e662ff21f611a70b957d4859':
Stability: call stopPreview() before switching off video module.
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 [Tue, 30 Sep 2014 02:13:20 +0000 (02:13 +0000)]
am
c19d97b3: Let VideoModule override default mode options enable/disable
* commit '
c19d97b385261312399b67b538f8faa074314beb':
Let VideoModule override default mode options enable/disable
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 [Mon, 29 Sep 2014 23:55:00 +0000 (23:55 +0000)]
am
7c703ced: Cleanup: Move api check to ApiHelper
* commit '
7c703ced0248d6a368a216e9d7699ab8e9565415':
Cleanup: Move api check to ApiHelper
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:41:40 +0000 (23:41 +0000)]
am
2d512cc6: Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
* commit '
2d512cc688a6e46bb8b34e293e87d2f0088a1abb':
for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right.
Spike Sprague [Mon, 29 Sep 2014 23:41:39 +0000 (23:41 +0000)]
am
5ea5dc09: Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
* commit '
5ea5dc090151f857ba3787e8c29d1269e3dd6da4':
tweaking peephole animation time from 350 to 500, per in-person request
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:22:19 +0000 (22:22 +0000)]
am
535eed78: Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier
* commit '
535eed78310ff5774f544c8c8bb584585304e7ec':
Avoid building filmstrip item data if activity is destroyed
Spike Sprague [Mon, 29 Sep 2014 22:22:18 +0000 (22:22 +0000)]
am
56afe395: Merge "new share icon" into ub-camera-glacier
* commit '
56afe3958ddc1b0880c7f4cbb8604caca0a32469':
new share icon
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