git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

Mangesh Ghiware [Tue, 22 Oct 2013 23:38:09 +0000 (16:38 -0700)]

am ff88d699: am 2229a8f7: am b6892ab9: Consider camera available only if intent resolves to an activity.

* commit 'ff88d699474951e753d3e5ed65eb8fe1db0c227e':
Consider camera available only if intent resolves to an activity.

commit | commitdiff | tree

Mangesh Ghiware [Tue, 22 Oct 2013 23:35:57 +0000 (16:35 -0700)]

am 2229a8f7: am b6892ab9: Consider camera available only if intent resolves to an activity.

* commit '2229a8f79642611942a8b6e82038f4ec4eb55d4f':
Consider camera available only if intent resolves to an activity.

commit | commitdiff | tree

Mangesh Ghiware [Tue, 22 Oct 2013 23:33:48 +0000 (16:33 -0700)]

am b6892ab9: Consider camera available only if intent resolves to an activity.

* commit 'b6892ab9e603661f73d97b50adcecc5103ebcd6f':
Consider camera available only if intent resolves to an activity.

commit | commitdiff | tree

Mangesh Ghiware [Tue, 22 Oct 2013 21:10:17 +0000 (14:10 -0700)]

Consider camera available only if intent resolves to an activity.

Fixes crash for restricted profiles without a camera.

Bug: 11289596
Change-Id: I3545dbeae2e4c9094746b51b770daa93e3896bb6

commit | commitdiff | tree

John Hoford [Tue, 22 Oct 2013 18:59:02 +0000 (11:59 -0700)]

am 4dab01b4: am c96c059e: am 85f460b8: fix crop not supporting non-normal orientation

* commit '4dab01b4b655766e5ddf0ee2a7768bddd107a843':
fix crop not supporting non-normal orientation

commit | commitdiff | tree

John Hoford [Tue, 22 Oct 2013 18:53:54 +0000 (11:53 -0700)]

am c96c059e: am 85f460b8: fix crop not supporting non-normal orientation

* commit 'c96c059e1a07460162fa86ed33b5248012f10697':
fix crop not supporting non-normal orientation

commit | commitdiff | tree

John Hoford [Tue, 22 Oct 2013 18:50:46 +0000 (11:50 -0700)]

am 85f460b8: fix crop not supporting non-normal orientation

* commit '85f460b8ba236167bccf560358aefd560f7b58f0':
fix crop not supporting non-normal orientation

commit | commitdiff | tree

John Hoford [Tue, 22 Oct 2013 18:36:19 +0000 (11:36 -0700)]

fix crop not supporting non-normal orientation

bug:11324471
Change-Id: Ib4a76ac1540700eeaa4ddd727b06f9a29b999827

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 23:36:26 +0000 (16:36 -0700)]

am f9cac774: am 7ba0f3c9: am 5a1d760b: Fix crash when exporting with null fx

* commit 'f9cac7749d483e59f75d8307f410bc4c102f9670':
Fix crash when exporting with null fx

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 23:33:47 +0000 (16:33 -0700)]

am 7ba0f3c9: am 5a1d760b: Fix crash when exporting with null fx

* commit '7ba0f3c9e79ef7c9fa16a9626b82aaa25347a4e1':
Fix crash when exporting with null fx

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 23:31:47 +0000 (16:31 -0700)]

am 5a1d760b: Fix crash when exporting with null fx

* commit '5a1d760b60040a8a47d876a9accd27f0bc7be455':
Fix crash when exporting with null fx

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 21:33:20 +0000 (14:33 -0700)]

am 62349321: am 656cbe6e: am 97ad2bdc: Handles export size zero

* commit '62349321d46007285d6a30d644a57b949068e579':
Handles export size zero

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 21:30:43 +0000 (14:30 -0700)]

am 656cbe6e: am 97ad2bdc: Handles export size zero

* commit '656cbe6ea60579dc83b1f336e23bd6b49cd25f80':
Handles export size zero

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 21:28:44 +0000 (14:28 -0700)]

