OSDN Git Service
Alan Newberger [Wed, 24 Sep 2014 22:10:47 +0000 (22:10 +0000)]
am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
9db50c18fdd35f98d45fec66db55693bb9f1d9ae':
Don't show aspect ratio UI if using API2 portability
Alan Newberger [Wed, 24 Sep 2014 22:04:09 +0000 (22:04 +0000)]
am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
2631a15a37b890f4ee720c5a4bbe3e654524deb6':
Don't show aspect ratio UI if using API2 portability
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, 24 Sep 2014 02:36:01 +0000 (02:36 +0000)]
am
3e8f9db9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
3e8f9db9b1e7b3549df88d5daa7ade9dde8abbf1':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 02:26:09 +0000 (02:26 +0000)]
am
e31c82c2: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
e31c82c2817f4b966673274896679cd956bd7dd2':
monkey test NPE fix, another null check on mCameraDevice
Spike Sprague [Wed, 24 Sep 2014 02:03:45 +0000 (02:03 +0000)]
am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
d8dbf53c7235456fc2fd3e0e77e50e5d6c00a753':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 01:47:39 +0000 (01:47 +0000)]
am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
eeeed4fa00ed842050bc7e0edd3b37c262802a5b':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 01:30:05 +0000 (01:30 +0000)]
am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
c89420a6c2e44b17a7dcc556f9a633db58ba4ab5':
monkey test NPE fix, another null check on mCameraDevice
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 [Wed, 24 Sep 2014 01:03:23 +0000 (01:03 +0000)]
am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
7d1fb593ae26e4f327e47bcbb857057da4ea23a0':
monkey test NPE fix, another null check on mCameraDevice
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 17:13:02 +0000 (17:13 +0000)]
am
4c571d7e: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
4c571d7e967bad041c17c7f7c7c6b5bd5cab640c':
Fix filmstrip item bounds to filmstrip scale
Alan Newberger [Tue, 23 Sep 2014 17:00:04 +0000 (17:00 +0000)]
am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
1db7f2860a5117ad2082802f9e3ce7c0314bfee8':
Fix filmstrip item bounds to filmstrip scale
Alan Newberger [Tue, 23 Sep 2014 16:53:25 +0000 (16:53 +0000)]
am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
b60af188e3bc712a7f06700c591c428834237dff':
Fix filmstrip item bounds to filmstrip scale
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 [Tue, 23 Sep 2014 02:53:52 +0000 (02:53 +0000)]
am
b4ed71c2: am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
b4ed71c29eed54dd1a8ba36960264ff03aa24eb8':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 02:53:51 +0000 (02:53 +0000)]
am
42b799ac: am
8f1ffed7: am
b2b0e02c: Clean up unused code
* commit '
42b799ac283f322259fbb2d21ef1f946cb20af45':
Clean up unused code
Alan Newberger [Tue, 23 Sep 2014 00:42:32 +0000 (00:42 +0000)]
am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 00:42:31 +0000 (00:42 +0000)]
am
8f1ffed7: am
b2b0e02c: Clean up unused code
* commit '
8f1ffed79db5d7e17f56501b5d62157846fb55bd':
Clean up unused code
Alan Newberger [Tue, 23 Sep 2014 00:35:31 +0000 (00:35 +0000)]
am
5f86f7fd: Cleanup gesture UI hide code
* commit '
5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 00:35:30 +0000 (00:35 +0000)]
am
b2b0e02c: Clean up unused code
* commit '
b2b0e02cb5f0aba8fed9389193fa98150da75efc':
Clean up unused code
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
Alan Newberger [Sat, 20 Sep 2014 00:13:00 +0000 (00:13 +0000)]
am
d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"
* commit '
d0927687682a7ad433b23d25e87379177bb8edc7':
Add scrolling support with a mouse wheel
Alan Newberger [Fri, 19 Sep 2014 23:37:07 +0000 (23:37 +0000)]
Merge "Add scrolling support with a mouse wheel"
Baligh Uddin [Fri, 19 Sep 2014 23:03:12 +0000 (23:03 +0000)]
am
41a13974: (-s ours) am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
41a1397435ab2b20519f19a6ce07dabf540118b1':
Import translations. DO NOT MERGE
Olivier Gay [Fri, 12 Sep 2014 13:28:47 +0000 (15:28 +0200)]
Add scrolling support with a mouse wheel
When a physical mouse is connected, support scroll events
from the mouse when pictures are displayed. In film strip
view (full screen or not), both vertical and horizontal
scroll events have the same bevahior: pictures are
horizontally scrolled. In full screen, pictures are flinged.
When a picture is zoomed the scroll is done either
vertically or horizontally depending on user action.
Change-Id: Idb3b12b0ff86e8a590fa7f1a54111700db84e543
Signed-off-by: Olivier Gay <ogay@logitech.com>
Baligh Uddin [Fri, 19 Sep 2014 22:54:15 +0000 (22:54 +0000)]
am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee':
Import translations. DO NOT MERGE
Jiawen Chen [Fri, 19 Sep 2014 22:51:01 +0000 (22:51 +0000)]
am
6dfb91e0: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
6dfb91e02fe2a9b83550f599f9b35d70a64d3a48':
Changed tap-to-meter rectangle and weights.
Baligh Uddin [Fri, 19 Sep 2014 22:43:59 +0000 (22:43 +0000)]
am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
02758e4c60ea1ff5a78c6d7d8d77ee353a2bf6f5':
Import translations. DO NOT MERGE
Jiawen Chen [Fri, 19 Sep 2014 22:41:58 +0000 (22:41 +0000)]
am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
284a9b48c896d4435362e7f757885b47ff748a1b':
Changed tap-to-meter rectangle and weights.
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:28:39 +0000 (22:28 +0000)]
am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
30ae8c64cec9313fc050daf94ae3fbddedf80b36':
Changed tap-to-meter rectangle and weights.
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 21:24:06 +0000 (21:24 +0000)]
am
2aa7189d: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
2aa7189d020e5fc63fb626ae8a932f6e19c87a8d':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 21:24:06 +0000 (21:24 +0000)]
am
11c70fb3: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
11c70fb3f0115379acbe3596fc4cb2465c7ea506':
implement new trash icon, plus some asset cleanup
Alan Newberger [Fri, 19 Sep 2014 21:14:46 +0000 (21:14 +0000)]
am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
40b52050078c664295b7bb830110587e64119bbb':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 21:14:45 +0000 (21:14 +0000)]
am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
94cd65226208eed1b9f350d0b8f5e8b82fa39290':
implement new trash icon, plus some asset cleanup
Alan Newberger [Fri, 19 Sep 2014 21:03:32 +0000 (21:03 +0000)]
am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
e684ea54121ef885a0aa84cd3bea50c5a345d55e':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 21:03:31 +0000 (21:03 +0000)]
am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
19942a171844d6bd361026a6b8df2eebaa0661db':
implement new trash icon, plus some asset cleanup
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:56:41 +0000 (18:56 +0000)]
am
f608095c: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
f608095cf8dfae6759186a4148878c01797b4b34':
add null check to updateCameraParametersPreferences to apease the monkey
Spike Sprague [Fri, 19 Sep 2014 18:44:39 +0000 (18:44 +0000)]
am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
baae9e8478990258edc7e6d014a68e0796859de9':
add null check to updateCameraParametersPreferences to apease the monkey
Spike Sprague [Fri, 19 Sep 2014 18:30:27 +0000 (18:30 +0000)]
am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
8bbb51221106c12b0cf7e933fc2af2a63b84b1c1':
add null check to updateCameraParametersPreferences to apease the monkey
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 06:42:51 +0000 (06:42 +0000)]
am
0f44eb07: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
0f44eb07f8eb99d87556db76c4b5d20fc399b765':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
Spike Sprague [Fri, 19 Sep 2014 06:30:07 +0000 (06:30 +0000)]
am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
476a9e2490d91a125fc608d4e4b4b31768b65ee7':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
Spike Sprague [Fri, 19 Sep 2014 06:19:18 +0000 (06:19 +0000)]
am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
963775c3092e2553ae8157df9e5d307d4f711de1':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
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 [Thu, 18 Sep 2014 20:57:08 +0000 (20:57 +0000)]
am
d99f98a3: am
af25fb04: am
3c3b31df: mode switch jank fixes
* commit '
d99f98a3751fe414aaa03ad85e66625c3cf481e6':
mode switch jank fixes
Spike Sprague [Thu, 18 Sep 2014 20:17:22 +0000 (20:17 +0000)]
am
af25fb04: am
3c3b31df: mode switch jank fixes
* commit '
af25fb04968d9212ec47367f6ba78ee20ca76d05':
mode switch jank fixes
Spike Sprague [Thu, 18 Sep 2014 20:11:13 +0000 (20:11 +0000)]
am
3c3b31df: mode switch jank fixes
* commit '
3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d':
mode switch jank fixes
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
Baligh Uddin [Tue, 16 Sep 2014 18:02:50 +0000 (18:02 +0000)]
am
3cb0aab3: (-s ours) am
9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
3cb0aab3eb4e17c86f91160d476eca00a85a1017':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:31:49 +0000 (15:31 +0000)]
am
9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:20:49 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Puneet Lall [Tue, 16 Sep 2014 08:48:03 +0000 (08:48 +0000)]
am
a82d6ce2: am
0d7a8c08: am
6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '
a82d6ce220f6bd972aa24d73642cee503dbbf5f8':
Don't set mCameraAppUI to null in onDestroy
Spike Sprague [Tue, 16 Sep 2014 08:48:02 +0000 (08:48 +0000)]
am
22173edc: am
ad1462a9: am
a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit '
22173edc3ebcadfa30de386794cb0a72ad72fbe2':
set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
Puneet Lall [Tue, 16 Sep 2014 08:37:44 +0000 (08:37 +0000)]
am
0d7a8c08: am
6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '
0d7a8c08446f94264870538f76bc0c2846e0dd48':
Don't set mCameraAppUI to null in onDestroy
Spike Sprague [Tue, 16 Sep 2014 08:32:18 +0000 (08:32 +0000)]
am
ad1462a9: am
a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit '
ad1462a9492cdf9e98bb0c94cdd4b6c89e0dd47f':
set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
Puneet Lall [Tue, 16 Sep 2014 08:21:16 +0000 (08:21 +0000)]
am
6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '
6f1dfe69b93bfb42c11d456901e9d3ffee826cce':
Don't set mCameraAppUI to null in onDestroy
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 [Mon, 15 Sep 2014 19:26:53 +0000 (19:26 +0000)]
am
a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit '
a16219d51937bda5f3e69c0e77171ae0fb893823':
set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
Baligh Uddin [Mon, 15 Sep 2014 06:11:10 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ec96a5d9c1e761e23af43c5b61dd537e1577346
Auto-generated-cl: translation import
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 19:20:09 +0000 (19:20 +0000)]
am
a4d1c140: am
5c56b2c4: am
70a96525: Don\'t send redundant requests to start the preview
* commit '
a4d1c14021a2b46597ecbe3bea1d4efb37d205e0':
Don't send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 18:59:44 +0000 (18:59 +0000)]
am
5c56b2c4: am
70a96525: Don\'t send redundant requests to start the preview
* commit '
5c56b2c4bf6b31dee65806fcfa67b877657c3975':
Don't send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 18:02:34 +0000 (18:02 +0000)]
am
70a96525: Don\'t send redundant requests to start the preview
* commit '
70a96525f16ca6c6abb9a7a9dab26ba1e61235dd':
Don't send redundant requests to start the preview
Alan Newberger [Fri, 12 Sep 2014 08:26:08 +0000 (08:26 +0000)]
am
55e9bf0f: am
3c324d34: am
486ba1da: Revert layout change for Camera
* commit '
55e9bf0fe8060bc43bfe5d0f02618cb530ed6596':
Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 08:26:07 +0000 (08:26 +0000)]
am
85fb40bc: am
4a7668d7: am
ca5173d8: Move launcher icons to mipmap
* commit '
85fb40bc72bdc6e38ecb80e0a74b8285ccd6b0e6':
Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 05:07:22 +0000 (05:07 +0000)]
am
3c324d34: am
486ba1da: Revert layout change for Camera
* commit '
3c324d34bd0930c615bac32bdb6bbbf7d9cf31c5':
Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 05:07:21 +0000 (05:07 +0000)]
am
4a7668d7: am
ca5173d8: Move launcher icons to mipmap
* commit '
4a7668d72b2f80e90156bfae4befbe37b10c4d2e':
Move launcher icons to mipmap
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 [Fri, 12 Sep 2014 01:46:46 +0000 (01:46 +0000)]
am
486ba1da: Revert layout change for Camera
* commit '
486ba1da145f70b07235617e5f1f64186daa0fc0':
Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 01:46:44 +0000 (01:46 +0000)]
am
ca5173d8: Move launcher icons to mipmap
* commit '
ca5173d84722383d2d9ef49dd85fba28af035429':
Move launcher icons to mipmap
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 18:32:25 +0000 (18:32 +0000)]
am
1f58c3d8: am
1bbdb135: am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
1f58c3d8ee90a39ee37e480ead1e00d944a24074':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 18:01:03 +0000 (18:01 +0000)]
am
1bbdb135: am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
1bbdb135f84e0c223bac9ee68e5ef6960e03ae62':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:51:52 +0000 (17:51 +0000)]
am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
45f316bcecb8713cbb217507981fd657fcdaa274':
Establish synchronous camera closing when app utilizes API1/API2
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 16:12:35 +0000 (16:12 +0000)]
am
95d4d6bc: (-s ours) am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:12:34 +0000 (16:12 +0000)]
am
5d5362ef: (-s ours) am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
5d5362ef5fe47dae6f4ecd43a83b57d5c8b8e31a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:06:18 +0000 (16:06 +0000)]
am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
f238265746c8769bdbba8091d6ae0b30f7ee8697':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:02:34 +0000 (16:02 +0000)]
am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
91225f8b7d51be3f2ca8c187de70e775551b3ce4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 15:58:23 +0000 (15:58 +0000)]
am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
0c5fc1d311eaa82dff09cee6332140fda21d473e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 15:49:05 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
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:53:44 +0000 (04:53 +0000)]
am
bc96895d: am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
bc96895d1644651dcf8cb8abad75b34dd85afec6':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:44:11 +0000 (04:44 +0000)]
am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
d3db7916c770c33feffa34dc2da486af66ab8a13':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:37:47 +0000 (04:37 +0000)]
am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
e6ebf3d73bb3f337413bdde437fbb8fde6cee436':
If we are using CaptureModule for Gcam only, turn off flash.