OSDN Git Service

android-x86/packages-apps-Gallery2.git
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 4283930e: am 72dfc381: am dfe30aa6: Merge "fix showing wrong image post save"...
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

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

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 de12d6a6: am e64845e0: am 4c107f27: fixed crash when applying the none filter
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

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

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 95ce04cb: am 34c84972: am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad
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

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

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 0d14dcb1: am e74c8a0e: am b0f61454: Merge "fix RTL menu issues" into gb-ub-photos...
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

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

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 fcdb6c69: am ee0b70cd: am c58ff057: Merge "Introduce FilterShowHelper for versioni...
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

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

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

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 2737021b: am d180bb94: Use existing crop activity as fallback.
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.

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 381df73d: am d7fd034b: am b052e5c7: Use AOSP borders by default
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

10 years agoam 8d89dbb0: am 8444b257: am 1ebeed45: Fix edge case cache issues
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

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

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 8444b257: am 1ebeed45: Fix edge case cache issues
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

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 a3460803: am 1f661bd8: am 96e6ddb2: fix Gallery crashes with empty PTP device
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

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

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 f591448a: am 8e5f2acb: am fb1884f6: Merge "hide popupmenu during rotate" into...
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

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

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

10 years agoMerge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
John Hoford [Wed, 9 Oct 2013 22:30:02 +0000 (22:30 +0000)]
Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

10 years agohide popupmenu during rotate
John Hoford [Wed, 9 Oct 2013 20:54:45 +0000 (13:54 -0700)]
hide popupmenu during rotate

bug:11135309
Change-Id: I5954fafe1f081f8d1fc30c36f5cf6b2c66cb9511

10 years agoam bf951650: am ea9d1ed0: am 9895d680: Build properties now updated to SDK level 19.
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.

10 years agoam ea9d1ed0: am 9895d680: Build properties now updated to SDK level 19.
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.

10 years agoam 9895d680: Build properties now updated to SDK level 19.
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.

10 years agoBuild properties now updated to SDK level 19.
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

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

10 years agoam ce998ab2: am d9435df3: am 4d385a0a: Add missing flag for bounds decode
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

10 years agoam d9435df3: am 4d385a0a: Add missing flag for bounds decode
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

10 years agoam 4d385a0a: Add missing flag for bounds decode
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

10 years agoAdd missing flag for bounds decode
nicolasroard [Wed, 9 Oct 2013 02:42:54 +0000 (19:42 -0700)]
Add missing flag for bounds decode

bug:11140621

Change-Id: I08af1a6dd9527a03b21d7ab0c3cff776f37201ac

10 years agoam 311b1852: am 3763b7cf: am a164496b: Fix triple buffer update bug bug:11140550
nicolasroard [Wed, 9 Oct 2013 02:29:44 +0000 (19:29 -0700)]
am 311b1852: am 3763b7cf: am a164496b: Fix triple buffer update bug bug:11140550

* commit '311b1852f1d800fccc0ae5cd5699e63c687f7888':
  Fix triple buffer update bug bug:11140550

10 years agoam 3763b7cf: am a164496b: Fix triple buffer update bug bug:11140550
nicolasroard [Wed, 9 Oct 2013 02:26:35 +0000 (19:26 -0700)]
am 3763b7cf: am a164496b: Fix triple buffer update bug bug:11140550

* commit '3763b7cfbf3fdb966f4c1fb07ebe31432926a57c':
  Fix triple buffer update bug bug:11140550

10 years agoam a164496b: Fix triple buffer update bug bug:11140550
nicolasroard [Wed, 9 Oct 2013 02:24:34 +0000 (19:24 -0700)]
am a164496b: Fix triple buffer update bug bug:11140550

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

10 years agoFix triple buffer update bug
nicolasroard [Wed, 9 Oct 2013 02:00:21 +0000 (19:00 -0700)]
Fix triple buffer update bug
bug:11140550

Change-Id: I530bf8b071c7336eb7a20293d6c9c2f5360df47e

10 years agoam 3aa2487a: am b481b22b: am 7943a83c: Fix incorrect usage of getComponentEnabledSett...
Mangesh Ghiware [Tue, 8 Oct 2013 23:21:29 +0000 (16:21 -0700)]
am 3aa2487a: am b481b22b: am 7943a83c: Fix incorrect usage of getComponentEnabledSetting()

