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

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

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

* commit '9f13ea34348c031a98c5a00fd083e32252933f5a':
Catch all the exceptions.

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

Tenghui Zhu [Tue, 15 Oct 2013 11:01:20 +0000 (04:01 -0700)]

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

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

commit | commitdiff | tree

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

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

* commit '9026a43d1ef12e83900ff5ce789877ec524ddbb8':
fix Vignette collapse to a line

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

Mangesh Ghiware [Mon, 14 Oct 2013 17:53:03 +0000 (10:53 -0700)]

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

* commit '04299f7971fb8b420ef7ede7dc2e770e7faf250b':
One crop and set wallpaper activity is enough!

commit | commitdiff | tree

nicolasroard [Mon, 14 Oct 2013 17:49:48 +0000 (10:49 -0700)]

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

* commit '0358df764fbfab779ae5c9524cc91ce39104b8fd':
Fix showing the wrong image after animation

commit | commitdiff | tree

nicolasroard [Mon, 14 Oct 2013 17:49:37 +0000 (10:49 -0700)]

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

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

commit | commitdiff | tree

John Hoford [Mon, 14 Oct 2013 17:48:54 +0000 (10:48 -0700)]

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

* commit '356ea35eb27706674a1bd185d39fe48c089f3104':
fix showing wrong image post save

commit | commitdiff | tree

John Hoford [Mon, 14 Oct 2013 17:48:53 +0000 (10:48 -0700)]

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

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

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

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

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:12:51 +0000 (13:12 -0700)]

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

* commit '06fe817a017d18e5db8276dd7d59d83bb69e071e':
Fix crash

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:55:07 +0000 (12:55 -0700)]

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

* commit '39378c5645d88588c7c58ca453fc8584d546e8b7':
fix RTL menu issues

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

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 18:27:34 +0000 (11:27 -0700)]

Fix crash

bug:11185130
Change-Id: I8aaaeb706cb0b2db106c266a84dad0e55d76998f

commit | commitdiff | tree

Alan Newberger [Fri, 11 Oct 2013 18:11:18 +0000 (11:11 -0700)]

am 01a880d2: am fcdb6c69: am ee0b70cd: am c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad

* commit '01a880d206b51b6e74de602dfcc9a7812ef3a840':
Introduce FilterShowHelper for versioning visibility

commit | commitdiff | tree

Alan Newberger [Fri, 11 Oct 2013 18:07:56 +0000 (11:07 -0700)]

am fcdb6c69: am ee0b70cd: am c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad

* commit 'fcdb6c6923e66bc831b5b004e70ab08094c724e3':
Introduce FilterShowHelper for versioning visibility

commit | commitdiff | tree

Mangesh Ghiware [Fri, 11 Oct 2013 18:04:34 +0000 (11:04 -0700)]

am ca6c9ded: am 8d508422: am 2737021b: am d180bb94: Use existing crop activity as fallback.

* commit 'ca6c9dedf2a993a18f2991015943a857cfe525a7':
Use existing crop activity as fallback.

commit | commitdiff | tree

Alan Newberger [Fri, 11 Oct 2013 18:02:29 +0000 (11:02 -0700)]

am ee0b70cd: am c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad

* commit 'ee0b70cd8cbdbf0e54bae2798d386a39cb7a091b':
Introduce FilterShowHelper for versioning visibility

commit | commitdiff | tree

Mangesh Ghiware [Fri, 11 Oct 2013 18:01:10 +0000 (11:01 -0700)]

am 8d508422: am 2737021b: am d180bb94: Use existing crop activity as fallback.

* commit '8d50842226fbeb9d4415a40d8b705e9cb581fa5c':
Use existing crop activity as fallback.

commit | commitdiff | tree

Alan Newberger [Fri, 11 Oct 2013 18:00:24 +0000 (11:00 -0700)]

am c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad

* commit 'c58ff0578e2124f75b5a974ed821ee5766da2455':
Introduce FilterShowHelper for versioning visibility

commit | commitdiff | tree