am 97ad2bdc: Handles export size zero

* commit '97ad2bdcb39c0484dafb08f4a7f45bcd1a3f4f9d':
Handles export size zero

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 20:52:10 +0000 (13:52 -0700)]

Fix crash when exporting with null fx

bug:11281209
Change-Id: I71837bcb18b75201542309f71f99ba7abfb65f93

commit | commitdiff | tree

nicolasroard [Mon, 21 Oct 2013 18:45:54 +0000 (11:45 -0700)]

Handles export size zero

bug:11280447
Change-Id: Ia8758a6d269b4ac9fdc9435b3bcdf9295c3e11a9

commit | commitdiff | tree

nicolasroard [Fri, 18 Oct 2013 00:33:34 +0000 (17:33 -0700)]

am bbc64781: am cdd7d873: am 4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

* commit 'bbc64781544100b56ea5ac5ffb46e93ffe8688ea':
Fix wrong applied fx

commit | commitdiff | tree

nicolasroard [Fri, 18 Oct 2013 00:31:04 +0000 (17:31 -0700)]

am cdd7d873: am 4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

* commit 'cdd7d873d5cd398428bf5ed280feda61b8cd1f38':
Fix wrong applied fx

commit | commitdiff | tree

nicolasroard [Fri, 18 Oct 2013 00:29:06 +0000 (17:29 -0700)]

am 4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

* commit '4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2':
Fix wrong applied fx

commit | commitdiff | tree

nicolasroard [Fri, 18 Oct 2013 00:27:29 +0000 (00:27 +0000)]

Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:23:55 +0000 (10:23 -0700)]

am c979a13a: (-s ours) am 77a62e2e: (-s ours) am 009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit 'c979a13a8805a4dd962a8d09d4d91c8e219b0971':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:23:55 +0000 (10:23 -0700)]

am 7f8dd303: (-s ours) am 75c57fda: (-s ours) am 565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '7f8dd303e49c1c99e3e3d085f1b1bbd10a1bc9b1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:21:51 +0000 (10:21 -0700)]

am 77a62e2e: (-s ours) am 009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '77a62e2ed268abfea2f45f0aba89ad05cac282fe':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:21:51 +0000 (10:21 -0700)]

am 75c57fda: (-s ours) am 565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '75c57fda5d9f5631e112460591bd6b3e6502a276':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:19:06 +0000 (10:19 -0700)]

am 009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '009a34fce5707cbea5d3500ecb4c479b8945b76b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:19:05 +0000 (10:19 -0700)]

am 565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '565eece8603aa5e0ff565cb2ac894b07f17cb904':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:17:20 +0000 (17:17 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:17:11 +0000 (17:17 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 07:39:30 +0000 (00:39 -0700)]

Import translations. DO NOT MERGE

Change-Id: I10541e5c871126a329be839dd80b4c757394866b
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 07:30:49 +0000 (00:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: I530ffacc276c7151e76055b6fdeb241c2b7c0be3
Auto-generated-cl: translation import

commit | commitdiff | tree

Ed Heyl [Thu, 17 Oct 2013 01:02:06 +0000 (18:02 -0700)]

am b8f36242: am a88cf82c: merge in klp-release (no-op)

* commit 'b8f36242a11f6323e957bcd1b7c6b849c9573b59':
Rename Gallery activity and add trampoline
enable change in printing

commit | commitdiff | tree

Ed Heyl [Thu, 17 Oct 2013 00:52:17 +0000 (17:52 -0700)]

am a88cf82c: merge in klp-release (no-op)

* commit 'a88cf82c6eb7f5767efbf7f254ce75f100f5f86a':
Rename Gallery activity and add trampoline
enable change in printing

commit | commitdiff | tree

Ed Heyl [Thu, 17 Oct 2013 00:45:36 +0000 (17:45 -0700)]

merge in klp-release (no-op)

commit | commitdiff | tree

nicolasroard [Thu, 17 Oct 2013 00:39:05 +0000 (17:39 -0700)]

Fix wrong applied fx

Typo in serialization name causes the wrong effect to be applied

bug:11260854
Change-Id: I2d939f49edb7cc61f564bb1e2e6cfa6aad37164c

commit | commitdiff | tree

Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:18:48 +0000 (15:18 -0700)]

am 556a015d: am 19b2236c: am c0247a59: updated camera launcher icon in Gallery2 package as well

* commit '556a015d3e7ed9e821795ca13a5daf7ba34aafd5':
updated camera launcher icon in Gallery2 package as well

commit | commitdiff | tree

Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:16:20 +0000 (15:16 -0700)]

