OSDN Git Service
Alan Newberger [Thu, 25 Sep 2014 18:42:27 +0000 (18:42 +0000)]
am
3695ef51: am
c9ae403c: am
5d104d6e: am
68a63db4: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
3695ef51934df045817414336e071efd103d8425':
Ensure Camera doesn't attempt access of back camera on Nakasi
Alan Newberger [Thu, 25 Sep 2014 18:32:34 +0000 (18:32 +0000)]
am
c9ae403c: am
5d104d6e: am
68a63db4: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
c9ae403cbcbcc65862129e011d2d8eb3ab833ecd':
Ensure Camera doesn't attempt access of back camera on Nakasi
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: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: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: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 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 23:12:55 +0000 (23:12 +0000)]
am
2d939be4: am
8ab931b5: am
4d7f8bdc: am
59cfca2f: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
2d939be4e5f7f7d39d210479e01beb55cca38a58':
Don't show aspect ratio UI if using API2 portability
Alan Newberger [Wed, 24 Sep 2014 23:05:09 +0000 (23:05 +0000)]
am
8ab931b5: am
4d7f8bdc: am
59cfca2f: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
8ab931b56f3b3c6a5911918c221c9c5c0edf002a':
Don't show aspect ratio UI if using API2 portability
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 17:18:18 +0000 (17:18 +0000)]
am
a1ce321c: am
c8b10f95: am
d93dcf9a: am
a02991d9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
a1ce321ce175fc2c6976b1f53fc0705402194c2c':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 17:18:17 +0000 (17:18 +0000)]
am
0ab9387b: am
15a1d51c: am
b2e8901a: am
668f0efc: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
0ab9387b8de15d46cfda2f8534de50e26922fc86':
monkey test NPE fix, another null check on mCameraDevice
Spike Sprague [Wed, 24 Sep 2014 04:19:31 +0000 (04:19 +0000)]
am
c8b10f95: am
d93dcf9a: am
a02991d9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
c8b10f956392bc4c53b41915c7a4091d1a2715e9':
new sounds for timer ticker and pano / photosphere intermediate captures
Spike Sprague [Wed, 24 Sep 2014 04:19:30 +0000 (04:19 +0000)]
am
15a1d51c: am
b2e8901a: am
668f0efc: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
15a1d51c64edd5da6c8ce805a053f2a4d7b0f9d2':
monkey test NPE fix, another null check on mCameraDevice
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 20:55:44 +0000 (20:55 +0000)]
am
406b615c: am
bdc2965c: am
42be3d72: am
fe8184af: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
406b615ca80621edabfd4dd29a279200c53ba5f8':
Fix filmstrip item bounds to filmstrip scale
Alan Newberger [Tue, 23 Sep 2014 19:07:59 +0000 (19:07 +0000)]
am
1e2f127f: am
2e3a6b84: am
78f0b51a: am
7e08f366: am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
1e2f127f4ec920bf07515ae8075391c16ca50118':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 19:07:58 +0000 (19:07 +0000)]
Alan Newberger [Tue, 23 Sep 2014 17:36:32 +0000 (17:36 +0000)]
am
bdc2965c: am
42be3d72: am
fe8184af: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
bdc2965ccbf7b0fb120fe96e773674dc7ea08613':
Fix filmstrip item bounds to filmstrip scale
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 15:51:05 +0000 (15:51 +0000)]
am
2e3a6b84: am
78f0b51a: am
7e08f366: am
9f3628da: am
5f86f7fd: Cleanup gesture UI hide code
* commit '
2e3a6b84278883b27c53aafc40967223892f2ac2':
Cleanup gesture UI hide code
Alan Newberger [Tue, 23 Sep 2014 15:51:04 +0000 (15:51 +0000)]
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 [Sun, 21 Sep 2014 07:24:23 +0000 (00:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81a3dfdc6550fc8f9022690d936748769b23c966
Auto-generated-cl: translation import
Alan Newberger [Sat, 20 Sep 2014 02:13:05 +0000 (02:13 +0000)]
am
e6f258ba: resolved conflicts for merge of
d0927687 to lmp-mr1-dev-plus-aosp
* commit '
e6f258bab71af79e2c6131afaf26def437b110c6':
Add scrolling support with a mouse wheel
Alan Newberger [Sat, 20 Sep 2014 01:45:24 +0000 (18:45 -0700)]
resolved conflicts for merge of
d0927687 to lmp-mr1-dev-plus-aosp
Change-Id: If3841e2f9946db14bef7244bd29bcd7fd11168f6
Baligh Uddin [Fri, 19 Sep 2014 23:51:26 +0000 (23:51 +0000)]
am
0f175802: (-s ours) am
78cb750d: (-s ours) 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 '
0f1758028c8d962cf524a9b273836ec19ca038e9':
Import translations. DO NOT MERGE
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:32:00 +0000 (23:32 +0000)]
am
78cb750d: (-s ours) 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 '
78cb750dc7a3be6f28b14c4bd45726d752afac95':
Import translations. DO NOT MERGE
Jiawen Chen [Fri, 19 Sep 2014 23:31:33 +0000 (23:31 +0000)]
am
24ccd5c2: am
6b748fa2: am
8867d3d0: am
5b88b83a: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
24ccd5c23bdc6fa8f808383dcb713ebe7545d31c':
Changed tap-to-meter rectangle and weights.
Baligh Uddin [Fri, 19 Sep 2014 23:31:32 +0000 (23:31 +0000)]
am
41ed8da9: (-s ours) am
78462033: (-s ours) am
dc3d4642: (-s ours) am
5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
41ed8da9512741303d7ed131eeb4ff8fa70ad9ae':
Import translations. DO NOT MERGE
Alan Newberger [Fri, 19 Sep 2014 23:29:55 +0000 (23:29 +0000)]
am
cb7d69a6: am
6eb08885: am
0d4ad844: am
14f9d310: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
cb7d69a6558c7f2f32a21ea4e9264ce867e63d3f':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 23:29:54 +0000 (23:29 +0000)]
am
786cc4e9: am
10f6e1c7: am
a34f0972: am
545c313a: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
786cc4e93a75c47bfa584c822fd12393908bf6ce':
implement new trash icon, plus some asset cleanup
Spike Sprague [Fri, 19 Sep 2014 23:29:16 +0000 (23:29 +0000)]
am
0dc452ff: am
3110a91c: am
028374b4: am
7a133b82: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
0dc452ffc78e9eb007763986be16165f89870b5d':
add null check to updateCameraParametersPreferences to apease the monkey
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
Jiawen Chen [Fri, 19 Sep 2014 23:14:00 +0000 (23:14 +0000)]
am
6b748fa2: am
8867d3d0: am
5b88b83a: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
6b748fa26107cfe5ea8d960a0399f3f7fa7948ca':
Changed tap-to-meter rectangle and weights.
Baligh Uddin [Fri, 19 Sep 2014 23:14:00 +0000 (23:14 +0000)]
am
78462033: (-s ours) am
dc3d4642: (-s ours) am
5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
7846203368d89fdd1f976434e7820984f1ab878b':
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
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>
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:39 +0000 (22:33 +0000)]
Merge "Import translations. DO NOT MERGE"
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:52:33 +0000 (21:52 +0000)]
am
6eb08885: am
0d4ad844: am
14f9d310: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
6eb08885f73fd05f10a1a6031ba9ae607ac04bbf':
Fix CameraSettingsActivityHelper
Spike Sprague [Fri, 19 Sep 2014 21:52:32 +0000 (21:52 +0000)]
am
10f6e1c7: am
a34f0972: am
545c313a: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
10f6e1c707609bf7abca1c7b97a6d616bf80e668':
implement new trash icon, plus some asset cleanup
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:18:48 +0000 (20:18 +0000)]
am
3110a91c: am
028374b4: am
7a133b82: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
3110a91c041e36a34d52df3d364b450539840704':
add null check to updateCameraParametersPreferences to apease the monkey
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 09:44:58 +0000 (09:44 +0000)]
am
0ddc84de: am
af30546e: am
a87a589c: am
3c1f4c48: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
0ddc84ded0bb0ee8f73cfff5429d1627b887584b':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
Spike Sprague [Fri, 19 Sep 2014 09:31:14 +0000 (09:31 +0000)]
am
af30546e: am
a87a589c: am
3c1f4c48: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
af30546e0c6d4a0fd4f9dc9a6b0a0275419634a1':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
OSDN Git Service
