OSDN Git Service
nicolasroard [Thu, 12 Sep 2013 16:08:47 +0000 (09:08 -0700)]
am
3f9e5504: Merge "Replace add preset icon" into gb-ub-photos-carlsbad
* commit '
3f9e550449ef2d48a81e21fc353dbeb887e07161':
Replace add preset icon
nicolasroard [Thu, 12 Sep 2013 16:08:46 +0000 (09:08 -0700)]
am
b08324d5: Merge "Add custom border text" into gb-ub-photos-carlsbad
* commit '
b08324d588baaebd01a8acd83428f3862c15e7f9':
Add custom border text
nicolasroard [Thu, 12 Sep 2013 16:08:44 +0000 (09:08 -0700)]
am
2d933002: Merge "Fix info panel" into gb-ub-photos-carlsbad
* commit '
2d9330020b929cc75bbdfd645d3dc9278ca78779':
Fix info panel
nicolasroard [Thu, 12 Sep 2013 01:53:14 +0000 (01:53 +0000)]
Merge "Replace add preset icon" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:52:53 +0000 (01:52 +0000)]
Merge "Add custom border text" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:52:36 +0000 (01:52 +0000)]
Merge "Fix info panel" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:49:12 +0000 (18:49 -0700)]
Replace add preset icon
bug:
10705772
Change-Id: I6796202cfff4c76c57f1b17646489a1a53d5b95c
nicolasroard [Thu, 12 Sep 2013 00:56:45 +0000 (17:56 -0700)]
Add custom border text
bug:
10705772
Change-Id: Idca8cb3179bf9ecc1b6eaef109f79077cf15ec3c
nicolasroard [Thu, 12 Sep 2013 00:46:38 +0000 (17:46 -0700)]
Fix info panel
bug:
10705772
Change-Id: I9481aec8baf1a7b1782be5cf47acbf3269768cee
Nicolas Roard [Wed, 11 Sep 2013 16:50:16 +0000 (09:50 -0700)]
am
f7630cbd: Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
* commit '
f7630cbd1786f88256e03c246a2931b3734ab82f':
Handle IllegalStateException when cursor contents are empty
Nicolas Roard [Wed, 11 Sep 2013 16:48:38 +0000 (16:48 +0000)]
Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
Amith Yamasani [Wed, 11 Sep 2013 00:25:52 +0000 (17:25 -0700)]
Handle IllegalStateException when cursor contents are empty
Bug:
10696306
Change-Id: If56b553e34574219de8e3990c9e256f698d08f04
John Hoford [Wed, 11 Sep 2013 00:41:14 +0000 (17:41 -0700)]
am
2975e608: Merge "fix startup crash" into gb-ub-photos-carlsbad
* commit '
2975e608d638a6d707b64a5b31fde3716f12ee9c':
fix startup crash
John Hoford [Wed, 11 Sep 2013 00:38:50 +0000 (00:38 +0000)]
Merge "fix startup crash" into gb-ub-photos-carlsbad
Mangesh Ghiware [Wed, 11 Sep 2013 00:21:05 +0000 (17:21 -0700)]
am
da713ad2: Make local copy of reference to bitmap and check for null
* commit '
da713ad257719520234fc071c3d11deea8125ed6':
Make local copy of reference to bitmap and check for null
Mangesh Ghiware [Tue, 10 Sep 2013 22:34:22 +0000 (15:34 -0700)]
Make local copy of reference to bitmap and check for null
Bug:
8694871
Change-Id: If9505a017a86fd6bc8c4a193e6da7167a2af1a27
John Hoford [Tue, 10 Sep 2013 23:59:23 +0000 (16:59 -0700)]
fix startup crash
bug:
10673620
Change-Id: If1a8aad0c2258702fe4fc7048b4e82eea302169c
Baligh Uddin [Tue, 10 Sep 2013 14:27:57 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Tue, 10 Sep 2013 03:29:40 +0000 (20:29 -0700)]
am
fddcb482: small ui fixes in draw
* commit '
fddcb482a89e6c30f74f0c8cf7d9d1e6e31a5789':
small ui fixes in draw
John Hoford [Tue, 10 Sep 2013 00:54:37 +0000 (17:54 -0700)]
small ui fixes in draw
Change-Id: I3d960de02d053cf7a70eeacf773dbe51da69f492
John Hoford [Mon, 9 Sep 2013 22:40:20 +0000 (15:40 -0700)]
am
3404ab27: Merge "fix export on saved images" into gb-ub-photos-carlsbad
* commit '
3404ab27a2107880e0c8e96b910de18a47b84b05':
fix export on saved images
John Hoford [Mon, 9 Sep 2013 22:38:10 +0000 (22:38 +0000)]
Merge "fix export on saved images" into gb-ub-photos-carlsbad
John Hoford [Mon, 9 Sep 2013 20:04:54 +0000 (13:04 -0700)]
fix export on saved images
bug:
9466453
Change-Id: I6280e6352d6c7f672692db514e46803df3f91b38
nicolasroard [Mon, 9 Sep 2013 21:13:48 +0000 (14:13 -0700)]
am
9346e7fd: Hide debug statement
* commit '
9346e7fdd448c5ddfc3e47c067618ca0ac9c72fa':
Hide debug statement
Baligh Uddin [Mon, 9 Sep 2013 21:10:34 +0000 (14:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic9b7aedf23b914046ee05dd26fb0b670cad65970
Auto-generated-cl: translation import
nicolasroard [Mon, 9 Sep 2013 21:03:45 +0000 (14:03 -0700)]
Hide debug statement
Change-Id: I978e84cdec3739efa7e5a7f6acf3b23625a5355b
nicolasroard [Mon, 9 Sep 2013 18:25:46 +0000 (11:25 -0700)]
am
16a8079b: Fix for anim stutter
* commit '
16a8079bfddf54ef2c110fba53dadac8512403b8':
Fix for anim stutter
nicolasroard [Mon, 9 Sep 2013 18:17:30 +0000 (11:17 -0700)]
Fix for anim stutter
Change-Id: Id1b3c9b18e65b4a817b15ee45d0f9dc514a4b700
Mangesh Ghiware [Mon, 9 Sep 2013 17:07:26 +0000 (10:07 -0700)]
am
f8faf052: Merge "Exclude trampoline activity from Recents" into gb-ub-photos-carlsbad
* commit '
f8faf0520598abc984bae6d6273c6ab0b9f475bd':
Exclude trampoline activity from Recents
Mangesh Ghiware [Mon, 9 Sep 2013 17:03:18 +0000 (17:03 +0000)]
Merge "Exclude trampoline activity from Recents" into gb-ub-photos-carlsbad
Mangesh Ghiware [Mon, 9 Sep 2013 16:42:09 +0000 (09:42 -0700)]
Exclude trampoline activity from Recents
Bug:
10653067
Change-Id: I79b4cb66886a63d19139cb9cb7272a754320b256
nicolasroard [Mon, 9 Sep 2013 15:57:05 +0000 (08:57 -0700)]
am
ec1e009a: Improves memory management
* commit '
ec1e009a7faea0478e361bc2d48d856ab48a0209':
Improves memory management
nicolasroard [Mon, 9 Sep 2013 06:14:57 +0000 (23:14 -0700)]
Improves memory management
Also adds some debugging tracking tools.
bug:
10112287
Change-Id: I3f9b3d173db99818e5c9ae9a62b0ec38cd2b341b
nicolasroard [Sat, 7 Sep 2013 01:00:42 +0000 (18:00 -0700)]
am
34cfdfcd: Fix information panel
* commit '
34cfdfcd1867fff67fffbbac7a8e942485f08ea1':
Fix information panel
nicolasroard [Sat, 7 Sep 2013 00:54:51 +0000 (17:54 -0700)]
Fix information panel
bug:
10429488
Change-Id: I80e9e58ba907129cc7b4f5c7f9fafe95d49d86b0
nicolasroard [Sat, 7 Sep 2013 00:44:34 +0000 (17:44 -0700)]
am
32cc4dd7: Fix UI performances / glitches
* commit '
32cc4dd751569721aa19218b4d947145577060d0':
Fix UI performances / glitches
nicolasroard [Sat, 7 Sep 2013 00:21:55 +0000 (17:21 -0700)]
Fix UI performances / glitches
- load/process thumbnails fully in background
- fix reveal slider
- fix race condition when loading
- better memory usage
- fix loading spinner (wasn't shown!)
Change-Id: Id78163556d8ee1c3ad04eae16fe1bf06f4312405
John Hoford [Fri, 6 Sep 2013 23:41:05 +0000 (16:41 -0700)]
am
98b296ff: fix Gallery crash while deleting a picture
* commit '
98b296ffc50e11b7950acf1d0df850b617913131':
fix Gallery crash while deleting a picture
John Hoford [Fri, 6 Sep 2013 22:02:21 +0000 (15:02 -0700)]
fix Gallery crash while deleting a picture
bug:
10551751
Change-Id: I9b6a8488b4fa2a3440b85ae8e4c5dc3da83e29f1
John Hoford [Fri, 6 Sep 2013 21:20:11 +0000 (14:20 -0700)]
John Hoford [Fri, 6 Sep 2013 04:15:18 +0000 (21:15 -0700)]
fix vignette
Change-Id: I368e34d11eecad7da80531f88d52cf6c4a3b4901
Svetoslav [Fri, 6 Sep 2013 15:18:29 +0000 (08:18 -0700)]
am
a78a4897: Update the Gallery API due to API change
* commit '
a78a4897c88edea4374e5102d5e1901fd46e566d':
Update the Gallery API due to API change
Svetoslav [Tue, 3 Sep 2013 21:34:40 +0000 (14:34 -0700)]
Update the Gallery API due to API change
This is a cherry-pick of Svetoslav's fix in klp-dev: https://googleplex-android-review.git.corp.google.com/#/c/353376/
Change-Id: Icf61ff059da24630aca8b7eb00575d12cf85e2fb
John Hoford [Thu, 5 Sep 2013 16:46:57 +0000 (09:46 -0700)]
am
4196c7da: remove title bar from color picker dialog
* commit '
4196c7da24f0393887a9eb4f3bbfebfbc122d3b0':
remove title bar from color picker dialog
Svetoslav [Thu, 5 Sep 2013 05:37:01 +0000 (05:37 +0000)]
Merge "Update the Gallery API due to API change" into klp-dev
Svetoslav [Tue, 3 Sep 2013 21:34:40 +0000 (14:34 -0700)]
Update the Gallery API due to API change
Change-Id: Icf61ff059da24630aca8b7eb00575d12cf85e2fb
John Hoford [Thu, 5 Sep 2013 00:20:04 +0000 (17:20 -0700)]
remove title bar from color picker dialog
Change-Id: I242ded7941dab60a1501dbb4f34dcafbfe302bd3
John Hoford [Wed, 4 Sep 2013 22:38:13 +0000 (15:38 -0700)]
am
805a7fe5: put back shade in crop and straighten
* commit '
805a7fe57da2534462f4720abc7fe9cdb8f7ecc9':
put back shade in crop and straighten
John Hoford [Wed, 4 Sep 2013 20:53:29 +0000 (13:53 -0700)]
put back shade in crop and straighten
Change-Id: I046d98ea61f93d00131eaa7e7058a16bc1be0adc
John Hoford [Wed, 4 Sep 2013 15:58:05 +0000 (08:58 -0700)]
am
ec1f9150: fix crop issues
* commit '
ec1f915006e5ec2db8be633b5d3d73e568951da4':
fix crop issues
Baligh Uddin [Wed, 4 Sep 2013 05:05:22 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:04:57 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Tue, 3 Sep 2013 14:48:29 +0000 (07:48 -0700)]
fix crop issues
Change-Id: I885828b041278531fbcbe203d413131ad8f46613
Baligh Uddin [Tue, 3 Sep 2013 21:47:28 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia93bf9c4d99688cf6f64c25332a36c8a79f8b942
Auto-generated-cl: translation import
Baligh Uddin [Tue, 3 Sep 2013 21:44:27 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I425517e28d8df11155eea0b6eb32f97aa691f41d
Auto-generated-cl: translation import
nicolasroard [Tue, 3 Sep 2013 19:01:53 +0000 (12:01 -0700)]
am
b95b3e9d: Merge "Fix graphic pipeline cache" into gb-ub-photos-carlsbad
* commit '
b95b3e9d5be75687e5f07cc2b245c27074ce4cf9':
Fix graphic pipeline cache
nicolasroard [Tue, 3 Sep 2013 19:00:18 +0000 (19:00 +0000)]
Merge "Fix graphic pipeline cache" into gb-ub-photos-carlsbad
nicolasroard [Tue, 3 Sep 2013 15:40:42 +0000 (08:40 -0700)]
Fix graphic pipeline cache
Some bitmaps were thrown back
into the bitmap pool while still
used in the caching pipeline...
Change-Id: I56c47b44d137f16b9a9a6cf79224c296ea6e55a0
ztenghui [Tue, 3 Sep 2013 16:38:18 +0000 (09:38 -0700)]
am
cac4cedc: Merge "Show the action bar and edit button when system clear full screen flag." into gb-ub-photos-carlsbad
* commit '
cac4cedc989b53fdf6b8b46363b3e722c5605cff':
Show the action bar and edit button when system clear full screen flag.
ztenghui [Tue, 3 Sep 2013 16:38:17 +0000 (09:38 -0700)]
am
417f074d: Play the video on top of lock screen
* commit '
417f074dbcf07843bf02e762c2fe3b23fe8af32b':
Play the video on top of lock screen
ztenghui [Tue, 3 Sep 2013 16:36:53 +0000 (16:36 +0000)]
Merge "Show the action bar and edit button when system clear full screen flag." into gb-ub-photos-carlsbad
ztenghui [Sat, 31 Aug 2013 00:12:59 +0000 (17:12 -0700)]
Play the video on top of lock screen
bug:
10342963
Change-Id: I8093d877d4d491b83b58b062e61edf6d352bf114
ztenghui [Fri, 30 Aug 2013 23:34:23 +0000 (16:34 -0700)]
Show the action bar and edit button when system clear full screen flag.
bug:
10421879
Change-Id: I2cb4f80685e8feb4ee694ed865d724ccc33c3874
Nicolas Roard [Fri, 30 Aug 2013 22:56:28 +0000 (15:56 -0700)]
am
b178c195: Merge "Updated Gallery to avoid breaking the build - API change" into gb-ub-photos-carlsbad
* commit '
b178c1959c10e57b397490f1f2d882df06104366':
Updated Gallery to avoid breaking the build - API change
Nicolas Roard [Fri, 30 Aug 2013 01:12:56 +0000 (01:12 +0000)]
Merge "Updated Gallery to avoid breaking the build - API change" into gb-ub-photos-carlsbad
John Hoford [Fri, 30 Aug 2013 00:14:56 +0000 (17:14 -0700)]
am
ae068f80: small ui cleanups for color border
* commit '
ae068f80895d7d075064a5ded59069425b72271f':
small ui cleanups for color border
John Hoford [Thu, 29 Aug 2013 23:47:46 +0000 (16:47 -0700)]
small ui cleanups for color border
Change-Id: I76142afdb44a45936bf32a36b3b45ffdc729308e
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
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
OSDN Git Service