* commit '3aa2487a0731fe8879fa672b4b3a2d544fc13c36':
  Fix incorrect usage of getComponentEnabledSetting()

10 years agoam b481b22b: am 7943a83c: Fix incorrect usage of getComponentEnabledSetting()
Mangesh Ghiware [Tue, 8 Oct 2013 23:15:05 +0000 (16:15 -0700)]
am b481b22b: am 7943a83c: Fix incorrect usage of getComponentEnabledSetting()

* commit 'b481b22b113a531d0c7781499ad5db836951b69b':
  Fix incorrect usage of getComponentEnabledSetting()

10 years agoam 054aa6b3: am c3a1b05e: merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:11:47 +0000 (16:11 -0700)]
am 054aa6b3: am c3a1b05e: merge in KFS78N (no-op)

* commit '054aa6b3e925a3d7b9859ec7421570e46be208de':

10 years agoam 7943a83c: Fix incorrect usage of getComponentEnabledSetting()
Mangesh Ghiware [Tue, 8 Oct 2013 23:11:01 +0000 (16:11 -0700)]
am 7943a83c: Fix incorrect usage of getComponentEnabledSetting()

* commit '7943a83c2e2811fa427f99fd97e9a52832710d84':
  Fix incorrect usage of getComponentEnabledSetting()

10 years agoam c3a1b05e: merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:05:14 +0000 (16:05 -0700)]
am c3a1b05e: merge in KFS78N (no-op)

* commit 'c3a1b05e60db18511783718b65d1f5a2758c16eb':

10 years agomerge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:01:39 +0000 (16:01 -0700)]
merge in KFS78N (no-op)

10 years agoam 331854b9: am dfc6c90a: merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:58:03 +0000 (15:58 -0700)]
am 331854b9: am dfc6c90a: merge in KQS81M

* commit '331854b9a522e881f8ae5f44369ae01817df0802':
  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

10 years agoam dfc6c90a: merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:47:46 +0000 (15:47 -0700)]
am dfc6c90a: merge in KQS81M

* commit 'dfc6c90a5369c6ad1a65a359df80b3f958443672':
  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

10 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:42:41 +0000 (15:42 -0700)]
merge in KQS81M

10 years agoFix incorrect usage of getComponentEnabledSetting()
Mangesh Ghiware [Tue, 8 Oct 2013 22:29:58 +0000 (15:29 -0700)]
Fix incorrect usage of getComponentEnabledSetting()

Bug: 10912503

Change-Id: I9835995d121445ca170668ae8150a24e95e27544

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

10 years agoam 1613cafe: (-s ours) am 70062156: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 8 Oct 2013 03:58:32 +0000 (20:58 -0700)]
am 1613cafe: (-s ours) am 70062156: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1613cafe57bb92a8120e2f386f8fe442a5ec0d63':
  Import translations. DO NOT MERGE

10 years agoam 70062156: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 03:55:05 +0000 (20:55 -0700)]
am 70062156: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '700621564a7adecc7286845a646608be322d8e06':
  Import translations. DO NOT MERGE

10 years agoam 6878b849: am d74ade6b: am 58b6f484: On K+, intent out to Wallpaper manager for...
Mangesh Ghiware [Tue, 8 Oct 2013 03:54:38 +0000 (20:54 -0700)]
am 6878b849: am d74ade6b: am 58b6f484: On K+, intent out to Wallpaper manager for crop and set wallpaper.

* commit '6878b8494c060522d2fb95aeb77f96b3571e4809':
  On K+, intent out to Wallpaper manager for crop and set wallpaper.

10 years agoam 86f142df: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:54:37 +0000 (20:54 -0700)]
am 86f142df: (-s ours) Import translations. DO NOT MERGE

* commit '86f142df72462a1f70018a83437b878982c3b730':
  Import translations. DO NOT MERGE

10 years agoam d74ade6b: am 58b6f484: On K+, intent out to Wallpaper manager for crop and set...
Mangesh Ghiware [Tue, 8 Oct 2013 03:51:29 +0000 (20:51 -0700)]
am d74ade6b: am 58b6f484: On K+, intent out to Wallpaper manager for crop and set wallpaper.

