OSDN Git Service
The Android Automerger [Mon, 4 Mar 2013 13:56:10 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Bobby Georgescu [Sun, 3 Mar 2013 00:24:02 +0000 (16:24 -0800)]
am
e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
* commit '
e118ac5340f04b2cd8e421bee3f85db723a51d38':
Refactor AutoThumbnailDrawable, fix race conditions
Bobby Georgescu [Sat, 2 Mar 2013 18:10:37 +0000 (18:10 +0000)]
Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 1 Mar 2013 22:09:51 +0000 (14:09 -0800)]
Refactor AutoThumbnailDrawable, fix race conditions
Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530
Bart Sears [Sat, 2 Mar 2013 02:21:46 +0000 (18:21 -0800)]
am
d64f356d: Bump up the version number to 1.1.40003
* commit '
d64f356dfbd8d555a8a474bb61af3b2d2b40b208':
Bump up the version number to 1.1.40003
Bart Sears [Sat, 2 Mar 2013 02:11:07 +0000 (18:11 -0800)]
Bump up the version number to 1.1.40003
Change-Id: I696aae61f9f3c61d810e3bb78e2b804ca2106173
nicolasroard [Fri, 1 Mar 2013 22:59:38 +0000 (14:59 -0800)]
am
276a04db: Fix preview rendering speed...
* commit '
276a04dbeb9202239a6a6fec4109ad3c38ba4d5d':
Fix preview rendering speed...
nicolasroard [Fri, 1 Mar 2013 22:54:16 +0000 (14:54 -0800)]
Fix preview rendering speed...
Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
nicolasroard [Fri, 1 Mar 2013 22:42:23 +0000 (14:42 -0800)]
am
36633e24: Fix disappearing border thumbnails
* commit '
36633e241115ff047fff3da5450bbd75adb343f1':
Fix disappearing border thumbnails
nicolasroard [Fri, 1 Mar 2013 22:39:25 +0000 (14:39 -0800)]
Fix disappearing border thumbnails
Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
nicolasroard [Fri, 1 Mar 2013 22:10:08 +0000 (14:10 -0800)]
am
3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)
* commit '
3a5556d3ce5dba33021867468ae0d5d222f256db':
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)
John Hoford [Fri, 1 Mar 2013 21:56:59 +0000 (13:56 -0800)]
nicolasroard [Thu, 28 Feb 2013 20:11:35 +0000 (12:11 -0800)]
Improves State panel and Refactor FilterShowActivity
- handles multiple xml layout
- add a portrait layout
- improves the state panel (delete, etc.)
Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
John Hoford [Fri, 1 Mar 2013 21:43:32 +0000 (13:43 -0800)]
fix imports
Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
John Reck [Fri, 1 Mar 2013 21:36:48 +0000 (13:36 -0800)]
am
3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce
* commit '
3a60b6bc3f972dcd3ff6b7812b7ebaf5ca2e4a58':
Fix crash if a tile ends up with a width or height of 0
John Reck [Fri, 1 Mar 2013 21:35:49 +0000 (21:35 +0000)]
Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce
John Hoford [Fri, 1 Mar 2013 21:32:40 +0000 (13:32 -0800)]
am
7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
* commit '
7b9a9475f04b7f6a547c66a5446f651f2b7c693e':
fixed hiding of tiny planet
John Hoford [Fri, 1 Mar 2013 21:31:50 +0000 (21:31 +0000)]
Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
John Hoford [Fri, 1 Mar 2013 21:22:57 +0000 (13:22 -0800)]
fixed hiding of tiny planet
Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde
John Reck [Fri, 1 Mar 2013 21:27:28 +0000 (13:27 -0800)]
Fix crash if a tile ends up with a width or height of 0
Bug:
8242279
Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae
John Reck [Fri, 1 Mar 2013 19:31:59 +0000 (11:31 -0800)]
am
e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce
* commit '
e2fd033b6d836365779f3db73d8f0f305e1d9a62':
Add full screen image view
John Reck [Fri, 1 Mar 2013 19:30:34 +0000 (19:30 +0000)]
Merge "Add full screen image view" into gb-ub-photos-bryce
John Reck [Thu, 28 Feb 2013 00:48:16 +0000 (16:48 -0800)]
Add full screen image view
Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
Baligh Uddin [Fri, 1 Mar 2013 19:09:40 +0000 (11:09 -0800)]
am
0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
0cc98a35565ee8df2aa04f3f83da15fe30c2af5c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Mar 2013 19:08:17 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 1 Mar 2013 19:07:52 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 1 Mar 2013 19:06:58 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 1 Mar 2013 19:00:27 +0000 (11:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4da8209c247552379974058a3f325cfdbd313ea4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 1 Mar 2013 18:59:48 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: If43bbaaf4c504da6aa0031b5f1e81bd1c90afa26
Auto-generated-cl: translation import
John Reck [Fri, 1 Mar 2013 18:58:30 +0000 (10:58 -0800)]
am
08c0f250: Fix race condition
* commit '
08c0f25091f20c4d618b5adaa381ed6eedf4695f':
Fix race condition
Baligh Uddin [Fri, 1 Mar 2013 18:58:28 +0000 (10:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie290a999c6df7a9dcc8143da7f2685ec09ea7c77
Auto-generated-cl: translation import
John Reck [Fri, 1 Mar 2013 18:23:42 +0000 (10:23 -0800)]
Fix race condition
Change-Id: I6cf9207d067d4c0c3c4271d6ce6f44b213d7296b
John Reck [Fri, 1 Mar 2013 01:26:57 +0000 (17:26 -0800)]
am
d26f1ad5: Clarify threading, cleanup locking
* commit '
d26f1ad5a859da0847ab181df2eebd45e155118b':
Clarify threading, cleanup locking
John Reck [Fri, 1 Mar 2013 00:20:37 +0000 (16:20 -0800)]
Clarify threading, cleanup locking
Bug:
8285317
Change-Id: I8b1b0eda74a41f388e97fee6bcd4ce948bb6e15a
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
nicolasroard [Thu, 28 Feb 2013 22:37:41 +0000 (14:37 -0800)]
am
839d529f: Fix for applied ratios
* commit '
839d529f800adcd1ef5fcd262322bc939c2c2089':
Fix for applied ratios
nicolasroard [Thu, 28 Feb 2013 21:45:14 +0000 (13:45 -0800)]
Fix for applied ratios
Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
nicolasroard [Thu, 28 Feb 2013 21:13:04 +0000 (13:13 -0800)]
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