OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoam 8073625e: Merge remote-tracking branch \'origin/klp-dev-plus-aosp\' into klp-dev...
Qiwen Zhao [Thu, 5 Dec 2013 21:29:04 +0000 (21:29 +0000)]
am 8073625e: Merge remote-tracking branch \'origin/klp-dev-plus-aosp\' into klp-dev-plus-aosp

* commit '8073625ea47a0d1bea2f1d6046f8547b3b9a2e2e':

10 years agoam 76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 22 Nov 2013 01:23:50 +0000 (17:23 -0800)]
am 76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '76ad19f1c70df359d03ec0d2142805c263d39a01':
  Import translations. DO NOT MERGE

10 years agoam daac361f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:49 +0000 (17:23 -0800)]
am daac361f: (-s ours) Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 22 Nov 2013 01:20:43 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 00:44:11 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 00:42:19 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam aa22947b: Fix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:38:25 +0000 (16:38 -0800)]
am aa22947b: Fix the thumbnail generation.

* commit 'aa22947b6f0714b73a78a28fb1217f7c5f4f663d':
  Fix the thumbnail generation.

10 years agoFix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:13:55 +0000 (16:13 -0800)]
Fix the thumbnail generation.

bug:11664501
Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 04:53:41 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 03:01:52 +0000 (19:01 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:56:04 +0000 (18:56 -0800)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:16:40 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 00:18:33 +0000 (16:18 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 00:13:14 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 1619b3c3: Fix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 18:04:30 +0000 (11:04 -0700)]
am 1619b3c3: Fix infinite spinner dialog

* commit '1619b3c3ed20fad548d31464ab5a2252b2c3b65f':
  Fix infinite spinner dialog

10 years agoFix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 03:50:30 +0000 (20:50 -0700)]
Fix infinite spinner dialog

bug:11328106

Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd

10 years agoam c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos...
nicolasroard [Sat, 2 Nov 2013 01:40:43 +0000 (18:40 -0700)]
am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

* commit 'c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd':
  Disable geometry button if tiny planet is here

10 years agoMerge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
nicolasroard [Sat, 2 Nov 2013 01:37:30 +0000 (01:37 +0000)]
Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

10 years agoam c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
John Hoford [Sat, 2 Nov 2013 00:28:10 +0000 (17:28 -0700)]
am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

* commit 'c0c6f058d464be3e4d6925239bcabc5b56fbce80':
  fix Gallery crash using crop

10 years agoMerge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
John Hoford [Sat, 2 Nov 2013 00:08:20 +0000 (00:08 +0000)]
Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

10 years agoDisable geometry button if tiny planet is here
nicolasroard [Fri, 1 Nov 2013 23:03:35 +0000 (16:03 -0700)]
Disable geometry button if tiny planet is here

bug:11288853
Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94

10 years agofix Gallery crash using crop
John Hoford [Thu, 31 Oct 2013 23:17:01 +0000 (16:17 -0700)]
fix Gallery crash using crop

bug:11347083
Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8

10 years agoam 21b61954: Gallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:39:03 +0000 (15:39 -0700)]
am 21b61954: Gallery should show up in recents even when run via shortcut

* commit '21b619541d6a92d595bbe6e95d4a0b46b6f40f77':
  Gallery should show up in recents even when run via shortcut

10 years agoGallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:15:45 +0000 (15:15 -0700)]
Gallery should show up in recents even when run via shortcut

Gallery when run through the shortcut doesn't show up in recents. This
is a minimal change to show the activity in recents even when started
via shortcut.

Bug: 11195140
Change-Id: Iaa7230fd1874871744403b1b2e2e9216c4cb73d2

10 years agoam ebbcc394: Avoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:50:36 +0000 (11:50 -0700)]
am ebbcc394: Avoid crash if user disables Camera while Gallery is open

* commit 'ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35':
  Avoid crash if user disables Camera while Gallery is open

10 years agoAvoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:42:14 +0000 (11:42 -0700)]
Avoid crash if user disables Camera while Gallery is open

We cache the camera availability check so in the corner case that
a user disables their camera in package manager, avoid crashing.
Not necessary to do more sophisticated handling since this is a
narrow case initiated by user.

Bug: 11435559
Change-Id: I54d5015cdd9b64aec5c9da9a393824d3b41201a1

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Oct 2013 23:11:52 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam ec036c64: Add white overscroll assets to Gallery2 for v19
Alan Newberger [Fri, 25 Oct 2013 17:55:19 +0000 (10:55 -0700)]
am ec036c64: Add white overscroll assets to Gallery2 for v19

* commit 'ec036c64173ac581f460b25330248fda2a6cb57a':
  Add white overscroll assets to Gallery2 for v19

10 years agoAdd white overscroll assets to Gallery2 for v19
Alan Newberger [Fri, 25 Oct 2013 17:49:05 +0000 (10:49 -0700)]
Add white overscroll assets to Gallery2 for v19

This CL makes Gallery show white overscroll in filmstrip view,
when on v19 API devices.

Bug: 11321533
Change-Id: Ic2b2bd3567d0f08be6b2a70f7af218ac0f58c2a5

10 years agoam b6892ab9: Consider camera available only if intent resolves to an activity.
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.

10 years agoConsider camera available only if intent resolves to an activity.
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

10 years agoam 85f460b8: fix crop not supporting non-normal orientation
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

10 years agofix crop not supporting non-normal orientation
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

10 years agoam 5a1d760b: Fix crash when exporting with null fx
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

10 years agoam 97ad2bdc: Handles export size zero
nicolasroard [Mon, 21 Oct 2013 21:28:44 +0000 (14:28 -0700)]
am 97ad2bdc: Handles export size zero

