OSDN Git Service
nicolasroard [Thu, 28 Feb 2013 21:45:14 +0000 (13:45 -0800)]
Fix for applied ratios
Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
nicolasroard [Thu, 28 Feb 2013 20:59:53 +0000 (12:59 -0800)]
Fix crop ratio
bug:
8291961
Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
The Android Automerger [Thu, 28 Feb 2013 13:55:58 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Nicolas Roard [Thu, 28 Feb 2013 06:01:24 +0000 (22:01 -0800)]
am
e8c2b314: Revert "Cleanup ImagePreset"
* commit '
e8c2b314d8f3c5d79227fae97a0ec1ca68a1e611':
Revert "Cleanup ImagePreset"
Nicolas Roard [Thu, 28 Feb 2013 06:00:05 +0000 (06:00 +0000)]
Revert "Cleanup ImagePreset"
This reverts commit
0f0765676e5be73c7187a44ee88e500ab691bf01
Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
nicolasroard [Thu, 28 Feb 2013 05:19:04 +0000 (21:19 -0800)]
am
0f076567: Cleanup ImagePreset
* commit '
0f0765676e5be73c7187a44ee88e500ab691bf01':
Cleanup ImagePreset
nicolasroard [Thu, 28 Feb 2013 04:45:05 +0000 (20:45 -0800)]
Cleanup ImagePreset
Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
John Hoford [Thu, 28 Feb 2013 04:44:41 +0000 (20:44 -0800)]
John Hoford [Thu, 28 Feb 2013 03:21:38 +0000 (19:21 -0800)]
crop fix
Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f
nicolasroard [Thu, 28 Feb 2013 02:33:55 +0000 (18:33 -0800)]
am
e1c3724f: Fix full res preview
* commit '
e1c3724ff23c91d8e6d783545fb0f2d3bba8ce2b':
Fix full res preview
nicolasroard [Thu, 28 Feb 2013 01:55:16 +0000 (17:55 -0800)]
Fix full res preview
Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa
nicolasroard [Thu, 28 Feb 2013 01:49:35 +0000 (17:49 -0800)]
am
65e47f69: Fix scale and full res preview
* commit '
65e47f698043f95ed8067e8c41397c472e5e433a':
Fix scale and full res preview
nicolasroard [Thu, 28 Feb 2013 01:47:06 +0000 (17:47 -0800)]
Fix scale and full res preview
Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
John Hoford [Thu, 28 Feb 2013 01:45:27 +0000 (17:45 -0800)]
am
cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce
* commit '
cad3dd97f0c169b22e9d55e5ef38384075a4f4be':
refactor the geometry code
John Hoford [Thu, 28 Feb 2013 01:43:44 +0000 (01:43 +0000)]
Merge "refactor the geometry code" into gb-ub-photos-bryce
John Hoford [Wed, 27 Feb 2013 16:41:19 +0000 (08:41 -0800)]
refactor the geometry code
Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
Justin Koh [Wed, 27 Feb 2013 23:45:32 +0000 (15:45 -0800)]
am
94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
* commit '
94c06451103e8e6b43c927f2248b814bd803a6dc':
Updated Gallery2 with Pano.
Justin Koh [Wed, 27 Feb 2013 23:43:00 +0000 (23:43 +0000)]
Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
Justin Koh [Wed, 27 Feb 2013 23:31:29 +0000 (15:31 -0800)]
Updated Gallery2 with Pano.
Updated Gallery2 with Pano.
Bug:
8263808
Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003
Michael Kolb [Wed, 27 Feb 2013 22:59:39 +0000 (14:59 -0800)]
am
7b17c647: Merge "Highlight menu selection better" into gb-ub-photos-bryce
* commit '
7b17c647bb037373332634a6a88ceb066336f9ee':
Highlight menu selection better
Michael Kolb [Wed, 27 Feb 2013 22:57:49 +0000 (22:57 +0000)]
Merge "Highlight menu selection better" into gb-ub-photos-bryce
Baligh Uddin [Wed, 27 Feb 2013 20:54:34 +0000 (12:54 -0800)]
am
c1424ad2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
c1424ad2a2612b21201f8377004713a06d357b3c':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Feb 2013 20:54:33 +0000 (12:54 -0800)]
am
2f2eca6c: (-s ours) Import translations. DO NOT MERGE
* commit '
2f2eca6c78e738c7d06fc2ff517d53beefd54673':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Feb 2013 20:53:29 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 27 Feb 2013 19:20:44 +0000 (11:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib435e397fb94039d4a4cc4da66ae4afcc198dac2
Auto-generated-cl: translation import
Baligh Uddin [Wed, 27 Feb 2013 19:19:03 +0000 (11:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id252293b9f782ee6744738fe20fc86230a898fb8
Auto-generated-cl: translation import
Michael Kolb [Wed, 27 Feb 2013 19:00:31 +0000 (11:00 -0800)]
Highlight menu selection better
Keep the selected slice highlighted longer before fading out
Timing might need further adjusting
Change-Id: I9c3febf4ad2b73f2c80d47259fa9cd7578445dd4
The Android Automerger [Wed, 27 Feb 2013 13:55:47 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Wed, 27 Feb 2013 02:21:06 +0000 (18:21 -0800)]
am
e1d87575: Fix vignette startup draw
* commit '
e1d875757bbe6634d7224c4f759d904688de4013':
Fix vignette startup draw
nicolasroard [Wed, 27 Feb 2013 02:14:39 +0000 (18:14 -0800)]
Fix vignette startup draw
Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
John Reck [Wed, 27 Feb 2013 01:43:21 +0000 (17:43 -0800)]
am
158cbda6: Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
* commit '
158cbda6ff7443fc86321a509341d326455d868c':
Thumbnails for PhotoSetPage
John Reck [Wed, 27 Feb 2013 01:41:44 +0000 (01:41 +0000)]
Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
John Reck [Tue, 26 Feb 2013 23:19:30 +0000 (15:19 -0800)]
Thumbnails for PhotoSetPage
Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
nicolasroard [Tue, 26 Feb 2013 23:02:04 +0000 (15:02 -0800)]
am
10ece61a: FilterShowActivity cleanup
* commit '
10ece61a285633c1b06921ec7b8ce3c50bb37b73':
FilterShowActivity cleanup
nicolasroard [Tue, 26 Feb 2013 22:43:05 +0000 (14:43 -0800)]
FilterShowActivity cleanup
Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
John Hoford [Tue, 26 Feb 2013 21:55:34 +0000 (13:55 -0800)]
am
69cc3eba: Merge "add upoint" into gb-ub-photos-bryce
* commit '
69cc3eba9a4405190d6429df52609fb0d7079c52':
add upoint
John Hoford [Tue, 26 Feb 2013 21:54:30 +0000 (21:54 +0000)]
Merge "add upoint" into gb-ub-photos-bryce
George Mount [Tue, 26 Feb 2013 20:51:11 +0000 (12:51 -0800)]
am
c8419b4e: Add initial implementation of PhotosProvider.
* commit '
c8419b4e5e3302f2efc7ea629891041a14219aa7':
Add initial implementation of PhotosProvider.
George Mount [Thu, 21 Feb 2013 01:01:54 +0000 (17:01 -0800)]
Add initial implementation of PhotosProvider.
Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
John Hoford [Tue, 26 Feb 2013 01:39:01 +0000 (17:39 -0800)]
add upoint
Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
nicolasroard [Tue, 26 Feb 2013 17:03:49 +0000 (09:03 -0800)]
am
db4cedf1: Disable full res when dealing with jpeg orientation
* commit '
db4cedf1feb3899840963b2648dc3e2b4d0a1d6f':
Disable full res when dealing with jpeg orientation
nicolasroard [Tue, 26 Feb 2013 16:53:29 +0000 (08:53 -0800)]
Disable full res when dealing with jpeg orientation
Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
The Android Automerger [Tue, 26 Feb 2013 16:51:03 +0000 (08:51 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Tue, 26 Feb 2013 06:11:48 +0000 (22:11 -0800)]
am
a3a4c954: Fix compare swipe
* commit '
a3a4c954c6917375a852d3f3c64d0c76693b5677':
Fix compare swipe
nicolasroard [Tue, 26 Feb 2013 05:04:58 +0000 (21:04 -0800)]
Fix compare swipe
bug:
8266511
nicolasroard [Tue, 26 Feb 2013 04:52:10 +0000 (20:52 -0800)]
am
8b4c7f99: Merge "Fix crash on applying borders" into gb-ub-photos-bryce
* commit '
8b4c7f99ddd23cfba032f1f2f878d644f0659972':
Fix crash on applying borders
nicolasroard [Tue, 26 Feb 2013 04:50:31 +0000 (04:50 +0000)]
Merge "Fix crash on applying borders" into gb-ub-photos-bryce
nicolasroard [Tue, 26 Feb 2013 04:38:25 +0000 (20:38 -0800)]
Fix crash on applying borders
bug:
8265497
Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
Michael Kolb [Tue, 26 Feb 2013 04:24:47 +0000 (20:24 -0800)]
am
e858477f: Merge "Use cross fade rotation animation" into gb-ub-photos-bryce
* commit '
e858477ff8ed81b39031f1197ed6d92de56e51f6':
Use cross fade rotation animation
Michael Kolb [Tue, 26 Feb 2013 04:23:35 +0000 (04:23 +0000)]
Merge "Use cross fade rotation animation" into gb-ub-photos-bryce
Michael Kolb [Tue, 26 Feb 2013 03:43:56 +0000 (19:43 -0800)]
Use cross fade rotation animation
Bug:
8257846
Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
Ruben Brunk [Tue, 26 Feb 2013 03:09:12 +0000 (19:09 -0800)]
am
21a01faa: Fixed more of filtershows large bitmap reference leaks.
* commit '
21a01faab1125c5c347a3dfbf6a71de6aec233a1':
Fixed more of filtershows large bitmap reference leaks.
Ruben Brunk [Tue, 26 Feb 2013 01:18:51 +0000 (17:18 -0800)]
Fixed more of filtershows large bitmap reference leaks.
Bug:
8253109
Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
Baligh Uddin [Mon, 25 Feb 2013 18:00:43 +0000 (10:00 -0800)]
am
313a2093: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
313a20935178edcf34fcd8ecdf394c82f0b3d2dd':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Feb 2013 18:00:43 +0000 (10:00 -0800)]
am
47b0fd0a: (-s ours) Import translations. DO NOT MERGE
* commit '
47b0fd0a0fabeec59f92690ee619319c61221874':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Feb 2013 18:00:15 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 25 Feb 2013 17:59:50 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 25 Feb 2013 15:42:02 +0000 (07:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I64b92d95a6df0146a78c190618dc0d12edefd8c9
Auto-generated-cl: translation import
Baligh Uddin [Mon, 25 Feb 2013 15:41:41 +0000 (07:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I833d58d07a1126966484a53851f6a84b45068152
Auto-generated-cl: translation import
Baligh Uddin [Mon, 25 Feb 2013 15:41:18 +0000 (07:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d641cbf3a090ef65ff4adb8f5a7694b08ccfdd2
Auto-generated-cl: translation import
Baligh Uddin [Mon, 25 Feb 2013 15:40:31 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I545c00f3af3c4d7ab8dee256e8f3119bea41e6f7
Auto-generated-cl: translation import
The Android Automerger [Mon, 25 Feb 2013 13:56:19 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master
Doris Liu [Sat, 23 Feb 2013 00:07:19 +0000 (16:07 -0800)]
am
e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
* commit '
e455b777139921c5e72a9afca3f9ba3ae21975ba':
Release surface texture to fix gray camera preview
Doris Liu [Sat, 23 Feb 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
John Reck [Fri, 22 Feb 2013 23:45:07 +0000 (15:45 -0800)]
am
5f30b98d: Start of photos
* commit '
5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820':
Start of photos
Doris Liu [Fri, 22 Feb 2013 22:31:17 +0000 (14:31 -0800)]
Release surface texture to fix gray camera preview
Bug:
8133672
Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
Baligh Uddin [Fri, 22 Feb 2013 23:14:31 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE"
John Reck [Fri, 15 Feb 2013 22:32:08 +0000 (14:32 -0800)]
Start of photos
Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
Baligh Uddin [Fri, 22 Feb 2013 22:25:32 +0000 (14:25 -0800)]
am
e7719898: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e77198985fc22ed2cf24f5d497309742165bc69f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Feb 2013 22:23:17 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 22:00:21 +0000 (14:00 -0800)]
am
d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce
* commit '
d5633ea950ab82be13189705004ce97bce6a5715':
Stopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:58:33 +0000 (21:58 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.
Bug:
8253109
Bug:
8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
Ruben Brunk [Fri, 22 Feb 2013 21:49:12 +0000 (13:49 -0800)]
am
ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce
* commit '
ddec680a6d4604bc6fd44b29dfbf964422f40fcb':
Revert "Stopgap fixes for more of the photo editor's memory issues."
Ruben Brunk [Fri, 22 Feb 2013 21:47:06 +0000 (21:47 +0000)]
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:45:26 +0000 (21:45 +0000)]
Revert "Stopgap fixes for more of the photo editor's memory issues."
This reverts commit
4c91156f9a2e48ebaec86e3a46ea9b7855392cfd
Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
Ruben Brunk [Fri, 22 Feb 2013 21:44:01 +0000 (13:44 -0800)]
am
fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce
* commit '
fc673e131aa3482e5202fad1b54208442df35c2c':
Stopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:41:03 +0000 (21:41 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.
Bug:
8253109
Bug:
8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456
Bobby Georgescu [Fri, 22 Feb 2013 21:05:41 +0000 (13:05 -0800)]
am
fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
* commit '
fae7bf8557f7de818a768d7a8c30425a9a5641d8':
Replace various BitmapPools with a smarter unified pool
Bobby Georgescu [Fri, 22 Feb 2013 21:03:45 +0000 (21:03 +0000)]
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Feb 2013 23:49:14 +0000 (15:49 -0800)]
Replace various BitmapPools with a smarter unified pool
Make all of gallery use a single shared pool, and pave the
way for making the pool more adaptive based on the current
workload.
Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
nicolasroard [Fri, 22 Feb 2013 19:43:14 +0000 (11:43 -0800)]
am
ea332c69: Don\'t apply the filters twice in partial rendering...
* commit '
ea332c69f084322ebdd13419424ee5fab2351760':
Don't apply the filters twice in partial rendering...
nicolasroard [Fri, 22 Feb 2013 19:35:41 +0000 (11:35 -0800)]
Don't apply the filters twice in partial rendering...
Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
Ruben Brunk [Fri, 22 Feb 2013 17:54:35 +0000 (09:54 -0800)]
am
2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
* commit '
2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e':
Move setting wallpaper to a background thread.
Ruben Brunk [Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)]
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 04:13:20 +0000 (20:13 -0800)]
Move setting wallpaper to a background thread.
Bug:
8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
Baligh Uddin [Fri, 22 Feb 2013 16:16:53 +0000 (08:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25144d117077ba76dff4a24a255dbc3513533fa3
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Feb 2013 16:15:57 +0000 (08:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab4b1ffed69207e4d4e3962d15845d4d550e7022
Auto-generated-cl: translation import
The Android Automerger [Fri, 22 Feb 2013 05:13:37 +0000 (21:13 -0800)]
nicolasroard [Fri, 22 Feb 2013 01:48:52 +0000 (17:48 -0800)]
am
e5498da0: Pinch to zoom refine
* commit '
e5498da0262fc836738aad63ea30286d8afa643c':
Pinch to zoom refine
nicolasroard [Thu, 21 Feb 2013 23:52:49 +0000 (15:52 -0800)]
Pinch to zoom refine
Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
Ruben Brunk [Thu, 21 Feb 2013 23:53:07 +0000 (15:53 -0800)]
am
0f8047fe: Fix for null check with RS allocations.
* commit '
0f8047fe826a84829ab37bc7cd24c8a4dea0db64':
Fix for null check with RS allocations.
Ruben Brunk [Thu, 21 Feb 2013 23:43:33 +0000 (15:43 -0800)]
Fix for null check with RS allocations.
Bug:
8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
John Hoford [Thu, 21 Feb 2013 23:30:53 +0000 (15:30 -0800)]
am
2fc7efdc: fix draw and ellipse to handle pinch to zoom
* commit '
2fc7efdcd75279649091471dda3ee600db25a995':
fix draw and ellipse to handle pinch to zoom
John Hoford [Thu, 21 Feb 2013 23:18:37 +0000 (15:18 -0800)]
fix draw and ellipse to handle pinch to zoom
Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
Michael Kolb [Thu, 21 Feb 2013 23:11:31 +0000 (15:11 -0800)]
am
8539fc1a: Adjust capture animation timing
* commit '
8539fc1a5406af9edd5414fba3615cc045aa63ec':
Adjust capture animation timing
Michael Kolb [Thu, 21 Feb 2013 19:37:45 +0000 (11:37 -0800)]
Adjust capture animation timing
Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
Ruben Brunk [Thu, 21 Feb 2013 22:17:50 +0000 (14:17 -0800)]
am
e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
* commit '
e406ec4ddcfe6336c4119de9044b27f38197fff7':
Temporary handling when running out of heap in filtershow.
John Hoford [Thu, 21 Feb 2013 22:17:49 +0000 (14:17 -0800)]
am
8921c28c: add highlight filter
* commit '
8921c28c7333ad2b4d34f013904ad4737044f366':
add highlight filter
OSDN Git Service