Alan Newberger [Fri, 11 Oct 2013 17:59:07 +0000 (17:59 +0000)]

Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Mangesh Ghiware [Fri, 11 Oct 2013 17:59:04 +0000 (10:59 -0700)]

am 2737021b: am d180bb94: Use existing crop activity as fallback.

* commit '2737021b671fb7c322e1e348c89d55d1263a426d':
Use existing crop activity as fallback.

commit | commitdiff | tree

Mangesh Ghiware [Fri, 11 Oct 2013 17:57:09 +0000 (10:57 -0700)]

am d180bb94: Use existing crop activity as fallback.

* commit 'd180bb94f9b9fc9846f08479fc952bb6f5fe70de':
Use existing crop activity as fallback.

commit | commitdiff | tree

Mangesh Ghiware [Fri, 11 Oct 2013 17:03:29 +0000 (10:03 -0700)]

Use existing crop activity as fallback.

Bug: 11156898
Change-Id: I77f4788870a4f3f499ba59e168f04922a95a03c4

commit | commitdiff | tree

John Hoford [Fri, 11 Oct 2013 17:08:22 +0000 (10:08 -0700)]

fix RTL menu issues

bug:11184806
Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba

commit | commitdiff | tree

Alan Newberger [Thu, 10 Oct 2013 21:17:58 +0000 (14:17 -0700)]

Introduce FilterShowHelper for versioning visibility

This CL creates FilterShowHelper which will first be used to ensure Versions is active.

Bug: 10734094
Change-Id: I7ac7d99af8818e2599ea2f2a0e64b9c3433a9002

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 02:26:26 +0000 (19:26 -0700)]

am d84ce218: am 381df73d: am d7fd034b: am b052e5c7: Use AOSP borders by default

* commit 'd84ce21801f5c40d9f1ffa1462c8536ebdd2f0cf':
Use AOSP borders by default

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 02:26:25 +0000 (19:26 -0700)]

am 76d248c7: am 8d89dbb0: am 8444b257: am 1ebeed45: Fix edge case cache issues

* commit '76d248c74dbf43158ea9b5683febccd02326a2e8':
Fix edge case cache issues

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 02:21:11 +0000 (19:21 -0700)]

am 381df73d: am d7fd034b: am b052e5c7: Use AOSP borders by default

* commit '381df73d4e519332252b28c15e27562dcbd22561':
Use AOSP borders by default

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 02:20:19 +0000 (19:20 -0700)]

am 8d89dbb0: am 8444b257: am 1ebeed45: Fix edge case cache issues

* commit '8d89dbb0555715bcdf6f65c9889766e7eccc67f1':
Fix edge case cache issues

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 02:16:40 +0000 (19:16 -0700)]

am d7fd034b: am b052e5c7: Use AOSP borders by default

* commit 'd7fd034b94240c0f3ba9588a0fd9ad0fa6dfdf25':
Use AOSP borders by default

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 02:14:45 +0000 (19:14 -0700)]

am b052e5c7: Use AOSP borders by default

* commit 'b052e5c72d27c3da585e345d758170c3ab26cbc8':
Use AOSP borders by default

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 01:37:43 +0000 (18:37 -0700)]

Use AOSP borders by default

bug:11132358
bug:11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 00:05:38 +0000 (17:05 -0700)]

am 8444b257: am 1ebeed45: Fix edge case cache issues

* commit '8444b257b0053c4bde274138350039c0880a5abf':
Fix edge case cache issues

commit | commitdiff | tree

nicolasroard [Fri, 11 Oct 2013 00:02:51 +0000 (17:02 -0700)]

am 1ebeed45: Fix edge case cache issues

* commit '1ebeed45d206ed306eb149e4e63242b1b55558ef':
Fix edge case cache issues

commit | commitdiff | tree

nicolasroard [Thu, 10 Oct 2013 22:46:44 +0000 (15:46 -0700)]

Fix edge case cache issues

Also add additional debugging information.

bug:10856175

Change-Id: Ie352e2dd6a86511abea97b622ed7c3b3cccd8479

