OSDN Git Service
nicolasroard [Wed, 14 Aug 2013 18:20:19 +0000 (11:20 -0700)]
am
9737f3a1: Fix swiping in categories in landscape mode
* commit '
9737f3a18a8c302160e213afa30a4db710e41fb6':
Fix swiping in categories in landscape mode
nicolasroard [Wed, 14 Aug 2013 18:14:47 +0000 (11:14 -0700)]
Fix swiping in categories in landscape mode
Change-Id: I58ecb212792e3e8432791ee29f8a0ef26a819362
nicolasroard [Wed, 14 Aug 2013 18:08:59 +0000 (11:08 -0700)]
am
134aebe4: Fix for add button in version panel
* commit '
134aebe4f265767ecb18f375316c8090dfe5a51d':
Fix for add button in version panel
nicolasroard [Wed, 14 Aug 2013 17:53:11 +0000 (10:53 -0700)]
Fix for add button in version panel
Change-Id: I7c1b3869214264d8be3c271e54d8860290bde89f
nicolasroard [Wed, 14 Aug 2013 17:53:51 +0000 (10:53 -0700)]
am
1603c965: Merge "Fix add button size and placement in looks" into gb-ub-photos-carlsbad
* commit '
1603c9657a6355ce2c720463483c3a744c27005e':
Fix add button size and placement in looks
nicolasroard [Wed, 14 Aug 2013 17:49:21 +0000 (17:49 +0000)]
Merge "Fix add button size and placement in looks" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:48:21 +0000 (10:48 -0700)]
Fix add button size and placement in looks
Change-Id: I5c7fd0f460de222e76228ea3da9703d4b579aeca
nicolasroard [Wed, 14 Aug 2013 17:37:42 +0000 (10:37 -0700)]
am
cd29fd9e: Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad
* commit '
cd29fd9e74482c51d7db109e5b1d0cf60f7fe3b5':
Fix refresh of looks panel
Mangesh Ghiware [Wed, 14 Aug 2013 17:37:41 +0000 (10:37 -0700)]
am
2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad
* commit '
2d16b22570ae4ad9c2dc4c3230cc9894eb5bf1a2':
Add a trampoline activity to launch new Camera
nicolasroard [Wed, 14 Aug 2013 17:35:21 +0000 (17:35 +0000)]
Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad
Mangesh Ghiware [Wed, 14 Aug 2013 17:34:31 +0000 (17:34 +0000)]
Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:34:08 +0000 (10:34 -0700)]
Fix refresh of looks panel
Change-Id: Ib38b3aefc8ca9891251458b03587ffa5e41bfbe6
John Hoford [Wed, 14 Aug 2013 17:20:26 +0000 (10:20 -0700)]
am
99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad
* commit '
99c1eeb3929c4faa15e3347a83ce9c4ae6551f0b':
fix tablet ui
John Hoford [Wed, 14 Aug 2013 17:17:25 +0000 (17:17 +0000)]
Merge "fix tablet ui" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:17:15 +0000 (10:17 -0700)]
am
a27067c7: Update strings resources for export dialog
* commit '
a27067c7ec4e08805f7cc1936ae7f5783724dfad':
Update strings resources for export dialog
John Hoford [Wed, 14 Aug 2013 16:16:15 +0000 (09:16 -0700)]
fix tablet ui
Change-Id: I38aba41e92fdd555391b8ae3ebd65b473bd48366
nicolasroard [Wed, 14 Aug 2013 17:13:09 +0000 (10:13 -0700)]
Update strings resources for export dialog
Change-Id: Ia1ebe11ba37c7acc7f900eab4a9552ee495c8c7c
nicolasroard [Wed, 14 Aug 2013 17:08:07 +0000 (10:08 -0700)]
am
0a24e521: Clean up user preset dialog
* commit '
0a24e52185c4e88dd52b8e072cf7cd1d04f74b0a':
Clean up user preset dialog
nicolasroard [Wed, 14 Aug 2013 17:04:37 +0000 (10:04 -0700)]
Clean up user preset dialog
Change-Id: Idefafe3a877e8a0cf25ca955f689818e193fde72
Mangesh Ghiware [Wed, 14 Aug 2013 15:44:07 +0000 (08:44 -0700)]
Add a trampoline activity to launch new Camera
This preserves shortcuts, if any, to the Camera activity in the old
package name.
Bug:
10312966
Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2
nicolasroard [Wed, 14 Aug 2013 16:17:37 +0000 (09:17 -0700)]
am
2e1bc2e3: Fix UI Tablet for saturation panel
* commit '
2e1bc2e37f285bfaf302a0533a372d4373474d9c':
Fix UI Tablet for saturation panel
nicolasroard [Wed, 14 Aug 2013 16:02:59 +0000 (09:02 -0700)]
Fix UI Tablet for saturation panel
Change-Id: Id2fffcefc8af3cf8f6ffe2c84447c3f54070f160
nicolasroard [Wed, 14 Aug 2013 02:47:09 +0000 (19:47 -0700)]
am
55a0279e: Fix for user presets remove menu item add spacer
* commit '
55a0279ee420c649606edd7815403d3ca1820c07':
Fix for user presets remove menu item add spacer
nicolasroard [Wed, 14 Aug 2013 00:36:00 +0000 (17:36 -0700)]
Fix for user presets
remove menu item
add spacer
Change-Id: I8a83aed6da00c6692f2204fefd17dfff3a599b8d
John Hoford [Wed, 14 Aug 2013 02:24:51 +0000 (19:24 -0700)]
am
665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad
* commit '
665e258238b1e1e0a821530416f2f709e61cb155':
add solid round mode to draw
John Hoford [Wed, 14 Aug 2013 02:22:24 +0000 (02:22 +0000)]
Merge "add solid round mode to draw" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 02:06:35 +0000 (19:06 -0700)]
add solid round mode to draw
Change-Id: I60249711602fa3aaf2bce0b5035e75f746caa5eb
nicolasroard [Wed, 14 Aug 2013 00:50:25 +0000 (17:50 -0700)]
am
fd55ffec: Fix for translation strings
* commit '
fd55ffec5dbec1d37e4e8b32240bd51c7e85275b':
Fix for translation strings
nicolasroard [Wed, 14 Aug 2013 00:36:00 +0000 (17:36 -0700)]
Fix for translation strings
Change-Id: I2c89a377a8a439dd7b77d09a1362c4d6e68752df
nicolasroard [Tue, 13 Aug 2013 23:47:59 +0000 (16:47 -0700)]
am
9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
* commit '
9977d45fcae932581c1788cf3fa96a3f4040a8dc':
Fix tablet UI layout
nicolasroard [Tue, 13 Aug 2013 23:45:17 +0000 (23:45 +0000)]
Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 23:40:51 +0000 (16:40 -0700)]
am
dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad
* commit '
dbc7f5878da3038fbe96609ad21b5324e9645367':
fix draw size and style display
John Hoford [Tue, 13 Aug 2013 23:38:08 +0000 (23:38 +0000)]
Merge "fix draw size and style display" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:29:11 +0000 (16:29 -0700)]
Fix tablet UI layout
Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f
John Hoford [Tue, 13 Aug 2013 21:00:58 +0000 (14:00 -0700)]
fix draw size and style display
Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a
Doris Liu [Tue, 13 Aug 2013 21:00:21 +0000 (14:00 -0700)]
am
389e8c88: Remove old video camera icon and label from Gallery
* commit '
389e8c887489db88e9324c17e8d29363198e7221':
Remove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 19:32:19 +0000 (12:32 -0700)]
Remove old video camera icon and label from Gallery
Bug:
10296343
Change-Id: I677f5b97919ea235ac9148ca92eee2af13bc462e
nicolasroard [Tue, 13 Aug 2013 17:39:56 +0000 (10:39 -0700)]
am
c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
* commit '
c41fdd6f37df5dbd7f44b1c79cdd6d025937209d':
Fix icons rendering to be consistent
nicolasroard [Tue, 13 Aug 2013 17:38:12 +0000 (17:38 +0000)]
Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 17:30:06 +0000 (10:30 -0700)]
Fix icons rendering to be consistent
Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e
John Hoford [Tue, 13 Aug 2013 16:12:33 +0000 (09:12 -0700)]
am
0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad
* commit '
0bdafb193e49e2b89eeb9f4c197bbc60635c6419':
add circle brush
John Hoford [Tue, 13 Aug 2013 16:09:29 +0000 (16:09 +0000)]
Merge "add circle brush" into gb-ub-photos-carlsbad
Stephen Hines [Tue, 13 Aug 2013 04:49:45 +0000 (21:49 -0700)]
am
1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
* commit '
1b02bf1271af9d0f90e07ef2dd57fffd246f3b37':
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
Stephen Hines [Tue, 13 Aug 2013 03:50:55 +0000 (20:50 -0700)]
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
Change-Id: I3f063cc9688fce7d22805d4dda512d486d0c1218
Ying Wang [Tue, 13 Aug 2013 03:51:28 +0000 (20:51 -0700)]
Remove the unused libcutils.
Change-Id: I91b3143f0959e194b71c66ef79f37c35f7a29499
Sascha Haeberling [Tue, 13 Aug 2013 02:19:32 +0000 (19:19 -0700)]
Remove all the tests from Gallery2 until we have them sorted out.
Change-Id: I72e3f0ce477f0b0d5bca1f53feba21b6aa77e315
John Hoford [Tue, 13 Aug 2013 00:25:02 +0000 (17:25 -0700)]
add circle brush
Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d
Qiwen Zhao [Tue, 13 Aug 2013 00:16:57 +0000 (17:16 -0700)]
Merge remote-tracking branch 'origin/klp-dev' into klp-dev
Bart Sears [Mon, 12 Aug 2013 23:51:26 +0000 (16:51 -0700)]
am
77306b68: am
4772792d: Bump up the version number to 1.1.40010
* commit '
77306b68f36f73ff1820efce55bbf901d2636790':
nicolasroard [Mon, 12 Aug 2013 23:51:25 +0000 (16:51 -0700)]
Michael Kolb [Mon, 12 Aug 2013 23:51:23 +0000 (16:51 -0700)]
am
3019162b: am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
3019162b991edf67122885988d6cdf304a4c2dc9':
Michael Kolb [Mon, 12 Aug 2013 23:51:21 +0000 (16:51 -0700)]
am
0553910d: am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
0553910ded3c386c151c29a4f6737b74d75e0284':
Doris Liu [Mon, 12 Aug 2013 23:51:19 +0000 (16:51 -0700)]
am
edddcab2: am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
edddcab24d1443fb1a4deccfd2d8ddff5e0dcd8d':
Ruben Brunk [Mon, 12 Aug 2013 23:51:17 +0000 (16:51 -0700)]
am
f007ac89: am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
f007ac8938b401d2d780677a3f6da593d3ddd923':
Bobby Georgescu [Mon, 12 Aug 2013 23:51:16 +0000 (16:51 -0700)]
am
e66f4aba: am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
e66f4abad0301965351a9c8d02f0d23449b03754':
Angus Kong [Mon, 12 Aug 2013 23:51:14 +0000 (16:51 -0700)]
am
115e8693: am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
115e86934c8e5b0be4b24d9e9ad9278425940838':
George Mount [Mon, 12 Aug 2013 23:51:12 +0000 (16:51 -0700)]
am
0e4ba348: am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
0e4ba348606517ce2bfa98e8e9b684f60bf5c36b':
Ruben Brunk [Mon, 12 Aug 2013 23:51:10 +0000 (16:51 -0700)]
am
207b436c: am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
207b436c9dd7e09cb8f4fe7709140ffd8967a682':
Doris Liu [Mon, 12 Aug 2013 23:51:08 +0000 (16:51 -0700)]
am
5875c082: am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
5875c082565cbaa84a6fe1ad7ccbd7ef54a27eec':
Ruben Brunk [Mon, 12 Aug 2013 23:51:07 +0000 (16:51 -0700)]
Baligh Uddin [Mon, 12 Aug 2013 23:51:05 +0000 (16:51 -0700)]
am
ee3b727a: (-s ours) am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ee3b727ab8aaabded1c9a34a0539b3fe11a57f3a':
Baligh Uddin [Mon, 12 Aug 2013 23:51:03 +0000 (16:51 -0700)]
am
a5d4147f: (-s ours) am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a5d4147fbe63e6383df40da7c532cf5f02aab1d6':
John Hoford [Mon, 12 Aug 2013 22:34:52 +0000 (22:34 +0000)]
Merge "fix serialization on draw" into gb-ub-photos-carlsbad
John Hoford [Mon, 12 Aug 2013 22:19:20 +0000 (15:19 -0700)]
fix serialization on draw
Change-Id: Id99acdb9ac6d65e0c8239ef6737f6e6a7fe5c04b
nicolasroard [Mon, 12 Aug 2013 21:26:50 +0000 (14:26 -0700)]
Remove red eye tool
Change-Id: I3ec169bc6b0948d3218a2e3457475ba57ea2f4c7
nicolasroard [Mon, 12 Aug 2013 21:04:11 +0000 (14:04 -0700)]
Makes rotate and mirror direct operations
Change-Id: I10128c211ec6e269603e3b3f3cbafadbeabdaac5
nicolasroard [Mon, 12 Aug 2013 16:25:44 +0000 (09:25 -0700)]
Fix for wrong bitmap picked after geometry change
Change-Id: I48d7892c761bb1d8a83553786367aa11d1841fb5
nicolasroard [Sun, 11 Aug 2013 20:55:29 +0000 (13:55 -0700)]
Fix export dialog (size export)
Change-Id: Ifa4bb6a990622bfc00f6b4fe4998417fec32e650
nicolasroard [Sun, 11 Aug 2013 00:33:59 +0000 (17:33 -0700)]
Fix crash when we can't load the exif
Change-Id: I014518f727128676e9189d19c9e1073daeb2ee4b
nicolasroard [Sun, 11 Aug 2013 00:23:38 +0000 (17:23 -0700)]
Fix crash and missing content
Change-Id: I477599491921fc4319834f32d5806cdc165679e6
John Hoford [Mon, 5 Aug 2013 22:07:14 +0000 (15:07 -0700)]
fix draw part 2
Change-Id: Ib508cf5fd75403e5a36168255bf3613526436428
John Hoford [Sat, 10 Aug 2013 00:44:01 +0000 (00:44 +0000)]
Merge "fix draw" into gb-ub-photos-carlsbad
John Hoford [Mon, 5 Aug 2013 22:07:14 +0000 (15:07 -0700)]
fix draw
Change-Id: I535221edd992c1a8c659c398dba61158e0c1d87d
nicolasroard [Fri, 9 Aug 2013 20:56:35 +0000 (13:56 -0700)]
Fix histogram view
Change-Id: Ic0c3a1103f5fa1f0ef1e72ae92fecfcb343bad74
nicolasroard [Fri, 9 Aug 2013 20:48:26 +0000 (20:48 +0000)]
Merge "Add shadow" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 20:16:10 +0000 (13:16 -0700)]
Add shadow
Change-Id: Iba10c5d01bad8f0f49986150b2b4f6cf905be3cb
John Reck [Fri, 9 Aug 2013 16:50:06 +0000 (16:50 +0000)]
Merge "Sync latest TiledImageView" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 14:09:56 +0000 (14:09 +0000)]
Merge "Add version category Fix bugs when loading Add info panel" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 03:47:28 +0000 (20:47 -0700)]
Add version category
Fix bugs when loading
Add info panel
Change-Id: I28966f2419b902405bc60e9cc927b109777a6a2d
Sascha Haeberling [Thu, 8 Aug 2013 18:27:09 +0000 (11:27 -0700)]
Remove Camera from Gallery2.
Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
John Reck [Thu, 8 Aug 2013 21:16:24 +0000 (14:16 -0700)]
Sync latest TiledImageView
Change-Id: I57e040a05e0ae4c1886eda014f1e6bf750612a3e
ztenghui [Wed, 7 Aug 2013 23:33:32 +0000 (23:33 +0000)]
Merge "WAR the crash from re-editing missing online image" into gb-ub-photos-carlsbad
nicolasroard [Thu, 1 Aug 2013 23:22:30 +0000 (16:22 -0700)]
Fix full res zoom
Also add filters merging in the cache.
Change-Id: Ic34c918b732159f3703cd83d30de907fdbbcb451
George Mount [Wed, 7 Aug 2013 18:00:46 +0000 (18:00 +0000)]
Merge "Move PanoramaViewHelper out of LightCycleHelper" into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 18:00:14 +0000 (18:00 +0000)]
Merge "Remove MediaCache and MediaCacheUtils." into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 17:59:46 +0000 (17:59 +0000)]
Merge "Remove BitmapDecoder, which is now unused." into gb-ub-photos-carlsbad
George Mount [Tue, 6 Aug 2013 23:07:17 +0000 (16:07 -0700)]
Move PanoramaViewHelper out of LightCycleHelper
PanoramaViewHelper can be used outside of LightCycle panorama
picture creation.
Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f
Doris Liu [Wed, 7 Aug 2013 00:29:30 +0000 (17:29 -0700)]
Fix crash on camera startup
Change-Id: Ic4f91d32d5ee4a01c2c406d1592aa0705db413ea
George Mount [Tue, 6 Aug 2013 20:39:38 +0000 (13:39 -0700)]
Remove MediaCache and MediaCacheUtils.
Change-Id: Iebf4b10ecde56bc490a1b5a4add31a1cf766e9c9
George Mount [Tue, 6 Aug 2013 19:58:58 +0000 (12:58 -0700)]
Remove BitmapDecoder, which is now unused.
Change-Id: I01938fac23f212021bc9b7ebe649f40b7dae372a
Angus Kong [Tue, 6 Aug 2013 19:51:37 +0000 (19:51 +0000)]
Merge "Show PhotoSphere stitching progress." into gb-ub-photos-carlsbad
Angus Kong [Tue, 6 Aug 2013 19:40:20 +0000 (19:40 +0000)]
Merge "Show newly recorded video." into gb-ub-photos-carlsbad
Angus Kong [Wed, 31 Jul 2013 22:36:33 +0000 (15:36 -0700)]
Show newly recorded video.
bug:
10115177
Change-Id: I5f9687b358e43e2e98f7b24a03dc8a17cc772433
Doris Liu [Tue, 6 Aug 2013 18:15:55 +0000 (18:15 +0000)]
Merge "Implement capture animation" into gb-ub-photos-carlsbad
Angus Kong [Wed, 31 Jul 2013 21:38:22 +0000 (14:38 -0700)]
Show PhotoSphere stitching progress.
Change-Id: I35a835f3a9bc28d5f974e318ec3ed257ad8bea37
Doris Liu [Mon, 24 Jun 2013 18:30:24 +0000 (11:30 -0700)]
Implement capture animation
Also fix the thumb view by using real jpeg data rather than a preview frame
Bug:
10074619
Change-Id: Ie38884b30977c350b2ca0e0671bd9f5b10d3681e
Angus Kong [Mon, 5 Aug 2013 22:30:05 +0000 (15:30 -0700)]
Load the FilmStrip data in onCreate()
The loading should be done in onCreate() so it won't waste time loading the data
which has been loaded everytime the app is brought to the foreground.
bug:
10189998
Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
Jason Noguchi [Sat, 3 Aug 2013 00:17:06 +0000 (00:17 +0000)]
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
Jason Noguchi [Wed, 31 Jul 2013 21:16:31 +0000 (14:16 -0700)]
Clean up the test tags used by the continuous test service to determine which
tests to run on every dev build. Add SmallTest or MediumTest tags for unit
tests that are currently being skipped and remove LargeTest tags from long
running stress tests which are not necessary in this context.
Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
nicolasroard [Fri, 2 Aug 2013 18:35:32 +0000 (11:35 -0700)]
Fix display bug with highres
Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
OSDN Git Service
