OSDN Git Service
George Mount [Thu, 7 Mar 2013 00:06:45 +0000 (16:06 -0800)]
am
1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
* commit '
1732a9cfe68564c7b55b0157575561ecf0f9fdc4':
Add required fields to PhotoProvider.
George Mount [Thu, 7 Mar 2013 00:05:42 +0000 (00:05 +0000)]
Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
George Mount [Wed, 6 Mar 2013 19:49:10 +0000 (11:49 -0800)]
Add required fields to PhotoProvider.
Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd
Bobby Georgescu [Wed, 6 Mar 2013 23:12:27 +0000 (15:12 -0800)]
am
fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
* commit '
fd21feacb7bca840056f82ad219d6e93374a73c2':
Preliminary AlbumSet UI
Bobby Georgescu [Wed, 6 Mar 2013 23:10:22 +0000 (23:10 +0000)]
Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 22:52:15 +0000 (14:52 -0800)]
am
8d2a3057: Fix camera switcher mode picker
* commit '
8d2a3057bb8a4a3bbaa5be3ef9ac91f00ff50957':
Fix camera switcher mode picker
Doris Liu [Wed, 6 Mar 2013 21:56:53 +0000 (13:56 -0800)]
Fix camera switcher mode picker
Bug:
8330008
Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
John Hoford [Wed, 6 Mar 2013 21:07:35 +0000 (13:07 -0800)]
am
4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce
* commit '
4e330be1512162dd0ed4988352cd32017758f3d6':
fix undo bug
John Hoford [Wed, 6 Mar 2013 21:05:05 +0000 (21:05 +0000)]
Merge "fix undo bug" into gb-ub-photos-bryce
John Hoford [Wed, 6 Mar 2013 20:26:37 +0000 (12:26 -0800)]
fix undo bug
bug:
8319433
Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
Doris Liu [Wed, 6 Mar 2013 19:42:59 +0000 (11:42 -0800)]
am
8892e5e7: Fix NPE in switcher popup
* commit '
8892e5e7ffa1f33b527b7753b07723dfd685a9cd':
Fix NPE in switcher popup
Doris Liu [Wed, 6 Mar 2013 19:22:48 +0000 (11:22 -0800)]
Fix NPE in switcher popup
Bug:
8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
Baligh Uddin [Wed, 6 Mar 2013 06:03:31 +0000 (22:03 -0800)]
am
f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
f831c736a3c0c20b59873d98f8abe5b2a234f402':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Mar 2013 06:02:43 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 6 Mar 2013 06:02:21 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:48:28 +0000 (19:48 -0800)]
am
7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
* commit '
7f51a8455b34d794797388d31c1b42b0de9844d5':
Add a black bar symmetric to nav bar
Doris Liu [Wed, 6 Mar 2013 03:48:27 +0000 (19:48 -0800)]
am
457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
* commit '
457bab952ea6b8babf2d37c817f06aed3829ba61':
Keep camera controls on the same physical side
Doris Liu [Wed, 6 Mar 2013 03:47:13 +0000 (03:47 +0000)]
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:46:52 +0000 (03:46 +0000)]
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
Doris Liu [Tue, 5 Mar 2013 17:54:25 +0000 (09:54 -0800)]
Add a black bar symmetric to nav bar
Also fix bug:
8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
Bobby Georgescu [Mon, 4 Mar 2013 19:44:49 +0000 (11:44 -0800)]
Preliminary AlbumSet UI
Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
nicolasroard [Tue, 5 Mar 2013 22:33:34 +0000 (14:33 -0800)]
am
63b33e8c: Improves visual history
* commit '
63b33e8c7ebeeec2b520fb419d89ada712ad6604':
Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:27:54 +0000 (14:27 -0800)]
Improves visual history
Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
Doris Liu [Tue, 5 Mar 2013 06:19:10 +0000 (22:19 -0800)]
Keep camera controls on the same physical side
Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
nicolasroard [Tue, 5 Mar 2013 15:50:28 +0000 (07:50 -0800)]
nicolasroard [Tue, 5 Mar 2013 05:43:49 +0000 (21:43 -0800)]
Visual History
Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
nicolasroard [Tue, 5 Mar 2013 03:04:43 +0000 (19:04 -0800)]
am
a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
* commit '
a0adf2113b8728d92f270953ca8cab50335fe68e':
Simplify and speed up thumbnail creation
nicolasroard [Tue, 5 Mar 2013 03:03:04 +0000 (03:03 +0000)]
Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
nicolasroard [Tue, 5 Mar 2013 02:44:14 +0000 (18:44 -0800)]
Simplify and speed up thumbnail creation
Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
John Hoford [Tue, 5 Mar 2013 02:40:29 +0000 (18:40 -0800)]
am
fc7d4651: fixed vignetnette refresh during pan/zoom
* commit '
fc7d46515db7a3a50f7416c2462030609391cf95':
fixed vignetnette refresh during pan/zoom
John Hoford [Tue, 5 Mar 2013 02:33:55 +0000 (18:33 -0800)]
fixed vignetnette refresh during pan/zoom
Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
John Hoford [Tue, 5 Mar 2013 02:11:14 +0000 (18:11 -0800)]
am
5300e0c5: fix tiny planet shown after rotation
* commit '
5300e0c54110d67f85fdb2ee9c90be58f50ca4ac':
fix tiny planet shown after rotation
John Hoford [Tue, 5 Mar 2013 01:50:58 +0000 (17:50 -0800)]
fix tiny planet shown after rotation
Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
nicolasroard [Tue, 5 Mar 2013 01:51:03 +0000 (17:51 -0800)]
am
cdea1074: Improves state/history panel behaviour
* commit '
cdea10749cbdb6bab8f49f1b5b562b6e89781981':
Improves state/history panel behaviour
nicolasroard [Tue, 5 Mar 2013 00:42:53 +0000 (16:42 -0800)]
Improves state/history panel behaviour
Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
George Mount [Tue, 5 Mar 2013 00:14:35 +0000 (16:14 -0800)]
am
9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce
* commit '
9c223cf1072172845c9118fac028371b5a57919a':
Fix build break.
nicolasroard [Tue, 5 Mar 2013 00:11:24 +0000 (16:11 -0800)]
am
c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce
* commit '
c882c3fec7409a40d4b4ff401fcfa81be7684424':
UI cleanup
George Mount [Tue, 5 Mar 2013 00:11:03 +0000 (00:11 +0000)]
Merge "Fix build break." into gb-ub-photos-bryce
nicolasroard [Tue, 5 Mar 2013 00:09:29 +0000 (00:09 +0000)]
Merge "UI cleanup" into gb-ub-photos-bryce
George Mount [Tue, 5 Mar 2013 00:08:30 +0000 (16:08 -0800)]
Fix build break.
Change-Id: If19356395fe005a98036888cd9a688c4d36720ea
nicolasroard [Tue, 5 Mar 2013 00:01:24 +0000 (16:01 -0800)]
UI cleanup
Change-Id: Iaf138455651511e610b640a716820bd846284948
George Mount [Mon, 4 Mar 2013 23:49:05 +0000 (15:49 -0800)]
am
8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
* commit '
8438e10230fe1ce102e5c29f8eac6c96e4eec900':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
George Mount [Mon, 4 Mar 2013 23:47:29 +0000 (23:47 +0000)]
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
George Mount [Thu, 28 Feb 2013 18:52:59 +0000 (10:52 -0800)]
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
Bobby Georgescu [Mon, 4 Mar 2013 20:34:19 +0000 (12:34 -0800)]
am
4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
* commit '
4cf62cd1c8ee14a7e4b698f0be49ceba00f1b085':
Clean up comments
Bobby Georgescu [Mon, 4 Mar 2013 20:32:43 +0000 (20:32 +0000)]
Merge "Clean up comments" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 4 Mar 2013 20:29:42 +0000 (12:29 -0800)]
Clean up comments
Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
Baligh Uddin [Mon, 4 Mar 2013 20:27:03 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic524e207ef265824359c697e352dd4007af74f31
Auto-generated-cl: translation import
Baligh Uddin [Mon, 4 Mar 2013 20:26:38 +0000 (12:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13
Auto-generated-cl: translation import
Doris Liu [Mon, 4 Mar 2013 18:37:29 +0000 (10:37 -0800)]
am
fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
* commit '
fa7440b031c06a8c69e19ee0f6a3d44a0beb8e71':
Flatten view hierarchy and rotate views
Doris Liu [Mon, 4 Mar 2013 18:36:36 +0000 (18:36 +0000)]
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
Doris Liu [Tue, 26 Feb 2013 18:54:25 +0000 (10:54 -0800)]
Flatten view hierarchy and rotate views
TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)
TODO: Need to cancel capture animation in onConfigurationChanged()
Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
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 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
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
OSDN Git Service