commit | commitdiff | tree

John Hoford [Thu, 10 Oct 2013 17:02:30 +0000 (10:02 -0700)]

am 5f251c16: am a3460803: am 1f661bd8: am 96e6ddb2: fix Gallery crashes with empty PTP device

* commit '5f251c16fe4664ce08dfd8150cab57b8bfe32576':
fix Gallery crashes with empty PTP device

commit | commitdiff | tree

John Hoford [Thu, 10 Oct 2013 17:01:03 +0000 (10:01 -0700)]

am a3460803: am 1f661bd8: am 96e6ddb2: fix Gallery crashes with empty PTP device

* commit 'a34608035da126e4bd5f299e8229b81bc40a2f1a':
fix Gallery crashes with empty PTP device

commit | commitdiff | tree

John Hoford [Thu, 10 Oct 2013 16:55:59 +0000 (09:55 -0700)]

am 1f661bd8: am 96e6ddb2: fix Gallery crashes with empty PTP device

* commit '1f661bd86a7936e32cef42e3ce6aa0c10a7c0c49':
fix Gallery crashes with empty PTP device

commit | commitdiff | tree

John Hoford [Thu, 10 Oct 2013 16:53:34 +0000 (09:53 -0700)]

am 96e6ddb2: fix Gallery crashes with empty PTP device

* commit '96e6ddb24dd149aa991ef007a394ea9592066d14':
fix Gallery crashes with empty PTP device

commit | commitdiff | tree

John Hoford [Thu, 10 Oct 2013 15:59:17 +0000 (08:59 -0700)]

fix Gallery crashes with empty PTP device

bug:11152999
Change-Id: I70e4787dc46c0e948712ea4530b8110c36603dfa

commit | commitdiff | tree

John Hoford [Wed, 9 Oct 2013 22:39:00 +0000 (15:39 -0700)]

am e1721f0a: am f591448a: am 8e5f2acb: am fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

* commit 'e1721f0a3c89819edee1900c273e8f982cab9547':
hide popupmenu during rotate

commit | commitdiff | tree

John Hoford [Wed, 9 Oct 2013 22:36:03 +0000 (15:36 -0700)]

am f591448a: am 8e5f2acb: am fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

* commit 'f591448a73e31138e5df884479f3c4766b8be222':
hide popupmenu during rotate

commit | commitdiff | tree

John Hoford [Wed, 9 Oct 2013 22:33:38 +0000 (15:33 -0700)]

am 8e5f2acb: am fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

* commit '8e5f2acb91ab4ef22b54a1d0502e9a5841e705a3':
hide popupmenu during rotate

commit | commitdiff | tree

John Hoford [Wed, 9 Oct 2013 22:32:12 +0000 (15:32 -0700)]

am fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

* commit 'fb1884f63beb3ab4c94b09aea91b5ad501bc6af6':
hide popupmenu during rotate

commit | commitdiff | tree

John Hoford [Wed, 9 Oct 2013 22:30:02 +0000 (22:30 +0000)]

Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Wed, 9 Oct 2013 20:54:45 +0000 (13:54 -0700)]

hide popupmenu during rotate

bug:11135309
Change-Id: I5954fafe1f081f8d1fc30c36f5cf6b2c66cb9511

commit | commitdiff | tree

Mangesh Ghiware [Wed, 9 Oct 2013 16:50:09 +0000 (09:50 -0700)]

am 6f7059ef: am bf951650: am ea9d1ed0: am 9895d680: Build properties now updated to SDK level 19.

* commit '6f7059ef7f7398b84570ddb7222cf0b31e699052':
Build properties now updated to SDK level 19.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 9 Oct 2013 16:48:05 +0000 (09:48 -0700)]

am bf951650: am ea9d1ed0: am 9895d680: Build properties now updated to SDK level 19.

* commit 'bf951650479333a974884b004695a78c4b449731':
Build properties now updated to SDK level 19.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 9 Oct 2013 16:45:42 +0000 (09:45 -0700)]

am ea9d1ed0: am 9895d680: Build properties now updated to SDK level 19.

