OSDN Git Service
Svetoslav Ganov [Thu, 29 Aug 2013 22:59:46 +0000 (22:59 +0000)]
Merge "Updated Gallery to avoid breaking the build - API change" into klp-dev
John Hoford [Thu, 29 Aug 2013 18:36:55 +0000 (11:36 -0700)]
am
834efce0: Merge "vignette fix & enhance to remove center focus" into gb-ub-photos-carlsbad
* commit '
834efce0da12e6a4664c3f3c63bfd2e77b6e750a':
vignette fix & enhance to remove center focus
John Hoford [Thu, 29 Aug 2013 18:34:00 +0000 (18:34 +0000)]
Merge "vignette fix & enhance to remove center focus" into gb-ub-photos-carlsbad
John Hoford [Wed, 28 Aug 2013 00:18:50 +0000 (17:18 -0700)]
vignette fix & enhance to remove center focus
Change-Id: Ide19925c5a9113518815d3aacc2204ef5ab9661d
nicolasroard [Thu, 29 Aug 2013 17:29:17 +0000 (10:29 -0700)]
am
960e83bd: Fix toast message when saving to Gallery
* commit '
960e83bd57b6236f4eb7fff98aeb7082a48f6b97':
Fix toast message when saving to Gallery
nicolasroard [Thu, 29 Aug 2013 16:20:12 +0000 (09:20 -0700)]
Fix toast message when saving to Gallery
Change-Id: I0c4850185cf19e6e239c7d2d7bf7167b4ebaee0d
Baligh Uddin [Thu, 29 Aug 2013 14:57:31 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 14:56:43 +0000 (14:56 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav Ganov [Thu, 29 Aug 2013 08:21:05 +0000 (01:21 -0700)]
Updated Gallery to avoid breaking the build - API change
Change-Id: Iaf80496629773dfffab4d1475a711384fa96e010
Baligh Uddin [Thu, 29 Aug 2013 07:23:29 +0000 (00:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I784e77c713615162b85c49dcc44cad38f1d1a819
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 07:20:53 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2d8bc2df3c7f89296b27547bcbb14f875ba4101f
Auto-generated-cl: translation import
nicolasroard [Thu, 29 Aug 2013 04:30:56 +0000 (21:30 -0700)]
nicolasroard [Wed, 28 Aug 2013 18:42:10 +0000 (11:42 -0700)]
Fix saving
Use the preview image to provide
a faster result in Gallery
Change-Id: Icfcdc2f423bf2e21428d9f7a5116a2b4c02eb79b
nicolasroard [Thu, 29 Aug 2013 00:30:21 +0000 (17:30 -0700)]
am
fc667540: Merge "Fix rotation anims on slow device (svelte)" into gb-ub-photos-carlsbad
* commit '
fc667540266a05d3f207bff009bc2c29eed37f5a':
Fix rotation anims on slow device (svelte)
nicolasroard [Thu, 29 Aug 2013 00:29:05 +0000 (00:29 +0000)]
Merge "Fix rotation anims on slow device (svelte)" into gb-ub-photos-carlsbad
nicolasroard [Thu, 29 Aug 2013 00:21:52 +0000 (17:21 -0700)]
Fix rotation anims on slow device (svelte)
Change-Id: If9050f7a17d9e3964d6bf35d649567c222f7fefe
ztenghui [Wed, 28 Aug 2013 22:35:35 +0000 (15:35 -0700)]
am
87bb6572: Merge "Fix ISE in Gallery related to muxer." into gb-ub-photos-carlsbad
* commit '
87bb65723a286c6e3833a5e8719752b51df2d416':
Fix ISE in Gallery related to muxer.
ztenghui [Wed, 28 Aug 2013 22:03:47 +0000 (22:03 +0000)]
Merge "Fix ISE in Gallery related to muxer." into gb-ub-photos-carlsbad
ztenghui [Wed, 28 Aug 2013 21:33:25 +0000 (14:33 -0700)]
Fix ISE in Gallery related to muxer.
bug:
10512258
Change-Id: I45f579a3b0b16e8378c1e5937da98a0f45de6d6c
nicolasroard [Wed, 28 Aug 2013 21:13:13 +0000 (14:13 -0700)]
am
80b216d5: Fix empty screen on Svelte
* commit '
80b216d5c8e17e0358cf1508a1e177ccada8383f':
Fix empty screen on Svelte
nicolasroard [Wed, 28 Aug 2013 21:00:06 +0000 (14:00 -0700)]
Fix empty screen on Svelte
bug:
10526507
Change-Id: I2506ae03a32e01ea62a25efa06acf1602147e78a
nicolasroard [Wed, 28 Aug 2013 18:49:29 +0000 (11:49 -0700)]
am
a7415dd9: Fix crash for svelte
* commit '
a7415dd97d9da190e8c23541dcd38f7f670573f6':
Fix crash for svelte
nicolasroard [Wed, 28 Aug 2013 18:42:40 +0000 (11:42 -0700)]
Fix crash for svelte
bug:
10526507
Change-Id: Ifc22bee4af446b09449ee64d137b93573f47025a
Baligh Uddin [Wed, 28 Aug 2013 02:38:04 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav Ganov [Wed, 28 Aug 2013 02:10:59 +0000 (19:10 -0700)]
am
e40690d7: Updated printing in Gallery due to API changes.
* commit '
e40690d73eb611f3f461f51a2841e73bcbd01f79':
Updated printing in Gallery due to API changes.
Svetoslav Ganov [Wed, 28 Aug 2013 02:05:52 +0000 (19:05 -0700)]
am
4d34f390: Cherry-pick of KLP CL (printing support)
* commit '
4d34f390561e002fddfa88f2a1273e16c8a90f00':
Cherry-pick of KLP CL (printing support)
Svetoslav Ganov [Tue, 27 Aug 2013 07:41:11 +0000 (00:41 -0700)]
Updated printing in Gallery due to API changes.
1. Now there is two fitting modes: scale to fill and scale to fit.
Updated the Gallery print code to support them both.
2. Now we have APIs for specifying which constraints in the print
attributes have been satisfied by the app so the pritner does
not satisfy them again, e.g. if the app rotated the content then
the printer should not do it.
Change-Id: I78b2925965068bd528fe6ec739bfd1e93084dd24
Svetoslav Ganov [Wed, 28 Aug 2013 01:20:42 +0000 (18:20 -0700)]
Cherry-pick of KLP CL
(printing support)
Fixing the build
Change-Id: I48eb47c071b2060dfea430cee968bf99225a8bb1
nicolasroard [Wed, 28 Aug 2013 01:23:21 +0000 (18:23 -0700)]
am
655afcf4: Fix param border
* commit '
655afcf4a88cf9dcdbab708212df1dec0a4c05d6':
Fix param border
Svetoslav Ganov [Wed, 28 Aug 2013 01:20:42 +0000 (18:20 -0700)]
Fixing the build
Change-Id: I48eb47c071b2060dfea430cee968bf99225a8bb1
nicolasroard [Wed, 28 Aug 2013 01:01:16 +0000 (18:01 -0700)]
Fix param border
needed to replace bitmap borders
bug:
9470514
Change-Id: I69f6324246ee8c9491ec430c5e20d87574302fcf
nicolasroard [Tue, 27 Aug 2013 16:49:28 +0000 (09:49 -0700)]
am
8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad
* commit '
8141e2414467458c6e98b40845fc22a9cdcfffb0':
Improves UI / size
nicolasroard [Tue, 27 Aug 2013 16:48:08 +0000 (16:48 +0000)]
Merge "Improves UI / size" into gb-ub-photos-carlsbad
John Hoford [Tue, 27 Aug 2013 16:04:16 +0000 (09:04 -0700)]
am
61c634ab: fix selection bug
* commit '
61c634ab70a10cbd68482ad03caa4470e9e9ecc5':
fix selection bug
nicolasroard [Fri, 23 Aug 2013 07:10:01 +0000 (00:10 -0700)]
Improves UI / size
- improves overdraw
- filter change anim
- better borders
- remove unused images
bug:
9470514
bug:
8658176
Change-Id: I764879be415acbfba5a36f239d1905ec54e2d3cb
John Hoford [Tue, 27 Aug 2013 01:02:28 +0000 (18:02 -0700)]
fix selection bug
bug:
4174707
Change-Id: Ia1a465e9f27d920d53545cba4c96dd3eab92e374
John Hoford [Mon, 26 Aug 2013 22:14:56 +0000 (15:14 -0700)]
am
0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad
* commit '
0594bd40959aaa55ec4f4204fbe3d12240f51480':
fix menu indicator inconsistency
John Hoford [Mon, 26 Aug 2013 22:14:55 +0000 (15:14 -0700)]
am
3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad
* commit '
3e6ca1692d499fce6842c00428368598b68b86cb':
Prevent slide show request with only on slide
John Hoford [Mon, 26 Aug 2013 22:12:55 +0000 (22:12 +0000)]
Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad
John Hoford [Mon, 26 Aug 2013 22:12:44 +0000 (22:12 +0000)]
Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 26 Aug 2013 21:56:41 +0000 (14:56 -0700)]
am
fa2b9222: Make parsing integers for details dialog more robust.
* commit '
fa2b9222725e96fdb584aca1b1213b0bda8af110':
Make parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 21:41:46 +0000 (14:41 -0700)]
Make parsing integers for details dialog more robust.
Bug:
7141309
Also make sure "orientation" is localized.
Change-Id: Ib950eca6becd2eed21bebfbd48e11a182b76e45a
John Hoford [Mon, 26 Aug 2013 21:39:10 +0000 (14:39 -0700)]
fix menu indicator inconsistency
bug:
10492779
Change-Id: I5746bb2e8066ec985423a9d972d44593653d3c31
Baligh Uddin [Mon, 26 Aug 2013 21:38:09 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3f972183769b76d8bad91b4224d5e9c0976b7b9
Auto-generated-cl: translation import
John Hoford [Fri, 23 Aug 2013 21:29:46 +0000 (14:29 -0700)]
Prevent slide show request with only on slide
bug:
8794694
Change-Id: Id3354733c7f35d9303b01f07ddf30f5555b07ddd
Sascha Haeberling [Fri, 23 Aug 2013 21:49:27 +0000 (14:49 -0700)]
am
dc514bb1: Add .gitignore to Gallery2
* commit '
dc514bb1f6ad5927d76c5f5a52742428cb0846fa':
Add .gitignore to Gallery2
Sascha Haeberling [Fri, 23 Aug 2013 20:48:00 +0000 (13:48 -0700)]
Add .gitignore to Gallery2
Change-Id: I071eb063f3cb26ee42134462958f49342ec54cd9
Sascha Haeberling [Fri, 23 Aug 2013 20:43:06 +0000 (13:43 -0700)]
am
5996f435: I18N the Gallery\'s Details dialog.
* commit '
5996f43546b629a01166904943eda1f788078634':
I18N the Gallery's Details dialog.
Sascha Haeberling [Fri, 23 Aug 2013 20:29:42 +0000 (13:29 -0700)]
I18N the Gallery's Details dialog.
Bug:
7141309
Change-Id: I9e658ea3972713fa39e76894f8ae7d8e3d5cdf2c
Baligh Uddin [Fri, 23 Aug 2013 19:03:13 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 23 Aug 2013 17:23:37 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1490d87985246e268fc93a7882b37779b13fb215
Auto-generated-cl: translation import
Baligh Uddin [Fri, 23 Aug 2013 17:22:54 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dfaf9b67259cd23ce93a96cf07d6bb11d763086
Auto-generated-cl: translation import
John Hoford [Thu, 22 Aug 2013 23:07:33 +0000 (16:07 -0700)]
am
49798939: border UI editor
* commit '
49798939f1bc58eaf5842bbc8bc5424284ab7930':
border UI editor
Mangesh Ghiware [Thu, 22 Aug 2013 23:07:30 +0000 (16:07 -0700)]
am
73d0f429: Add label to CameraLauncher activity-alias.
* commit '
73d0f42972c7c49a2589f2184f67e5a887007e7e':
Add label to CameraLauncher activity-alias.
ztenghui [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]
am
eb295038: Fix the Google Drive issue
* commit '
eb2950384846a3797e13b04765f65df70d80982e':
Fix the Google Drive issue
John Hoford [Thu, 22 Aug 2013 23:07:23 +0000 (16:07 -0700)]
am
d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad
* commit '
d74271e58c33ac178d935cca6843d41de95e7fcf':
fix gif issue
John Hoford [Thu, 22 Aug 2013 21:38:19 +0000 (14:38 -0700)]
border UI editor
bug:
9470514
Change-Id: I4d5cd91775c9b8742f847fd9a955f6f28e66cd38
Mangesh Ghiware [Thu, 22 Aug 2013 01:18:03 +0000 (18:18 -0700)]
Add label to CameraLauncher activity-alias.
Bug:
10430717
Change-Id: I37f9e63483211ecfe11e4790361c051d377aef55
Baligh Uddin [Wed, 21 Aug 2013 23:52:43 +0000 (16:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I563ea59646023964a852e4fd8700239dc55b4073
Auto-generated-cl: translation import
ztenghui [Tue, 20 Aug 2013 23:38:04 +0000 (16:38 -0700)]
Fix the Google Drive issue
Here a local cache file will be downloaded and sent over to Gallery / Editor.
So we need to handle that well.
bug:
9356969
Change-Id: Ic09a2f5de2c9c55ca2ed21c77ddf7517f5939bfb
John Hoford [Tue, 20 Aug 2013 23:18:39 +0000 (23:18 +0000)]
Merge "fix gif issue" into gb-ub-photos-carlsbad
nicolasroard [Tue, 20 Aug 2013 22:58:58 +0000 (15:58 -0700)]
am
82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
* commit '
82f3ed2cec637ce516cf0270dde8f910fe9f78e5':
Revert to loading 8888 bitmaps
nicolasroard [Tue, 20 Aug 2013 22:58:10 +0000 (22:58 +0000)]
Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
John Hoford [Tue, 20 Aug 2013 22:37:37 +0000 (15:37 -0700)]
fix gif issue
bug:
7877538
Change-Id: I807198ca6d0d0db33fdbcc8b6bd1bf6dab9ba86a
nicolasroard [Tue, 20 Aug 2013 22:46:41 +0000 (15:46 -0700)]
Revert to loading 8888 bitmaps
bug:
10305385
Change-Id: I3c8ff6e848e79631f9b9e887244495b094e730a3
Mangesh Ghiware [Tue, 20 Aug 2013 22:31:47 +0000 (15:31 -0700)]
am
675948f8: Fix discrepancy in RemoteViewsFactory impl.
* commit '
675948f8f6337fe2873067a74db789d46a41ec36':
Fix discrepancy in RemoteViewsFactory impl.
Mangesh Ghiware [Tue, 20 Aug 2013 22:09:55 +0000 (15:09 -0700)]
Fix discrepancy in RemoteViewsFactory impl.
Bug:
7633198
Change-Id: I96db437ac4452d001a2c380ecdbedee40f4c2468
John Hoford [Tue, 20 Aug 2013 19:25:03 +0000 (12:25 -0700)]
am
708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad
* commit '
708569b460235ed28248de1aefdd635197d3fb28':
fix draw issues on tablet
John Hoford [Tue, 20 Aug 2013 19:22:44 +0000 (19:22 +0000)]
Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad
John Hoford [Tue, 20 Aug 2013 16:21:02 +0000 (09:21 -0700)]
fix draw issues on tablet
bug:
8579593
Change-Id: I75c9daa4d1048b02943ab33362dd8674faa39149
Sascha Haeberling [Tue, 20 Aug 2013 17:13:12 +0000 (10:13 -0700)]
am
7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad
* commit '
7a4412d19a355e78f472eba2f3a8d90234b69ee9':
Prevent NPE.
Sascha Haeberling [Tue, 20 Aug 2013 17:10:17 +0000 (17:10 +0000)]
Merge "Prevent NPE." into gb-ub-photos-carlsbad
George Mount [Tue, 20 Aug 2013 16:35:52 +0000 (09:35 -0700)]
am
2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad
* commit '
2f3a8e1c95e1a689086e585a9db2482dc66ea39b':
Allow for extension for pano-based navigation.
George Mount [Tue, 20 Aug 2013 16:31:01 +0000 (16:31 +0000)]
Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 20 Aug 2013 01:52:13 +0000 (18:52 -0700)]
Prevent NPE.
Bug:
10388167
Change-Id: I9293d29e6a1a4f052513409b80fe7d4aaac87529
nicolasroard [Tue, 20 Aug 2013 00:29:06 +0000 (17:29 -0700)]
nicolasroard [Tue, 20 Aug 2013 00:26:38 +0000 (17:26 -0700)]
Fix crash
bug:
10390767
Change-Id: Ie300762048daffb80dee79e75a0993cae76bb839
nicolasroard [Tue, 20 Aug 2013 00:26:00 +0000 (17:26 -0700)]
am
f8b8c708: Merge "Add printing to Gallery" into gb-ub-photos-carlsbad
* commit '
f8b8c708f30aeb632ef7064cc5be7c65669f1762':
Add printing to Gallery
nicolasroard [Tue, 20 Aug 2013 00:24:05 +0000 (00:24 +0000)]
Merge "Add printing to Gallery" into gb-ub-photos-carlsbad
nicolasroard [Mon, 19 Aug 2013 23:21:12 +0000 (16:21 -0700)]
Add printing to Gallery
Change-Id: I26aad645759f95813003badffbd03845e0df37bb
ztenghui [Tue, 20 Aug 2013 00:12:52 +0000 (17:12 -0700)]
am
50a1674e: Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad
* commit '
50a1674e3f34b6daccbb1634bd10793ee5985aaa':
Check whether save button should be enabled when time bar updates
ztenghui [Tue, 20 Aug 2013 00:09:09 +0000 (00:09 +0000)]
Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad
ztenghui [Mon, 19 Aug 2013 23:56:45 +0000 (16:56 -0700)]
Check whether save button should be enabled when time bar updates
bug:
10260216
Change-Id: Ic9714d5b5415ddc6f181bf2caf9efedf3fd871ac
nicolasroard [Mon, 19 Aug 2013 22:49:31 +0000 (15:49 -0700)]
am
f29cc45a: Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad
* commit '
f29cc45abb96754e954d56673e3a959d8bb9787e':
Remove simple edit menu item
nicolasroard [Mon, 19 Aug 2013 22:46:57 +0000 (22:46 +0000)]
Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad
nicolasroard [Mon, 19 Aug 2013 22:45:06 +0000 (15:45 -0700)]
Remove simple edit menu item
bug:
10362505
Change-Id: I730457c4e0d35b48be0a71e14fac60c5194c5d1f
George Mount [Mon, 19 Aug 2013 21:36:06 +0000 (14:36 -0700)]
Allow for extension for pano-based navigation.
Bug
9265629
Change-Id: Ief895285991b2200a423636580a68f1d21a31cdf
Mangesh Ghiware [Mon, 19 Aug 2013 21:34:34 +0000 (14:34 -0700)]
am
571bacbd: Add flags to create new task and clear top during trampoline.
* commit '
571bacbd331dd9fdb57bed154ce7dbb2abfffb8b':
Add flags to create new task and clear top during trampoline.
Mangesh Ghiware [Mon, 19 Aug 2013 21:10:04 +0000 (14:10 -0700)]
Add flags to create new task and clear top during trampoline.
Bug:
10366519
Change-Id: I549c8256d18ea37ac868035e54a56e5f68840b24
Baligh Uddin [Mon, 19 Aug 2013 20:04:48 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 19 Aug 2013 20:04:28 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 19 Aug 2013 19:47:14 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic35ea9733809c03d75b9b42e5d472e37e3d5628a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 19 Aug 2013 19:45:11 +0000 (12:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0aafd377a259a343409fb3a734ade98e65eb104b
Auto-generated-cl: translation import
Mangesh Ghiware [Mon, 19 Aug 2013 18:57:44 +0000 (11:57 -0700)]
am
55705d5a: Fix RTE in PhotoPage
* commit '
55705d5a9baadfe0e19170b2075e4a273033c260':
Fix RTE in PhotoPage
Mangesh Ghiware [Mon, 19 Aug 2013 18:52:32 +0000 (11:52 -0700)]
Fix RTE in PhotoPage
Bug:
10341736
Change-Id: Iff005411cff8f8923c465da99804c14a3783bcf9
ztenghui [Mon, 19 Aug 2013 16:52:38 +0000 (09:52 -0700)]
am
77505296: Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad
* commit '
77505296d5943519b0e449edb364a6ee203496b7':
Add the intent filter for video trimming.
ztenghui [Mon, 19 Aug 2013 16:50:46 +0000 (16:50 +0000)]
Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad
John Hoford [Mon, 19 Aug 2013 16:25:29 +0000 (09:25 -0700)]
am
a4f38c0f: fix first draw bug
* commit '
a4f38c0f8f70c998391780b672eea5d5e49277c7':
fix first draw bug
John Hoford [Thu, 15 Aug 2013 23:06:26 +0000 (16:06 -0700)]
fix first draw bug
bug:
8579593
Change-Id: Ifb4727fcf23b0696db14427f00aa2a911b4a367b
ztenghui [Fri, 16 Aug 2013 23:24:55 +0000 (16:24 -0700)]
Add the intent filter for video trimming.
bug:
10313015
Change-Id: I3e2ef58e065d0cdabfab6943b11b6fddc0b112eb