* commit '97ad2bdcb39c0484dafb08f4a7f45bcd1a3f4f9d':
  Handles export size zero

10 years agoFix crash when exporting with null fx
nicolasroard [Mon, 21 Oct 2013 20:52:10 +0000 (13:52 -0700)]
Fix crash when exporting with null fx

bug:11281209
Change-Id: I71837bcb18b75201542309f71f99ba7abfb65f93

10 years agoHandles export size zero
nicolasroard [Mon, 21 Oct 2013 18:45:54 +0000 (11:45 -0700)]
Handles export size zero

bug:11280447
Change-Id: Ia8758a6d269b4ac9fdc9435b3bcdf9295c3e11a9

10 years agoam 4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
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

10 years agoMerge "Fix wrong applied fx" into gb-ub-photos-carlsbad
nicolasroard [Fri, 18 Oct 2013 00:27:29 +0000 (00:27 +0000)]
Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

10 years agoam 009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
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

10 years agoam 565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
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

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:17:20 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:17:11 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:45:36 +0000 (17:45 -0700)]
merge in klp-release (no-op)

10 years agoFix wrong applied fx
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

10 years agoam c0247a59: updated camera launcher icon in Gallery2 package as well
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

10 years agoupdated camera launcher icon in Gallery2 package as well
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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 08:31:59 +0000 (01:31 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
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

10 years agoam 1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos...
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

10 years agoam 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup...
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

10 years agoMerge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
Alan Newberger [Wed, 16 Oct 2013 05:31:58 +0000 (05:31 +0000)]
Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

10 years agoMerge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
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

10 years agoMerge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub...
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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 04:14:16 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoUpdate Gallery2 camera launchers
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

10 years agoFix crash "Gallery has stopped" popup occurs during print setup
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

10 years agoam a4f2389c: Catch all the exceptions.
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.

10 years agoCatch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 00:53:42 +0000 (17:53 -0700)]
Catch all the exceptions.

Bug: 11156898
Change-Id: Ic16a858bb5d1f8838ffa201c910b617f859c9074

10 years agoFix Gallery auto-hide action bar in Album view
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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos...
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"

10 years agoMerge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
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

10 years agoam 5169137f: fix Vignette collapse to a line
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

10 years agofix Vignette collapse to a line
John Hoford [Mon, 14 Oct 2013 22:09:45 +0000 (15:09 -0700)]
fix Vignette collapse to a line

bug:11221755
Change-Id: Ibe04770d0cfd3fe596ef72e86ccfe461c0cf63b1

10 years agoRevert "Play the video on top of lock screen"
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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 14 Oct 2013 13:00:37 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 315ce716: One crop and set wallpaper activity is enough!
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!

10 years agoOne crop and set wallpaper activity is enough!
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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:31 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 976b9a3a: Fix showing the wrong image after animation
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

10 years agoFix showing the wrong image after animation
nicolasroard [Sat, 12 Oct 2013 01:27:55 +0000 (18:27 -0700)]
Fix showing the wrong image after animation

bug:10856175
Change-Id: I87d2bcd1bb1a4ee28536a97f018b6a3cf409d1b8

10 years agoam eeed64b1: Process correctly an export when called with EDIT intent
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

10 years agoProcess correctly an export when called with EDIT intent
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

10 years agoam dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
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

10 years agoMerge "fix showing wrong image post save" into gb-ub-photos-carlsbad
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

10 years agoam 4c107f27: fixed crash when applying the none filter
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

10 years agofix showing wrong image post save
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

10 years agofixed crash when applying the none filter
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

10 years agoam 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad
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

10 years agoMerge "Fix crash" into gb-ub-photos-carlsbad
nicolasroard [Fri, 11 Oct 2013 19:57:06 +0000 (19:57 +0000)]
Merge "Fix crash" into gb-ub-photos-carlsbad

10 years agoam b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
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

10 years agoMerge "fix RTL menu issues" into gb-ub-photos-carlsbad
John Hoford [Fri, 11 Oct 2013 18:28:33 +0000 (18:28 +0000)]
Merge "fix RTL menu issues" into gb-ub-photos-carlsbad

10 years agoFix crash
nicolasroard [Fri, 11 Oct 2013 18:27:34 +0000 (11:27 -0700)]
Fix crash

bug:11185130
Change-Id: I8aaaeb706cb0b2db106c266a84dad0e55d76998f

10 years agoam c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb...
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

10 years agoMerge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 11 Oct 2013 17:59:07 +0000 (17:59 +0000)]
Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad

10 years agoam d180bb94: Use existing crop activity as fallback.
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.

10 years agoUse existing crop activity as fallback.
Mangesh Ghiware [Fri, 11 Oct 2013 17:03:29 +0000 (10:03 -0700)]
Use existing crop activity as fallback.

Bug: 11156898
Change-Id: I77f4788870a4f3f499ba59e168f04922a95a03c4

10 years agofix RTL menu issues
John Hoford [Fri, 11 Oct 2013 17:08:22 +0000 (10:08 -0700)]
fix RTL menu issues

bug:11184806
Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba

10 years agoIntroduce FilterShowHelper for versioning visibility
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

10 years agoam b052e5c7: Use AOSP borders by default
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

10 years agoUse AOSP borders by default
nicolasroard [Fri, 11 Oct 2013 01:37:43 +0000 (18:37 -0700)]
Use AOSP borders by default

bug:11132358
bug:11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa

10 years agoam 1ebeed45: Fix edge case cache issues
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

10 years agoFix edge case cache issues
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

10 years agoam 96e6ddb2: fix Gallery crashes with empty PTP device
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

10 years agofix Gallery crashes with empty PTP device
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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 10 Oct 2013 13:01:31 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
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