am 19b2236c: am c0247a59: updated camera launcher icon in Gallery2 package as well

* commit '19b2236c1707e79fdb3b6d911b1142c6074c5950':
updated camera launcher icon in Gallery2 package as well

commit | commitdiff | tree

Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:13:54 +0000 (15:13 -0700)]

am c0247a59: updated camera launcher icon in Gallery2 package as well

* commit 'c0247a599ffa70eebda4f1c8c1ce5b132da648bd':
updated camera launcher icon in Gallery2 package as well

commit | commitdiff | tree

Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:36:18 +0000 (10:36 -0700)]

updated camera launcher icon in Gallery2 package as well

fixes b/11252316

Change-Id: I164492e9fd6544257d685279c35ba026f24ca79d

commit | commitdiff | tree

The Android Automerger [Wed, 16 Oct 2013 08:31:59 +0000 (01:31 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Alan Newberger [Wed, 16 Oct 2013 05:37:01 +0000 (22:37 -0700)]

am 4460df7c: am efa8ae01: am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

* commit '4460df7c2bd4007ae658cd1a4a367c0bddca5c1f':
Update Gallery2 camera launchers

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:37:00 +0000 (22:37 -0700)]

am c41bf6c0: am 48265373: am 1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad

* commit 'c41bf6c0fe7ce0dd2d085898c6de3fbebd543825':
Fix Gallery auto-hide action bar in Album view

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:37:00 +0000 (22:37 -0700)]

am 62cd0cfc: am 50427582: am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

* commit '62cd0cfc336fd6a5bda46f544b556f493c3abae5':
Fix crash "Gallery has stopped" popup occurs during print setup

commit | commitdiff | tree

Alan Newberger [Wed, 16 Oct 2013 05:35:38 +0000 (22:35 -0700)]

am efa8ae01: am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

* commit 'efa8ae01ad897457f86c17477ea3d5a3330ba521':
Update Gallery2 camera launchers

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:35:38 +0000 (22:35 -0700)]

am 48265373: am 1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad

* commit '48265373efbc89e3e4fd07b913b118ca645a4d02':
Fix Gallery auto-hide action bar in Album view

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:35:37 +0000 (22:35 -0700)]

am 50427582: am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

* commit '50427582dcb4ab4be04d7bfdaa236a78de99aa95':
Fix crash "Gallery has stopped" popup occurs during print setup

commit | commitdiff | tree

Alan Newberger [Wed, 16 Oct 2013 05:34:22 +0000 (22:34 -0700)]

am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

* commit '1582e5dfdbc19ea704ab0f9c77df8cd94eea3056':
Update Gallery2 camera launchers

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:34:21 +0000 (22:34 -0700)]

am 1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad

* commit '1b56a245a253244628ff0ddfdbe5f51cf8475b16':
Fix Gallery auto-hide action bar in Album view

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:34:21 +0000 (22:34 -0700)]

am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

* commit '2037f39bd3b5caeb8161928df59acff5cd92dd38':
Fix crash "Gallery has stopped" popup occurs during print setup

commit | commitdiff | tree

Alan Newberger [Wed, 16 Oct 2013 05:31:58 +0000 (05:31 +0000)]

Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:31:28 +0000 (05:31 +0000)]

Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 05:31:15 +0000 (05:31 +0000)]

Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

commit | commitdiff | tree