* commit 'ea9d1ed05b3f4748898192dac245315c4ddd5ba4':
Build properties now updated to SDK level 19.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 9 Oct 2013 16:43:23 +0000 (09:43 -0700)]

am 9895d680: Build properties now updated to SDK level 19.

* commit '9895d680e66d1f1cf4603fa91c8a53e328f1476b':
Build properties now updated to SDK level 19.

commit | commitdiff | tree

Mangesh Ghiware [Wed, 9 Oct 2013 16:36:24 +0000 (09:36 -0700)]

Build properties now updated to SDK level 19.

Check only for numeric version code.

Bug: 4225598

Change-Id: I632b1c2ceb310fc35804b6e44a43c6c4ce1562b1

commit | commitdiff | tree

nicolasroard [Wed, 9 Oct 2013 16:14:26 +0000 (09:14 -0700)]

am eb6a67bd: am ce998ab2: am d9435df3: am 4d385a0a: Add missing flag for bounds decode

* commit 'eb6a67bd6832e1ec51725eb95d07205326e62bab':
Add missing flag for bounds decode

commit | commitdiff | tree

nicolasroard [Wed, 9 Oct 2013 16:14:18 +0000 (09:14 -0700)]

am b80f18f9: am 311b1852: am 3763b7cf: am a164496b: Fix triple buffer update bug bug:11140550

* commit 'b80f18f9846bd5145e7d3edb5e11ef46948cf7ca':
Fix triple buffer update bug bug:11140550

commit | commitdiff | tree

Mangesh Ghiware [Wed, 9 Oct 2013 16:13:35 +0000 (09:13 -0700)]

am 223ef8a1: am 3aa2487a: am b481b22b: am 7943a83c: Fix incorrect usage of getComponentEnabledSetting()

* commit '223ef8a13386732f6a03c78bac96232fe4114e4c':
Fix incorrect usage of getComponentEnabledSetting()

commit | commitdiff | tree

Ed Heyl [Wed, 9 Oct 2013 16:13:00 +0000 (09:13 -0700)]

am 57c49576: am 054aa6b3: am c3a1b05e: merge in KFS78N (no-op)

* commit '57c495768ba4111b4acdacdc9d03e4718d0382f1':

commit | commitdiff | tree

Ed Heyl [Wed, 9 Oct 2013 16:12:22 +0000 (09:12 -0700)]

am 7c1f59c1: am 331854b9: am dfc6c90a: merge in KQS81M

* commit '7c1f59c1dd5dddb9ad4b7db44db14ff8b4b28d1a':
  fix Edit from filmstrip bug
  Updated Gallery to avoid breaking the build - API change
  Import translations. DO NOT MERGE
  Fix empty screen on Svelte
  Fix crash for svelte
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix RTE in PhotoPage

commit | commitdiff | tree

nicolasroard [Wed, 9 Oct 2013 03:34:56 +0000 (20:34 -0700)]

am ce998ab2: am d9435df3: am 4d385a0a: Add missing flag for bounds decode

* commit 'ce998ab2669c346f52c0a0bdcde316c4acd4a817':
Add missing flag for bounds decode

commit | commitdiff | tree

nicolasroard [Wed, 9 Oct 2013 03:32:44 +0000 (20:32 -0700)]

am d9435df3: am 4d385a0a: Add missing flag for bounds decode

* commit 'd9435df3f7da347c8a279076b1886aaa95d6a533':
Add missing flag for bounds decode

commit | commitdiff | tree

nicolasroard [Wed, 9 Oct 2013 03:31:07 +0000 (20:31 -0700)]

am 4d385a0a: Add missing flag for bounds decode

* commit '4d385a0aebbf9a6a319c3baf28fb95e808746559':
Add missing flag for bounds decode

commit | commitdiff | tree

nicolasroard [Wed, 9 Oct 2013 02:42:54 +0000 (19:42 -0700)]

Add missing flag for bounds decode

bug:11140621

Change-Id: I08af1a6dd9527a03b21d7ab0c3cff776f37201ac