OSDN Git Service
Alan Newberger [Thu, 25 Sep 2014 19:00:24 +0000 (19:00 +0000)]
am
6e27443e: am
e9541583: am
f379211c: am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
6e27443e6aa16b4407a67deaea22a37d04f3050c':
Force filmstrip images to generate in JPEG compression format
Alan Newberger [Thu, 25 Sep 2014 18:53:06 +0000 (18:53 +0000)]
am
e9541583: am
f379211c: am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
e9541583a10a2de2f0cbd8ea7aa8b79f02431760':
Force filmstrip images to generate in JPEG compression format
Puneet Lall [Thu, 25 Sep 2014 18:52:41 +0000 (18:52 +0000)]
am
0950ed17: am
d0f873b9: am
fc0e5d89: am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
0950ed171aa8b9949d9ed976ad66b11c899a8c0a':
Recreate a OneCameraManager instance for each Activity.
Senpo Hu [Thu, 25 Sep 2014 18:52:41 +0000 (18:52 +0000)]
am
2fbe8a6e: am
814310de: am
437fd924: am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
2fbe8a6e67674c614b898d65addb1a320d14c404':
Stability: add null check for all CameraProxy obj references in PhotoModule.
Puneet Lall [Thu, 25 Sep 2014 18:42:28 +0000 (18:42 +0000)]
am
d0f873b9: am
fc0e5d89: am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
d0f873b9c6cab64d549287254175f48acf78ab6d':
Recreate a OneCameraManager instance for each Activity.
Senpo Hu [Thu, 25 Sep 2014 18:42:28 +0000 (18:42 +0000)]
am
814310de: am
437fd924: am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
814310de540722dd71c07a4aa35cbb511f78e2e0':
Stability: add null check for all CameraProxy obj references in PhotoModule.
Alan Newberger [Thu, 25 Sep 2014 18:41:52 +0000 (18:41 +0000)]
am
f379211c: am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
f379211cc6ec4ca292d100a53a8e1ea49958fcae':
Force filmstrip images to generate in JPEG compression format
Puneet Lall [Thu, 25 Sep 2014 18:33:52 +0000 (18:33 +0000)]
am
fc0e5d89: am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
fc0e5d895cbad548cb2cb1d874d1c0fed49333c9':
Recreate a OneCameraManager instance for each Activity.
Senpo Hu [Thu, 25 Sep 2014 18:33:51 +0000 (18:33 +0000)]
am
437fd924: am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
437fd924f0bcffafa9aafcb719e233c68d81042b':
Stability: add null check for all CameraProxy obj references in PhotoModule.
Alan Newberger [Thu, 25 Sep 2014 18:33:37 +0000 (18:33 +0000)]
am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
47c4474ea9e51a58f2ba1795de90c9aaf135f442':
Force filmstrip images to generate in JPEG compression format
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
Puneet Lall [Thu, 25 Sep 2014 18:21:59 +0000 (18:21 +0000)]
am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
4d2f3bf448d8546920a3d94ce15033357388d2cc':
Recreate a OneCameraManager instance for each Activity.
Senpo Hu [Thu, 25 Sep 2014 18:21:58 +0000 (18:21 +0000)]
am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
ee3123ba4b4cc107423441bb8d687c14a2dc4b9a':
Stability: add null check for all CameraProxy obj references in PhotoModule.
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 16:57:57 +0000 (16:57 +0000)]
am
36d08ae0: am
f49e3882: am
3f8c75b2: am
da6f3acc: Skip disk caching for session data
* commit '
36d08ae04d6465ef8ee4bc10760b6f8977ae7984':
Skip disk caching for session data
Alan Newberger [Thu, 25 Sep 2014 16:57:56 +0000 (16:57 +0000)]
am
359c1b20: am
e25f2203: am
92db2cb4: am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
359c1b20bc2e830a76a0a2f20193673995be8e59':
Revert temporary session images in filmstrip to RGB_565
Alan Newberger [Thu, 25 Sep 2014 16:57:53 +0000 (16:57 +0000)]
am
5d104d6e: am
68a63db4: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
5d104d6eccfcf698f555a8c4cc7da759a20f4c9a':
Ensure Camera doesn't attempt access of back camera on Nakasi
Alan Newberger [Thu, 25 Sep 2014 16:39:19 +0000 (16:39 +0000)]
am
f49e3882: am
3f8c75b2: am
da6f3acc: Skip disk caching for session data
* commit '
f49e3882849e68acda0eaa39ad11e4cd207e2cd1':
Skip disk caching for session data
Alan Newberger [Thu, 25 Sep 2014 16:39:18 +0000 (16:39 +0000)]
am
e25f2203: am
92db2cb4: am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
e25f22030ee7f3628824c3cc74ec8bda7bb9d681':
Revert temporary session images in filmstrip to RGB_565
Alan Newberger [Thu, 25 Sep 2014 16:39:18 +0000 (16:39 +0000)]
am
68a63db4: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
68a63db488679cca1e9723813fe692fc1a9ace82':
Ensure Camera doesn't attempt access of back camera on Nakasi
Alan Newberger [Thu, 25 Sep 2014 16:23:34 +0000 (16:23 +0000)]
am
3f8c75b2: am
da6f3acc: Skip disk caching for session data
* commit '
3f8c75b21820b64551a3226ab71bdb7707b286f9':
Skip disk caching for session data
Alan Newberger [Thu, 25 Sep 2014 16:23:34 +0000 (16:23 +0000)]
am
92db2cb4: am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
92db2cb42b74da6dbf94f79edb2671d517441aeb':
Revert temporary session images in filmstrip to RGB_565
Alan Newberger [Thu, 25 Sep 2014 16:23:33 +0000 (16:23 +0000)]
am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
af73f89883e9386cf309c029efba19c82597b136':
Ensure Camera doesn't attempt access of back camera on Nakasi
Alan Newberger [Thu, 25 Sep 2014 01:37:00 +0000 (01:37 +0000)]
am
da6f3acc: Skip disk caching for session data
* commit '
da6f3accc02c942b1f2dd1c248edb6a0bd66ee10':
Skip disk caching for session data
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:10:06 +0000 (01:10 +0000)]
am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
6b2d1e0b660e931c6cbc91a25ec85df070712e65':
Revert temporary session images in filmstrip to RGB_565
Alan Newberger [Thu, 25 Sep 2014 01:10:04 +0000 (01:10 +0000)]
am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
347dccbe1ed10ceec190af4d3797a197426f1caf':
Ensure Camera doesn't attempt access of back camera on Nakasi
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 22:53:08 +0000 (22:53 +0000)]
am
4d7f8bdc: am
59cfca2f: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
4d7f8bdcfdc694ca64bc0349aa017cc468c33ac0':
Don't show aspect ratio UI if using API2 portability
Alan Newberger [Wed, 24 Sep 2014 22:36:50 +0000 (22:36 +0000)]
am
59cfca2f: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
59cfca2fd973402ca1de8486ed38d005707d5556':
Don't show aspect ratio UI if using API2 portability
Alan Newberger [Wed, 24 Sep 2014 22:13:17 +0000 (22:13 +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 04:05:00 +0000 (04:05 +0000)]
am
d93dcf9a: am
a02991d9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
d93dcf9a532a0d6ba88d8c220f629dd783503ad3':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 04:04:19 +0000 (04:04 +0000)]
am
b2e8901a: am
668f0efc: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
b2e8901aaa5e53faf5c4d449f1ab57b0906dcb20':
monkey test NPE fix, another null check on mCameraDevice
Spike Sprague [Wed, 24 Sep 2014 03:53:10 +0000 (03:53 +0000)]
am
a02991d9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
a02991d9523775e60a349e1deced9a63ad145237':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 03:29:02 +0000 (03:29 +0000)]
am
668f0efc: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
668f0efca1d8864c50787b39927a5e0fdf6c415a':
monkey test NPE fix, another null check on mCameraDevice
Spike Sprague [Wed, 24 Sep 2014 01:57:21 +0000 (01:57 +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:24:29 +0000 (01:24 +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:25:15 +0000 (17:25 +0000)]
am
42be3d72: am
fe8184af: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
42be3d72dedda974e9001f8c81d075aa4a18c095':
Fix filmstrip item bounds to filmstrip scale
Alan Newberger [Tue, 23 Sep 2014 17:12:33 +0000 (17:12 +0000)]
am
fe8184af: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
fe8184af85604e6a87fe1e74df026a78732f08ce':
Fix filmstrip item bounds to filmstrip scale
Alan Newberger [Tue, 23 Sep 2014 17:00:03 +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:14:47 +0000 (02:14 +0000)]
am
78f0b51a: am
7e08f366: am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
78f0b51ac319dbed8f845612947d954d530fb74e':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 02:14:46 +0000 (02:14 +0000)]
am
b3c72147: am
34920701: am
8f1ffed7: am
b2b0e02c: Clean up unused code
* commit '
b3c7214788b78af1366417d0acef2245745b18af':
Clean up unused code
Alan Newberger [Tue, 23 Sep 2014 00:53:41 +0000 (00:53 +0000)]
am
7e08f366: am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
7e08f3666544edb0fc096a78e82ebc4070674527':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 00:53:41 +0000 (00:53 +0000)]
am
34920701: am
8f1ffed7: am
b2b0e02c: Clean up unused code
* commit '
349207016a09a174c6a4a8c5b2698cdd11145183':
Clean up unused code
Alan Newberger [Tue, 23 Sep 2014 00:44:43 +0000 (00:44 +0000)]
am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 00:44:42 +0000 (00:44 +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
Baligh Uddin [Fri, 19 Sep 2014 23:18:28 +0000 (23:18 +0000)]
am
8399a0c5: (-s ours) am
67bcd21a: (-s ours) am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
8399a0c584316d499b191b6ab9764faa38a289b2':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Sep 2014 23:03:13 +0000 (23:03 +0000)]
am
67bcd21a: (-s ours) am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
67bcd21a8245e4f478dd581085902a644dfeacdf':
Import translations. DO NOT MERGE
Jiawen Chen [Fri, 19 Sep 2014 22:57:33 +0000 (22:57 +0000)]
am
8867d3d0: am
5b88b83a: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
8867d3d04af805ce9b7b54ddb2cb81a6467ab1d9':
Changed tap-to-meter rectangle and weights.
Baligh Uddin [Fri, 19 Sep 2014 22:57:32 +0000 (22:57 +0000)]
am
dc3d4642: (-s ours) am
5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
dc3d4642ee30ab8b34a1e73b705a66cc5348a835':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Sep 2014 22:54:21 +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:47:40 +0000 (22:47 +0000)]
am
5b88b83a: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
5b88b83ac82974c0b80343175c29644d226ee772':
Changed tap-to-meter rectangle and weights.
Baligh Uddin [Fri, 19 Sep 2014 22:47:40 +0000 (22:47 +0000)]
am
5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
5628cfde3c815fdfd6814be94c536dedd69e79e9':
Import translations. DO NOT MERGE
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:42:45 +0000 (22:42 +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:41 +0000 (22:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
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:36:03 +0000 (21:36 +0000)]
am
0d4ad844: am
14f9d310: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
0d4ad84475bc930a7303df8f2fa29eacdbb148aa':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 21:36:02 +0000 (21:36 +0000)]
am
a34f0972: am
545c313a: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
a34f0972185ee99ad34d9828ae5b4ada2bf9f5cd':
implement new trash icon, plus some asset cleanup
Alan Newberger [Fri, 19 Sep 2014 21:27:03 +0000 (21:27 +0000)]
am
14f9d310: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
14f9d3102161b59b46988cd6bfd48ff3b2a6aa7a':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 21:27:02 +0000 (21:27 +0000)]
am
545c313a: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
545c313a87e04b6a66888359144dbe91e7e62311':
implement new trash icon, plus some asset cleanup
Alan Newberger [Fri, 19 Sep 2014 21:14:45 +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:44 +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 20:08:23 +0000 (20:08 +0000)]
am
028374b4: am
7a133b82: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
028374b4a75decc2a31740dabcfc338fd74d2b54':
add null check to updateCameraParametersPreferences to apease the monkey
Spike Sprague [Fri, 19 Sep 2014 19:57:07 +0000 (19:57 +0000)]
am
7a133b82: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
7a133b82a571188d56a4aa8b7773af5dffa11f6f':
add null check to updateCameraParametersPreferences to apease the monkey
Spike Sprague [Fri, 19 Sep 2014 19:32:08 +0000 (19:32 +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 08:41:49 +0000 (08:41 +0000)]
am
a87a589c: am
3c1f4c48: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
a87a589c25dd95d4606ac6dba5f38aee11c0c2b2':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
Spike Sprague [Fri, 19 Sep 2014 06:48:59 +0000 (06:48 +0000)]
am
3c1f4c48: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
3c1f4c48c69d8946d2ff65bf4b30e48e8124fded':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
Spike Sprague [Fri, 19 Sep 2014 06:38:51 +0000 (06:38 +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:44:08 +0000 (20:44 +0000)]
am
3194f409: am
f18e95bc: am
af25fb04: am
3c3b31df: mode switch jank fixes
* commit '
3194f4099bd441629242d52a6ff9f1974cf9cce2':
mode switch jank fixes
OSDN Git Service