The Android Automerger [Wed, 16 Oct 2013 04:14:16 +0000 (21:14 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Alan Newberger [Wed, 16 Oct 2013 03:54:29 +0000 (20:54 -0700)]

Update Gallery2 camera launchers

This updates the Camera launcher icons used in the trampoline activity
which preserves existing shortcuts from Camera icons on JB MR2 home screens.

Bug: 11242234
Change-Id: I1fa83f4353112130b2f35d8d6a6884f090e3da82

commit | commitdiff | tree

nicolasroard [Wed, 16 Oct 2013 02:46:05 +0000 (19:46 -0700)]

Fix crash "Gallery has stopped" popup occurs during print setup

bug:11159662
Change-Id: I181fe6f581290067b9a39d1382bf6ede08484c0a

commit | commitdiff | tree

Mangesh Ghiware [Wed, 16 Oct 2013 02:34:13 +0000 (19:34 -0700)]

am 30655083: am 11bf46c0: am a4f2389c: Catch all the exceptions.

* commit '30655083dcf6843f69bf4a1ed453625ca9487248':
Catch all the exceptions.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 16 Oct 2013 02:31:53 +0000 (19:31 -0700)]

am 11bf46c0: am a4f2389c: Catch all the exceptions.

* commit '11bf46c0cb7963ce103ce8d3f67eb743600e00e8':
Catch all the exceptions.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 16 Oct 2013 02:28:41 +0000 (19:28 -0700)]

am a4f2389c: Catch all the exceptions.

* commit 'a4f2389cf50404854d7820326d776deb7b6c1ad7':
Catch all the exceptions.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 16 Oct 2013 00:53:42 +0000 (17:53 -0700)]

Catch all the exceptions.

Bug: 11156898
Change-Id: Ic16a858bb5d1f8838ffa201c910b617f859c9074

commit | commitdiff | tree

nicolasroard [Tue, 15 Oct 2013 22:36:16 +0000 (15:36 -0700)]

Fix Gallery auto-hide action bar in Album view

bug:11218758
Change-Id: Id48e54842ea3539396801d99ea8ec33e58c7a1f1

commit | commitdiff | tree