* commit 'd74ade6be9644bb60e6b4cc35dbf9e6ea011b3b7':
  On K+, intent out to Wallpaper manager for crop and set wallpaper.

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 03:51:11 +0000 (03:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 58b6f484: On K+, intent out to Wallpaper manager for crop and set wallpaper.
Mangesh Ghiware [Tue, 8 Oct 2013 03:47:34 +0000 (20:47 -0700)]
am 58b6f484: On K+, intent out to Wallpaper manager for crop and set wallpaper.

* commit '58b6f484263f57009e22fef482a9ae1a4d3f48b6':
  On K+, intent out to Wallpaper manager for crop and set wallpaper.

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 02:43:57 +0000 (19:43 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 02:43:15 +0000 (19:43 -0700)]
Import translations. DO NOT MERGE

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

10 years agoOn K+, intent out to Wallpaper manager for crop and set wallpaper.
Mangesh Ghiware [Mon, 7 Oct 2013 22:51:54 +0000 (15:51 -0700)]
On K+, intent out to Wallpaper manager for crop and set wallpaper.

Bug: 4225598

Change-Id: Ib58a85775ebfd774356d26fd9aa01f2059916300

10 years agoam adfd22c5: am f59ad590: am 391e4a19: Switch Gallery2 to use the support lib for...
Svetoslav Ganov [Mon, 7 Oct 2013 18:39:51 +0000 (11:39 -0700)]
am adfd22c5: am f59ad590: am 391e4a19: Switch Gallery2 to use the support lib for printing.

* commit 'adfd22c5977859e4f08d6a91b8fb1185c52df8a4':
  Switch Gallery2 to use the support lib for printing.

10 years agoam f59ad590: am 391e4a19: Switch Gallery2 to use the support lib for printing.
Svetoslav Ganov [Mon, 7 Oct 2013 18:37:33 +0000 (11:37 -0700)]
am f59ad590: am 391e4a19: Switch Gallery2 to use the support lib for printing.

* commit 'f59ad5904a288648fb1fe7de50fd1199046d5fe5':
  Switch Gallery2 to use the support lib for printing.

10 years agoam 391e4a19: Switch Gallery2 to use the support lib for printing.
Svetoslav Ganov [Mon, 7 Oct 2013 18:33:38 +0000 (11:33 -0700)]
am 391e4a19: Switch Gallery2 to use the support lib for printing.

* commit '391e4a190d4afcfdf89b8e7892e972cc998cdf41':
  Switch Gallery2 to use the support lib for printing.

10 years agoSwitch Gallery2 to use the support lib for printing.
Svetoslav Ganov [Mon, 7 Oct 2013 03:03:32 +0000 (20:03 -0700)]
Switch Gallery2 to use the support lib for printing.

Now we have a class in the support library that uses a correct internal
implemetation based on the API level. On older devices the app does
not crash and on new devices it can print. Also this class does
the heavy lifiting. Gallery2 was not using this class, rather it had
its own (obsolete) implemetation that was not taking into account the
image aspect ratio to provide a hint to the print system for the
orientation to be used.

bug:11099831
Change-Id: I4cd260614af4d9d87ec31d205ee2a5ef02ef5417

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

10 years agoam a965570f: (-s ours) am 5a12848d: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Oct 2013 00:13:50 +0000 (17:13 -0700)]
am a965570f: (-s ours) am 5a12848d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 5a12848d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Oct 2013 00:11:21 +0000 (17:11 -0700)]
am 5a12848d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5a12848d40683e5f45fd86e28377c3bfc068e8b0':
  Import translations. DO NOT MERGE

10 years agoam bbc43b91: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 16:41:02 +0000 (09:41 -0700)]
am bbc43b91: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

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

10 years agoam dbe1d305: (-s ours) am 9fd72934: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sat, 5 Oct 2013 16:41:02 +0000 (09:41 -0700)]
am dbe1d305: (-s ours) am 9fd72934: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 03:45:06 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 03:45:02 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 9fd72934: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 03:44:46 +0000 (20:44 -0700)]
am 9fd72934: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9fd72934d3a41f6a82463d4a20802bf639c89fcc':
  Import translations. DO NOT MERGE

10 years agoam 6dc67ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 03:44:11 +0000 (20:44 -0700)]
am 6dc67ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '6dc67ae34d87dcb5dcd85de3a0b0846bf9acc1b4':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 03:40:39 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 03:40:34 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 02:34:04 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 02:33:26 +0000 (19:33 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 02:27:15 +0000 (19:27 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 02:26:31 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE

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