OSDN Git Service
nicolasroard [Fri, 12 Apr 2013 20:22:33 +0000 (13:22 -0700)]
am
439b028e: am
93ef658b: Add a direct rendering mode
* commit '
439b028e7a74bbc56b96d43c2e58f1679207be7b':
Add a direct rendering mode
nicolasroard [Fri, 12 Apr 2013 20:18:45 +0000 (13:18 -0700)]
am
93ef658b: Add a direct rendering mode
* commit '
93ef658bf44d7ecd79894a9a225a400c2741058f':
Add a direct rendering mode
nicolasroard [Thu, 11 Apr 2013 02:27:57 +0000 (19:27 -0700)]
Add a direct rendering mode
This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.
bug:
8603245
bug:
8588853
Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
Michael Kolb [Fri, 12 Apr 2013 17:10:09 +0000 (10:10 -0700)]
am
fb4605d7: am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
fb4605d780396f5e6c4e5043985b460e24308758':
Add checks for NPE in video pie menu.
Michael Kolb [Fri, 12 Apr 2013 17:04:32 +0000 (10:04 -0700)]
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
Add checks for NPE in video pie menu.
Michael Kolb [Fri, 12 Apr 2013 17:00:38 +0000 (17:00 +0000)]
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 16:59:41 +0000 (09:59 -0700)]
am
76193ba8: am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
76193ba848ca9d146360224522835d2347e899c0':
Fix NPE in PieRenderer
Michael Kolb [Fri, 12 Apr 2013 16:54:18 +0000 (09:54 -0700)]
am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
af998215b46e2b0ffaa2a47a762ba78f7c522e60':
Fix NPE in PieRenderer
Doris Liu [Fri, 12 Apr 2013 16:52:56 +0000 (09:52 -0700)]
am
2bcea6d6: am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
2bcea6d69ba09568a4d64fb14fc062c04a8ab8b8':
Fix ICS recording aspect ratio
Michael Kolb [Fri, 12 Apr 2013 16:51:57 +0000 (16:51 +0000)]
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
Doris Liu [Fri, 12 Apr 2013 16:50:11 +0000 (09:50 -0700)]
am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
d8259c06a0ed459eb937cf3bd3ddd79db1ea2533':
Fix ICS recording aspect ratio
Doris Liu [Fri, 12 Apr 2013 16:47:05 +0000 (16:47 +0000)]
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 15:45:25 +0000 (08:45 -0700)]
Fix NPE in PieRenderer
Bug:
8579025
Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
Ruben Brunk [Fri, 12 Apr 2013 03:40:29 +0000 (20:40 -0700)]
am
eb0347b9: am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
eb0347b95eb58fca649aa13c533775d19fd57927':
G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Fri, 12 Apr 2013 03:37:44 +0000 (20:37 -0700)]
am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0':
G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Fri, 12 Apr 2013 01:01:25 +0000 (18:01 -0700)]
G+ crop overlay shadows. Aspect ratios.
Bug:
8597538
Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
Jason Noguchi [Fri, 12 Apr 2013 00:39:20 +0000 (17:39 -0700)]
Add checks for NPE in video pie menu.
Bug:
8536361
Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
Doris Liu [Wed, 10 Apr 2013 18:52:40 +0000 (11:52 -0700)]
Fix ICS recording aspect ratio
Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
Bobby Georgescu [Thu, 11 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am
0fc0fbf1: am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
0fc0fbf14b8113b2655ae798ef9d7616f37f0d68':
Show loading indicator in full-screen importer view
Bobby Georgescu [Thu, 11 Apr 2013 22:56:11 +0000 (15:56 -0700)]
am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
e51f236bfcc617979871f0be7ce46691cf5415c8':
Show loading indicator in full-screen importer view
Bobby Georgescu [Thu, 11 Apr 2013 22:52:42 +0000 (22:52 +0000)]
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
Angus Kong [Thu, 11 Apr 2013 22:49:00 +0000 (15:49 -0700)]
am
bdb35784: am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
bdb3578486870647fe24d8bae74eaed552d6527b':
Integrate FilmStripView.
Bobby Georgescu [Thu, 11 Apr 2013 22:34:00 +0000 (15:34 -0700)]
Show loading indicator in full-screen importer view
Bug:
8599282
Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
Angus Kong [Thu, 11 Apr 2013 22:45:03 +0000 (15:45 -0700)]
am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90':
Integrate FilmStripView.
Angus Kong [Thu, 11 Apr 2013 22:42:12 +0000 (22:42 +0000)]
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
George Mount [Thu, 11 Apr 2013 20:56:12 +0000 (13:56 -0700)]
am
85233f2c: am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
85233f2c08759aa4731314899dbe43cfc16adc6f':
Add _COUNT support for PhotoProvider to help performance of All Photos.
George Mount [Thu, 11 Apr 2013 20:54:37 +0000 (13:54 -0700)]
am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
34a50f0c3db6890e857abc68f5b9280f95c14d2e':
Add _COUNT support for PhotoProvider to help performance of All Photos.
George Mount [Thu, 11 Apr 2013 20:52:32 +0000 (20:52 +0000)]
Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
Ruben Brunk [Thu, 11 Apr 2013 20:30:48 +0000 (13:30 -0700)]
am
f2b05458: am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
f2b0545806a679e38e230233c80080a5d9c24033':
Setup geometry xforms and propogation chain.
Ruben Brunk [Thu, 11 Apr 2013 20:27:18 +0000 (13:27 -0700)]
am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
ea2fa83c2dd2b59b8a67ec363e4ac431748f997b':
Setup geometry xforms and propogation chain.
Ruben Brunk [Thu, 11 Apr 2013 19:39:03 +0000 (12:39 -0700)]
Setup geometry xforms and propogation chain.
Bug:
8597538
Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
Angus Kong [Tue, 9 Apr 2013 22:02:59 +0000 (15:02 -0700)]
Integrate FilmStripView.
Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
George Mount [Tue, 9 Apr 2013 20:45:09 +0000 (13:45 -0700)]
Add _COUNT support for PhotoProvider to help performance of All Photos.
Bug
8594818
Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6
Doris Liu [Thu, 11 Apr 2013 17:11:48 +0000 (10:11 -0700)]
am
901b8e1a: am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
901b8e1abb5d53db44abfcfe44168e0cdc45a902':
Fix camera preview being squished
Doris Liu [Thu, 11 Apr 2013 17:09:47 +0000 (10:09 -0700)]
am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
1f60d9cd60e01da716a736803994ce14016947ac':
Fix camera preview being squished
Doris Liu [Thu, 11 Apr 2013 17:07:25 +0000 (17:07 +0000)]
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
The Android Open Source Project [Thu, 11 Apr 2013 14:45:23 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I04fc3a249c15bac81c330ad09fd9edeca78b784f
The Android Automerger [Thu, 11 Apr 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Thu, 11 Apr 2013 03:44:20 +0000 (20:44 -0700)]
am
8c18867c: am
41185c4f: Fix downsampling check in crop.
* commit '
8c18867c4dce46eb80ba02732a3cbe0c420e6a64':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 03:40:41 +0000 (20:40 -0700)]
am
41185c4f: Fix downsampling check in crop.
* commit '
41185c4fdbccad17b79697306a7f8044b8f7ffd3':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]
Fix downsampling check in crop.
Bug:
8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
Doris Liu [Wed, 10 Apr 2013 23:43:43 +0000 (16:43 -0700)]
Fix camera preview being squished
Bug:
8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
Baligh Uddin [Wed, 10 Apr 2013 20:04:03 +0000 (13:04 -0700)]
am
5bb44c4b: am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
5bb44c4bef4190364ef0fa34ef643c926e42803a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:02 +0000 (13:04 -0700)]
am
a084c8d3: am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a084c8d3e7787544394d8622f61984b074a06b89':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:01 +0000 (13:04 -0700)]
am
3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
3869b8db1b66c1a470c03d4b97455e3608c4f990':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:00 +0000 (13:04 -0700)]
am
35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
35e29cb6f248176682fd88b6a7bf8c99487551ff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:59:22 +0000 (12:59 -0700)]
am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
27b9459f3764d45d46092aa541e691ff861e0aff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:59:21 +0000 (12:59 -0700)]
am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ba81a885844c3a04e58f70f6eed90de01b5ea44e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:58:23 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:58:12 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 10 Apr 2013 19:57:38 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:57:27 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 10 Apr 2013 19:47:39 +0000 (12:47 -0700)]
am
f5e37e42: am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
f5e37e421790f01024f846d4bc45c6da0c00fb3f':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:42:13 +0000 (12:42 -0700)]
am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
6b138c2240d35571e1f49258f84ec2659223d251':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:39:42 +0000 (19:39 +0000)]
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
Ruben Brunk [Wed, 10 Apr 2013 18:56:43 +0000 (11:56 -0700)]
am
3bc8cc41: am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
3bc8cc417e7b874b7b3f401cc33f073756762ebf':
Adding simple crop ui. Refactoring.
Baligh Uddin [Wed, 10 Apr 2013 18:54:42 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e2a262f7c5c46a89c3298d86969347338be77ce
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:54:22 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:52:53 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9789a0f1295136ca95b2d7b19d7fa6f0dc13e192
Auto-generated-cl: translation import
Ruben Brunk [Wed, 10 Apr 2013 18:52:51 +0000 (11:52 -0700)]
am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90':
Adding simple crop ui. Refactoring.
Baligh Uddin [Wed, 10 Apr 2013 18:52:19 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194
Auto-generated-cl: translation import
Bobby Georgescu [Wed, 10 Apr 2013 18:46:56 +0000 (11:46 -0700)]
Correctly scale images in MTP importer
Bug:
8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
Ruben Brunk [Wed, 10 Apr 2013 18:47:38 +0000 (18:47 +0000)]
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
ztenghui [Wed, 10 Apr 2013 18:35:43 +0000 (11:35 -0700)]
am
a1a67123: am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
a1a67123245321d970058d668ca50bb218bddb19':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:31:34 +0000 (11:31 -0700)]
am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
3eb2fb4dd2ede7f65ee307061213f0e8860f15f6':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
ztenghui [Mon, 8 Apr 2013 21:37:53 +0000 (14:37 -0700)]
Use MediaMuxer for the video trim and mute.
bug:
8548085
Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
Angus Kong [Wed, 10 Apr 2013 17:41:55 +0000 (10:41 -0700)]
am
0c22972b: am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
0c22972b061dd2f458eb1185702c2b4ac8d13d1a':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:39:18 +0000 (10:39 -0700)]
am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
2fc6641b80a7aedf54062cbd01c40cbf0764a6ca':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:35:58 +0000 (17:35 +0000)]
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
The Android Open Source Project [Wed, 10 Apr 2013 17:05:54 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1ffbbe79376c9e0f93dea90e11dfb86b07715328
nicolasroard [Wed, 10 Apr 2013 16:12:12 +0000 (09:12 -0700)]
am
8656a57c: am
3bc806a8: Small cleanup in setting resources
* commit '
8656a57c6cbbae23cc4fa5ede0b3e816864dc12f':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 16:10:00 +0000 (09:10 -0700)]
am
3bc806a8: Small cleanup in setting resources
* commit '
3bc806a8575072c9459fe3698675d3713300d1d3':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 15:20:26 +0000 (08:20 -0700)]
Small cleanup in setting resources
Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
nicolasroard [Wed, 10 Apr 2013 14:33:36 +0000 (07:33 -0700)]
am
990e5979: am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
990e59793b569db2552cced4aae55194814a3001':
Add a third pipeline reserved for the high res preview
nicolasroard [Wed, 10 Apr 2013 14:31:19 +0000 (07:31 -0700)]
am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
e29b57330be471dd74672a7bdc74a93dcae3a98b':
Add a third pipeline reserved for the high res preview
The Android Automerger [Wed, 10 Apr 2013 12:56:44 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Wed, 10 Apr 2013 07:11:46 +0000 (00:11 -0700)]
Adding simple crop ui. Refactoring.
Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
nicolasroard [Wed, 10 Apr 2013 01:43:31 +0000 (18:43 -0700)]
Add a third pipeline reserved for the high res preview
Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
Angus Kong [Mon, 8 Apr 2013 23:57:57 +0000 (16:57 -0700)]
Refactor CameraDataAdapter for other data types.
Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
John Hoford [Wed, 10 Apr 2013 01:35:26 +0000 (18:35 -0700)]
am
81dac121: am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
81dac121ec44462ef68dc1b41de75c3f630997db':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:35:26 +0000 (18:35 -0700)]
am
e8cf8a59: am
7668544e: Detach old editor
* commit '
e8cf8a5931d8933963c64f2d09b2118d8f80f7be':
Detach old editor
John Hoford [Wed, 10 Apr 2013 01:21:56 +0000 (18:21 -0700)]
am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
701955ac93bb05bff2a826c79ea60f921b3745fc':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:21:55 +0000 (18:21 -0700)]
am
7668544e: Detach old editor
* commit '
7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11':
Detach old editor
John Hoford [Wed, 10 Apr 2013 00:56:32 +0000 (00:56 +0000)]
Merge "support icon styles" into gb-ub-photos-bryce
nicolasroard [Wed, 10 Apr 2013 00:52:08 +0000 (17:52 -0700)]
Detach old editor
Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
John Hoford [Wed, 10 Apr 2013 00:47:24 +0000 (17:47 -0700)]
support icon styles
Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
nicolasroard [Tue, 9 Apr 2013 23:47:10 +0000 (16:47 -0700)]
am
3c11e0a2: am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
3c11e0a234925657a4c9b59bdda10342e4412c55':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:43:39 +0000 (16:43 -0700)]
am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:40:34 +0000 (23:40 +0000)]
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
Ruben Brunk [Tue, 9 Apr 2013 23:15:11 +0000 (16:15 -0700)]
am
80e32c08: am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
80e32c082f971c88627692b3faa4656390439f66':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:12:30 +0000 (16:12 -0700)]
am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
4c644f3687d88ea13ff82c3f79b36585ea2c387b':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:07:35 +0000 (16:07 -0700)]
Fix to imports in NewPhotoModule.
Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
Ruben Brunk [Tue, 9 Apr 2013 23:04:13 +0000 (16:04 -0700)]
am
1b34000f: am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
1b34000f478e616a9681623385255418ed562ae6':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 23:01:18 +0000 (16:01 -0700)]
am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
dcd1dd986bc8455ce822e8d9e7a46ea103228351':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Fri, 5 Apr 2013 00:20:42 +0000 (17:20 -0700)]
Moving crop to a separate activity. Refactoring.
Bug:
8526929
Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
nicolasroard [Tue, 9 Apr 2013 22:29:35 +0000 (15:29 -0700)]
Implements swipe in editor menu
Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
Angus Kong [Tue, 9 Apr 2013 21:53:46 +0000 (14:53 -0700)]
am
1d18d4f2: am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
1d18d4f2552df090c3da69aba29faba00f813d6c':
Add more gestures and animations in FilmStripView.
Angus Kong [Tue, 9 Apr 2013 21:51:58 +0000 (14:51 -0700)]
am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
355eaea088a348c394909fea6c9f812ff25e87ac':
Add more gestures and animations in FilmStripView.