The Android Automerger [Tue, 15 Oct 2013 13:01:11 +0000 (06:01 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Tenghui Zhu [Tue, 15 Oct 2013 02:01:14 +0000 (19:01 -0700)]

am 1214470a: am 94678fc1: am db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad

* commit '1214470a617e31d65f8efe507143945a428be5b8':
Revert "Play the video on top of lock screen"

commit | commitdiff | tree

John Hoford [Tue, 15 Oct 2013 02:01:14 +0000 (19:01 -0700)]

am 74ea45fa: am 8cee8116: am 5169137f: fix Vignette collapse to a line

* commit '74ea45fa511977cc579ef4b78ceb413a6312793a':
fix Vignette collapse to a line

commit | commitdiff | tree

Tenghui Zhu [Tue, 15 Oct 2013 00:19:57 +0000 (17:19 -0700)]

am 94678fc1: am db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad

* commit '94678fc1d2b5235cfeae360ca2567579e8fed848':
Revert "Play the video on top of lock screen"

commit | commitdiff | tree

John Hoford [Tue, 15 Oct 2013 00:19:23 +0000 (17:19 -0700)]

am 8cee8116: am 5169137f: fix Vignette collapse to a line

* commit '8cee8116468f4cb6c486994c4bf83b4a0dffaddc':
fix Vignette collapse to a line

commit | commitdiff | tree

Tenghui Zhu [Mon, 14 Oct 2013 23:48:30 +0000 (16:48 -0700)]

am db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad

* commit 'db30124ab6dabd8e24789efaa4e6db7622889b87':
Revert "Play the video on top of lock screen"

commit | commitdiff | tree

Tenghui Zhu [Mon, 14 Oct 2013 23:44:18 +0000 (23:44 +0000)]

Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Mon, 14 Oct 2013 22:23:46 +0000 (15:23 -0700)]

am 5169137f: fix Vignette collapse to a line

* commit '5169137f59114a9549dd056ce4bf843b9b421c4a':
fix Vignette collapse to a line

commit | commitdiff | tree

John Hoford [Mon, 14 Oct 2013 22:09:45 +0000 (15:09 -0700)]

fix Vignette collapse to a line

bug:11221755
Change-Id: Ibe04770d0cfd3fe596ef72e86ccfe461c0cf63b1

commit | commitdiff | tree

Tenghui Zhu [Mon, 14 Oct 2013 16:16:18 +0000 (16:16 +0000)]

Revert "Play the video on top of lock screen"

This reverts commit 417f074dbcf07843bf02e762c2fe3b23fe8af32b.

From the discussion in the bug, for Carlsbad, we will take
the JBMR2 approach for safety concern.

Change-Id: Ieae45e1ae7580c94c08277e580b123e6f504a3b4
bug:11190995

commit | commitdiff | tree

The Android Automerger [Mon, 14 Oct 2013 13:00:37 +0000 (06:00 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Mangesh Ghiware [Mon, 14 Oct 2013 01:51:44 +0000 (18:51 -0700)]

am 0bb52872: am 41f9cf0a: am 315ce716: One crop and set wallpaper activity is enough!

* commit '0bb52872c8209833767e4e37fc322c02544641db':
One crop and set wallpaper activity is enough!

commit | commitdiff | tree

Mangesh Ghiware [Mon, 14 Oct 2013 01:48:51 +0000 (18:48 -0700)]

am 41f9cf0a: am 315ce716: One crop and set wallpaper activity is enough!

* commit '41f9cf0a2998dbac5af6464d5f20a5c31cc594ff':
One crop and set wallpaper activity is enough!

commit | commitdiff | tree

Mangesh Ghiware [Mon, 14 Oct 2013 01:44:03 +0000 (18:44 -0700)]

am 315ce716: One crop and set wallpaper activity is enough!

* commit '315ce7165e64aadb9d929677284957c4d7f8f0d8':
One crop and set wallpaper activity is enough!

commit | commitdiff | tree

Mangesh Ghiware [Mon, 14 Oct 2013 01:36:12 +0000 (18:36 -0700)]

One crop and set wallpaper activity is enough!

Bug: 11206305
Change-Id: Ibd2d4c52c98f02f58e251984696742b9a935b0b8

commit | commitdiff | tree

The Android Automerger [Sun, 13 Oct 2013 13:02:31 +0000 (06:02 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 02:10:23 +0000 (19:10 -0700)]

am 1c2bfe47: am 0fff5600: am 976b9a3a: Fix showing the wrong image after animation

* commit '1c2bfe47bffc2d6d9cc3e6bcdece193f29deb32f':
Fix showing the wrong image after animation

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 02:06:57 +0000 (19:06 -0700)]

am 0fff5600: am 976b9a3a: Fix showing the wrong image after animation

* commit '0fff56009d3fd3df73761d6b82646bcf14fcc1cc':
Fix showing the wrong image after animation

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 02:05:15 +0000 (19:05 -0700)]

am 976b9a3a: Fix showing the wrong image after animation

* commit '976b9a3a98f48ed69bbe66070e2e2e3f3e6aae43':
Fix showing the wrong image after animation

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 01:27:55 +0000 (18:27 -0700)]

Fix showing the wrong image after animation

bug:10856175
Change-Id: I87d2bcd1bb1a4ee28536a97f018b6a3cf409d1b8

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 00:45:59 +0000 (17:45 -0700)]

am 3bf57172: am 5063d3ab: am eeed64b1: Process correctly an export when called with EDIT intent

* commit '3bf571728146ef460f42dcd03c9648a67e073168':
Process correctly an export when called with EDIT intent

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 00:43:14 +0000 (17:43 -0700)]

am 5063d3ab: am eeed64b1: Process correctly an export when called with EDIT intent

* commit '5063d3abf86f997b48493d05d9a0894d75b8ec11':
Process correctly an export when called with EDIT intent

commit | commitdiff | tree

nicolasroard [Sat, 12 Oct 2013 00:41:32 +0000 (17:41 -0700)]

am eeed64b1: Process correctly an export when called with EDIT intent

* commit 'eeed64b1fbdafe5c91ce36b3c5488c003fbb8fab':
Process correctly an export when called with EDIT intent

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 23:22:14 +0000 (16:22 -0700)]

Process correctly an export when called with EDIT intent

bug:11159123
Change-Id: I8c827d9f757c4fd00d21753753917b62d5ba0213

commit | commitdiff | tree

John Hoford [Sat, 12 Oct 2013 00:09:39 +0000 (17:09 -0700)]

am 4283930e: am 72dfc381: am dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

* commit '4283930e8531894f7749fc7c0fd54897a9a77461':
fix showing wrong image post save

commit | commitdiff | tree

John Hoford [Sat, 12 Oct 2013 00:07:38 +0000 (17:07 -0700)]

am 72dfc381: am dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

* commit '72dfc3814578769bbe1317a8cd62180e63ac8e3d':
fix showing wrong image post save

commit | commitdiff | tree

John Hoford [Sat, 12 Oct 2013 00:04:36 +0000 (17:04 -0700)]

am dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

* commit 'dfe30aa6d008c2aff9fa42a6706867bd2f147425':
fix showing wrong image post save

commit | commitdiff | tree

John Hoford [Sat, 12 Oct 2013 00:02:42 +0000 (00:02 +0000)]

Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Sat, 12 Oct 2013 00:00:05 +0000 (17:00 -0700)]

am de12d6a6: am e64845e0: am 4c107f27: fixed crash when applying the none filter

* commit 'de12d6a669df152960390caafc791830096a7f56':
fixed crash when applying the none filter

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 23:58:10 +0000 (16:58 -0700)]

am e64845e0: am 4c107f27: fixed crash when applying the none filter

* commit 'e64845e0a9d13888fa96ae71663027f3a805f9a9':
fixed crash when applying the none filter

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 23:56:23 +0000 (16:56 -0700)]

am 4c107f27: fixed crash when applying the none filter

* commit '4c107f27eee1c6778c32b3f01f3c628cbcaf0b26':
fixed crash when applying the none filter

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 21:51:11 +0000 (14:51 -0700)]

fix showing wrong image post save

bug:11174327
bug:11130809
Change-Id: I53ee2f73c5a871d9255fea547a0d93a989f15a4f

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 22:18:52 +0000 (15:18 -0700)]

fixed crash when applying the none filter

bug:11188884
Change-Id: Id1f5e72b15b307eedccd5d582d3632500f19fdbd

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 20:05:52 +0000 (13:05 -0700)]

am 95ce04cb: am 34c84972: am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad

* commit '95ce04cb54f38788384154630737b628c65876c6':
Fix crash

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 20:03:42 +0000 (13:03 -0700)]

am 34c84972: am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad

* commit '34c84972f83c3bb38c4308654ae2313bbd8aed17':
Fix crash

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 20:00:53 +0000 (13:00 -0700)]

am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad

* commit '7835ea8c351802dd6d4c7361fd24a72124a7897d':
Fix crash

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 19:57:06 +0000 (19:57 +0000)]

Merge "Fix crash" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 19:49:59 +0000 (12:49 -0700)]

am 0d14dcb1: am e74c8a0e: am b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad

* commit '0d14dcb1e09ba98a2bc90c281d914a4c56b64b07':
fix RTL menu issues

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 18:34:33 +0000 (11:34 -0700)]

am e74c8a0e: am b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad

* commit 'e74c8a0e24857181a9dc0589b48efdeed9925bfd':
fix RTL menu issues

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 18:30:58 +0000 (11:30 -0700)]

am b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad

* commit 'b0f614548813ecd1542745f35900856c05d70948':
fix RTL menu issues

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 18:28:33 +0000 (18:28 +0000)]

Merge "fix RTL menu issues" into gb-ub-photos-carlsbad