OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoam 75630e30: am c6e44c1d: am b6b1d176: Merge "Fix style for crop activity" into gb...
nicolasroard [Tue, 24 Sep 2013 21:42:24 +0000 (14:42 -0700)]
am 75630e30: am c6e44c1d: am b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad

* commit '75630e307327c3e59f6a50ca732851d973d2fe99':
  Fix style for crop activity

10 years agoam 893d4d6f: am 63766dc6: am 2aed1baf: De-blue gallery
Mindy Pereira [Tue, 24 Sep 2013 21:42:23 +0000 (14:42 -0700)]
am 893d4d6f: am 63766dc6: am 2aed1baf: De-blue gallery

* commit '893d4d6fbb9e1f42fcf5783cf7de96eb001e8ab2':
  De-blue gallery

10 years agoam c6e44c1d: am b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 21:37:29 +0000 (14:37 -0700)]
am c6e44c1d: am b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad

* commit 'c6e44c1dba6fdd74d1fe9c23722d7311fb2f9124':
  Fix style for crop activity

10 years agoam 63766dc6: am 2aed1baf: De-blue gallery
Mindy Pereira [Tue, 24 Sep 2013 21:37:27 +0000 (14:37 -0700)]
am 63766dc6: am 2aed1baf: De-blue gallery

* commit '63766dc68860d1127da58dbab0127194dce194a3':
  De-blue gallery

10 years agoam b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 21:34:24 +0000 (14:34 -0700)]
am b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad

* commit 'b6b1d176fb50047a1590f5c601b0c54a6b1db6f8':
  Fix style for crop activity

10 years agoMerge "Fix style for crop activity" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 21:31:51 +0000 (21:31 +0000)]
Merge "Fix style for crop activity" into gb-ub-photos-carlsbad

10 years agoam 2aed1baf: De-blue gallery
Mindy Pereira [Tue, 24 Sep 2013 21:31:12 +0000 (14:31 -0700)]
am 2aed1baf: De-blue gallery

* commit '2aed1baf6ea4afa7a78ea24ee822a95d75534b8b':
  De-blue gallery

10 years agoFix style for crop activity
nicolasroard [Tue, 24 Sep 2013 21:20:04 +0000 (14:20 -0700)]
Fix style for crop activity

bug:10786662
Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b

10 years agoDe-blue gallery
Mindy Pereira [Tue, 24 Sep 2013 16:08:06 +0000 (09:08 -0700)]
De-blue gallery

fixes b/10914665 de-blue gallery
Change-Id: I961d5792a9e1a0187581439fa58e237b4ddeba5b

10 years agoam 53c835d0: am 357df0a1: am 1a65cb12: Merge "Limit string to 25 characters" into...
nicolasroard [Tue, 24 Sep 2013 17:26:03 +0000 (10:26 -0700)]
am 53c835d0: am 357df0a1: am 1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad

* commit '53c835d038296ab7e445bb10dd84e340c87f7ae9':
  Limit string to 25 characters

10 years agoam 5ec6c21c: am df392823: am 8db4f458: Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 17:26:02 +0000 (10:26 -0700)]
am 5ec6c21c: am df392823: am 8db4f458: Fix export dialog UI

* commit '5ec6c21c06a3fc35466baef022824cd9582034fe':
  Fix export dialog UI

10 years agoam 93d5734c: am 508a14fe: am d04aaf62: Merge "Fix crash in caching pipeline" into...
nicolasroard [Tue, 24 Sep 2013 17:26:02 +0000 (10:26 -0700)]
am 93d5734c: am 508a14fe: am d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad

* commit '93d5734c67f1acb746e730aeba624473aa18c6a0':
  Fix crash in caching pipeline

10 years agoam 27031055: am b920df87: am 26f23e62: Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 17:26:01 +0000 (10:26 -0700)]
am 27031055: am b920df87: am 26f23e62: Fix crashes after switching languages

* commit '270310558acd3cae49762f0d2a29addf211ebaef':
  Fix crashes after switching languages

10 years agoam ecf4ba60: am 95d3f081: am 105fbcf3: Fix issues with RTL support
nicolasroard [Tue, 24 Sep 2013 17:23:57 +0000 (10:23 -0700)]
am ecf4ba60: am 95d3f081: am 105fbcf3: Fix issues with RTL support

* commit 'ecf4ba608a71c859a293eddb17799365929e2638':
  Fix issues with RTL support

10 years agoam dad77ba8: am 5a03286c: am eccdc428: Merge "Fix animation in tablet" into gb-ub...
nicolasroard [Tue, 24 Sep 2013 17:23:56 +0000 (10:23 -0700)]
am dad77ba8: am 5a03286c: am eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad

* commit 'dad77ba87dc2df4ca55f9c6aadbc6bbab95c51f9':
  Fix animation in tablet

10 years agoam 508abca1: am 98205f6c: am 889b1b25: Merge "Add (back) receiver to disable camera...
Mangesh Ghiware [Tue, 24 Sep 2013 17:23:55 +0000 (10:23 -0700)]
am 508abca1: am 98205f6c: am 889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad

* commit '508abca1ed543670c7c0655010a2ec52efb92c90':
  Add (back) receiver to disable camera.

10 years agoam 4e7e7bc2: am 52bff081: am 32646aab: Fix reset
nicolasroard [Tue, 24 Sep 2013 17:23:55 +0000 (10:23 -0700)]
am 4e7e7bc2: am 52bff081: am 32646aab: Fix reset

* commit '4e7e7bc25b2bf76f07892b7a5fc2cf48c8424add':
  Fix reset

10 years agoam 5d397e5c: am a88be532: am 3dcb77a2: Update Gallery due to API changes.
Svetoslav Ganov [Tue, 24 Sep 2013 17:23:54 +0000 (10:23 -0700)]
am 5d397e5c: am a88be532: am 3dcb77a2: Update Gallery due to API changes.

* commit '5d397e5cc735665d57e4ae7cbee34c4ebbcc1836':
  Update Gallery due to API changes.

10 years agoam 357df0a1: am 1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos...
nicolasroard [Tue, 24 Sep 2013 06:40:19 +0000 (23:40 -0700)]
am 357df0a1: am 1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad

* commit '357df0a1e1f53ad7975e728d8542397f5d004807':
  Limit string to 25 characters

10 years agoam 1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:37:28 +0000 (23:37 -0700)]
am 1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad

* commit '1a65cb127c8002d8be57e767147d86bd131c556c':
  Limit string to 25 characters

10 years agoam df392823: am 8db4f458: Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 06:36:58 +0000 (23:36 -0700)]
am df392823: am 8db4f458: Fix export dialog UI

* commit 'df392823679bd52e57ecad3f2f764981510e6fee':
  Fix export dialog UI

10 years agoMerge "Limit string to 25 characters" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (06:34 +0000)]
Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad

10 years agoam 8db4f458: Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (23:34 -0700)]
am 8db4f458: Fix export dialog UI

* commit '8db4f458ac9d28a508471dfb874abbe170a5ac23':
  Fix export dialog UI

10 years agoLimit string to 25 characters
nicolasroard [Tue, 24 Sep 2013 06:30:36 +0000 (23:30 -0700)]
Limit string to 25 characters

bug:10889576
Change-Id: Ib314b84d8def7dc1300fc738a1a461d37549d6e1

10 years agoam 508a14fe: am d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos...
nicolasroard [Tue, 24 Sep 2013 06:29:28 +0000 (23:29 -0700)]
am 508a14fe: am d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad

* commit '508a14fee906506805057c8c4e5ad670dda2cc6f':
  Fix crash in caching pipeline

10 years agoam b920df87: am 26f23e62: Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 06:29:27 +0000 (23:29 -0700)]
am b920df87: am 26f23e62: Fix crashes after switching languages

* commit 'b920df87814fd664db44391f1c50488c99a1b4cb':
  Fix crashes after switching languages

10 years agoam d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:28:11 +0000 (23:28 -0700)]
am d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad

* commit 'd04aaf626da8aea7f8f18341499e0b51a60e4d32':
  Fix crash in caching pipeline

10 years agoam 26f23e62: Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 06:28:10 +0000 (23:28 -0700)]
am 26f23e62: Fix crashes after switching languages

* commit '26f23e62096eb50344815e1b066e9a1efb629bb0':
  Fix crashes after switching languages

10 years agoFix export dialog UI
nicolasroard [Tue, 24 Sep 2013 02:26:20 +0000 (19:26 -0700)]
Fix export dialog UI

bug:10889576
bug:10712083

Change-Id: I7921c06365775625a85e3d0a997d844c42586b01

10 years agoMerge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:26:27 +0000 (06:26 +0000)]
Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad

10 years agoFix crash in caching pipeline
nicolasroard [Tue, 24 Sep 2013 04:42:02 +0000 (21:42 -0700)]
Fix crash in caching pipeline

Geometry filters wrongly collapsed with other filters

bug:10903204
Change-Id: Iaee3082e605f4cdaba236df014fb41a4975d05d6

10 years agoam 95d3f081: am 105fbcf3: Fix issues with RTL support
nicolasroard [Tue, 24 Sep 2013 02:00:36 +0000 (19:00 -0700)]
am 95d3f081: am 105fbcf3: Fix issues with RTL support

* commit '95d3f0817c04b0ed08c41856dc92e27db552115b':
  Fix issues with RTL support

10 years agoam 5a03286c: am eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 01:59:50 +0000 (18:59 -0700)]
am 5a03286c: am eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad

* commit '5a03286c355d73a24be4194e54accc46f67b8c2d':
  Fix animation in tablet

10 years agoam 98205f6c: am 889b1b25: Merge "Add (back) receiver to disable camera." into gb...
Mangesh Ghiware [Tue, 24 Sep 2013 01:59:20 +0000 (18:59 -0700)]
am 98205f6c: am 889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad

* commit '98205f6c1b642e3b4572e1c7ebf1184bfa81b2af':
  Add (back) receiver to disable camera.

10 years agoam 52bff081: am 32646aab: Fix reset
nicolasroard [Tue, 24 Sep 2013 01:59:17 +0000 (18:59 -0700)]
am 52bff081: am 32646aab: Fix reset

* commit '52bff081cddf97aed7c1cf76292b2d3266a9e06c':
  Fix reset

10 years agoam a88be532: am 3dcb77a2: Update Gallery due to API changes.
Svetoslav Ganov [Tue, 24 Sep 2013 01:59:15 +0000 (18:59 -0700)]
am a88be532: am 3dcb77a2: Update Gallery due to API changes.

* commit 'a88be532a45b09855be6d5ffec6a1b3ea0b3efc0':
  Update Gallery due to API changes.

10 years agoFix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 01:36:25 +0000 (18:36 -0700)]
Fix crashes after switching languages

bug:8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79

10 years agoam 105fbcf3: Fix issues with RTL support
nicolasroard [Mon, 23 Sep 2013 23:21:32 +0000 (16:21 -0700)]
am 105fbcf3: Fix issues with RTL support

* commit '105fbcf3289491aa4f590057e304fee33f1c88ca':
  Fix issues with RTL support

10 years agoFix issues with RTL support
nicolasroard [Mon, 23 Sep 2013 23:12:10 +0000 (16:12 -0700)]
Fix issues with RTL support

bug:8148068
Change-Id: I869e1a90686c46f8076a66f94040ad03c7c6ca10

10 years agoam eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 20:51:12 +0000 (13:51 -0700)]
am eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad

* commit 'eccdc4285476c98bff3dc5bde113b7f855b18346':
  Fix animation in tablet

10 years agoMerge "Fix animation in tablet" into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 20:48:12 +0000 (20:48 +0000)]
Merge "Fix animation in tablet" into gb-ub-photos-carlsbad

10 years agoFix animation in tablet
nicolasroard [Mon, 23 Sep 2013 20:43:23 +0000 (13:43 -0700)]
Fix animation in tablet

- fix anim in tablet
- fix double-tap timings
- re-add draw in AOSP

Change-Id: I53be8f348ed7927812afa8a4ba84841e4b9d3f4f

10 years agoam 889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
Mangesh Ghiware [Mon, 23 Sep 2013 18:37:50 +0000 (11:37 -0700)]
am 889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad

* commit '889b1b25b9928624ea1ca51cba51642d5cf4044d':
  Add (back) receiver to disable camera.

10 years agoMerge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
Mangesh Ghiware [Mon, 23 Sep 2013 18:34:52 +0000 (18:34 +0000)]
Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad

10 years agoam 32646aab: Fix reset
nicolasroard [Mon, 23 Sep 2013 18:34:25 +0000 (11:34 -0700)]
am 32646aab: Fix reset

* commit '32646aabd8228e1494ba090a02ffb8adaa369127':
  Fix reset

10 years agoFix reset
nicolasroard [Sat, 21 Sep 2013 02:00:33 +0000 (19:00 -0700)]
Fix reset

bug:10788166
Change-Id: I989c2caef8ccf4ff7ca84545aed35941248f8034

10 years agoam 3dcb77a2: Update Gallery due to API changes.
Svetoslav Ganov [Mon, 23 Sep 2013 18:30:11 +0000 (11:30 -0700)]
am 3dcb77a2: Update Gallery due to API changes.

* commit '3dcb77a23d80046aa0c9af9ec32394432031d417':
  Update Gallery due to API changes.

10 years agoUpdate Gallery due to API changes.
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.

bug:10461180

Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24

10 years agoAdd (back) receiver to disable camera.
Mangesh Ghiware [Sun, 22 Sep 2013 20:00:24 +0000 (13:00 -0700)]
Add (back) receiver to disable camera.

Bug: 10411981
Change-Id: Icff31d2da466746ef6b00d4be32e92067cebd1f1

10 years agoam a3cd56cc: am 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into...
nicolasroard [Sat, 21 Sep 2013 02:06:30 +0000 (19:06 -0700)]
am a3cd56cc: am 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

* commit 'a3cd56cc31f76b68832952671a59accecc9b3aa3':
  Fix crash / jank / presets add

10 years agoam 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos...
nicolasroard [Sat, 21 Sep 2013 02:01:27 +0000 (19:01 -0700)]
am 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

* commit '635faca5953f313a1fb0fd1cd62e65699e3c565b':
  Fix crash / jank / presets add

10 years agoam aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
nicolasroard [Sat, 21 Sep 2013 01:59:05 +0000 (18:59 -0700)]
am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

* commit 'aff375e3d13c6e593414399e7374ead96b5e43b9':
  Fix crash / jank / presets add

10 years agoMerge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
nicolasroard [Sat, 21 Sep 2013 01:57:15 +0000 (01:57 +0000)]
Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

10 years agoFix crash / jank / presets add
nicolasroard [Sat, 21 Sep 2013 01:49:41 +0000 (18:49 -0700)]
Fix crash / jank / presets add

- don't cache immutable bitmaps
- fix junk in anims/zoom/constrain
- fix edge glow when moving
- fix double-tap zoom
- fix presets / user presets adds
- fix state panel names for geometry ops

bug:10803026
Change-Id: I9328d7005d3ecee3566c104c3392de9325c50b74

10 years agoam bde2f28f: am a7056872: am a552bfde: clarify strings
John Hoford [Sat, 21 Sep 2013 00:45:27 +0000 (17:45 -0700)]
am bde2f28f: am a7056872: am a552bfde: clarify strings

* commit 'bde2f28f3fb428d23a28bce8f27f11f708d7febd':
  clarify strings

10 years agoam a7056872: am a552bfde: clarify strings
John Hoford [Sat, 21 Sep 2013 00:42:45 +0000 (17:42 -0700)]
am a7056872: am a552bfde: clarify strings

* commit 'a70568725849c15cd8532199b0e4b8677efdbf67':
  clarify strings

10 years agoam a552bfde: clarify strings
John Hoford [Sat, 21 Sep 2013 00:38:34 +0000 (17:38 -0700)]
am a552bfde: clarify strings

* commit 'a552bfdede68643270e72f6ca65cb0cde16f2c7f':
  clarify strings

10 years agoclarify strings
John Hoford [Sat, 21 Sep 2013 00:28:18 +0000 (17:28 -0700)]
clarify strings

bug:10602303
bug:10558554
bug:10489263
Change-Id: I4cabada74244d535eb023e52a36bca0897fb75fe

10 years agoam a7590adf: am eef0ca49: am e56abc70: prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 23:30:03 +0000 (16:30 -0700)]
am a7590adf: am eef0ca49: am e56abc70: prevent editing of GIF

* commit 'a7590adf06343851e7fb8c62764a292228123c7c':
  prevent editing of GIF

10 years agoam eef0ca49: am e56abc70: prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 23:27:39 +0000 (16:27 -0700)]
am eef0ca49: am e56abc70: prevent editing of GIF

* commit 'eef0ca494583fe37504d12efe4b8f1c7d6ccb8bd':
  prevent editing of GIF

10 years agoam e56abc70: prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 23:24:58 +0000 (16:24 -0700)]
am e56abc70: prevent editing of GIF

* commit 'e56abc7049e35f705161086fe51d0ecdbf451b8b':
  prevent editing of GIF

10 years agoprevent editing of GIF
John Hoford [Fri, 20 Sep 2013 22:14:51 +0000 (15:14 -0700)]
prevent editing of GIF

bug:10642974
Change-Id: Ic61da19f6106c9d42c5b39ae9cc0cf0765f6d1ae

10 years agoam abe4e6ed: am 7599aaad: am c491ad2b: remove print for video
John Hoford [Fri, 20 Sep 2013 21:22:08 +0000 (14:22 -0700)]
am abe4e6ed: am 7599aaad: am c491ad2b: remove print for video

* commit 'abe4e6ede28c11d339668fb8039cf5d2020e77eb':
  remove print for video

10 years agoam 7599aaad: am c491ad2b: remove print for video
John Hoford [Fri, 20 Sep 2013 21:18:40 +0000 (14:18 -0700)]
am 7599aaad: am c491ad2b: remove print for video

* commit '7599aaad4b43fec4fac1a09e5a6e085d86e4bf2a':
  remove print for video

10 years agoam c491ad2b: remove print for video
John Hoford [Fri, 20 Sep 2013 21:13:47 +0000 (14:13 -0700)]
am c491ad2b: remove print for video

* commit 'c491ad2b7630eed7cf43ef0c1064bd4fe42e06a1':
  remove print for video

10 years agoremove print for video
John Hoford [Fri, 20 Sep 2013 20:50:37 +0000 (13:50 -0700)]
remove print for video

bug:10455873
Change-Id: I8f62881b95ad8cd3fff73452eb7d91b05b1ddd8d

10 years agoam 99a532f2: am 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb...
John Hoford [Fri, 20 Sep 2013 18:22:12 +0000 (11:22 -0700)]
am 99a532f2: am 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad

* commit '99a532f2ca0efb43e1023d56f2329655e47ba476':
  Fix string capitalization

10 years agoam 343d8d6a: am e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten...
John Hoford [Fri, 20 Sep 2013 18:22:11 +0000 (11:22 -0700)]
am 343d8d6a: am e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad

* commit '343d8d6ad10652163c07b801cb02da12d3f493d0':
  fix grid drawing bug in ImageStraighten

10 years agoam aa16cb42: am c3ad457f: Update Gallery due to API changes.
Svetoslav Ganov [Fri, 20 Sep 2013 18:21:08 +0000 (11:21 -0700)]
am aa16cb42: am c3ad457f: Update Gallery due to API changes.

* commit 'aa16cb42e1882938bd8f34472e96ccac6c0275c8':
  Update Gallery due to API changes.

10 years agoam fd3e5e68: am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampolin...
Mangesh Ghiware [Fri, 20 Sep 2013 18:20:28 +0000 (11:20 -0700)]
am fd3e5e68: am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

* commit 'fd3e5e687e93fca4d81a9036388d6bf19c875703':
  Use the same taskAffinity for trampoline as Camera

10 years agoam d858450e: (-s ours) am 8b22f385: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 20 Sep 2013 16:59:03 +0000 (09:59 -0700)]
am d858450e: (-s ours) am 8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 6edca9a6: am 1c30f5dc: am 962cf04c: change the max print resolution
John Hoford [Fri, 20 Sep 2013 16:58:10 +0000 (09:58 -0700)]
am 6edca9a6: am 1c30f5dc: am 962cf04c: change the max print resolution

* commit '6edca9a69d1bc918f5d23efe6138e0345267757c':
  change the max print resolution

10 years agoam 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:31:30 +0000 (09:31 -0700)]
am 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad

* commit '1940b05cbba9a7ed0b2bfed50f052fa64c45e70c':
  Fix string capitalization

10 years agoam e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb...
John Hoford [Fri, 20 Sep 2013 16:31:30 +0000 (09:31 -0700)]
am e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad

* commit 'e4a1c7caa23d77b56dca5be6325c5dcebf628543':
  fix grid drawing bug in ImageStraighten

10 years agoam 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:27:20 +0000 (09:27 -0700)]
am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad

* commit '36a1262a0138c64b56595b1209bac92d00211f51':
  Fix string capitalization

10 years agoam 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:27:19 +0000 (09:27 -0700)]
am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad

* commit '76ef9162b8323a6a48e339895cbd8d428a74a230':
  fix grid drawing bug in ImageStraighten

10 years agoMerge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:24:21 +0000 (16:24 +0000)]
Merge "Fix string capitalization" into gb-ub-photos-carlsbad

10 years agoMerge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:24:08 +0000 (16:24 +0000)]
Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad

10 years agoFix string capitalization
John Hoford [Fri, 20 Sep 2013 16:00:06 +0000 (09:00 -0700)]
Fix string capitalization

bug:10487803
Change-Id: I16c18388ac47851f3fffcca8be13eb77b60ddbfb

10 years agofix grid drawing bug in ImageStraighten
John Hoford [Fri, 20 Sep 2013 14:41:52 +0000 (07:41 -0700)]
fix grid drawing bug in ImageStraighten

Change-Id: I4fec941385dd819afc30922823a087cd9962824b

10 years agoam c3ad457f: Update Gallery due to API changes.
Svetoslav Ganov [Fri, 20 Sep 2013 01:28:14 +0000 (18:28 -0700)]
am c3ad457f: Update Gallery due to API changes.

* commit 'c3ad457f84686754d8e7a6f78907a9b82391b00f':
  Update Gallery due to API changes.

10 years agoUpdate Gallery due to API changes.
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.

bug:10461180

Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24

10 years agoam c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera...
Mangesh Ghiware [Thu, 19 Sep 2013 23:46:15 +0000 (16:46 -0700)]
am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

* commit 'c12bb31340542493e0083f999fe687acf938f09c':
  Use the same taskAffinity for trampoline as Camera

10 years agoam 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub...
Mangesh Ghiware [Thu, 19 Sep 2013 23:44:13 +0000 (16:44 -0700)]
am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

* commit '6904a72d84d6662c00be83186468600f84448590':
  Use the same taskAffinity for trampoline as Camera

10 years agoMerge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 19 Sep 2013 23:42:02 +0000 (23:42 +0000)]
Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

10 years agoUse the same taskAffinity for trampoline as Camera
Mangesh Ghiware [Thu, 19 Sep 2013 22:56:15 +0000 (15:56 -0700)]
Use the same taskAffinity for trampoline as Camera

Bug: 10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f

10 years agoam 8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:38:46 +0000 (14:38 -0700)]
am 8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8b22f385a5ac36cdf16494679b8535c9393eb6ec':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 19 Sep 2013 21:34:27 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:34:23 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 19 Sep 2013 21:33:27 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 1c30f5dc: am 962cf04c: change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:28:57 +0000 (12:28 -0700)]
am 1c30f5dc: am 962cf04c: change the max print resolution

* commit '1c30f5dc1334af8b68c0a5ecd15b5c7528f81cc5':
  change the max print resolution

10 years agoam 962cf04c: change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:25:41 +0000 (12:25 -0700)]
am 962cf04c: change the max print resolution

* commit '962cf04c60249c2d116f9ee07e747180bee46014':
  change the max print resolution

10 years agochange the max print resolution
John Hoford [Thu, 19 Sep 2013 19:04:41 +0000 (12:04 -0700)]
change the max print resolution

Change-Id: Ie2cc1c3f40675ae163438c9b09f26e4ac1881367

10 years agoam 3d715974: am 317ab571: am cdd4b82b: remove analytics
John Hoford [Thu, 19 Sep 2013 17:16:52 +0000 (10:16 -0700)]
am 3d715974: am 317ab571: am cdd4b82b: remove analytics

* commit '3d715974f12c238b4f67a2a6ebfa4259634f041c':
  remove analytics

10 years agoam 317ab571: am cdd4b82b: remove analytics
John Hoford [Thu, 19 Sep 2013 17:14:23 +0000 (10:14 -0700)]
am 317ab571: am cdd4b82b: remove analytics

* commit '317ab571bca79f0a1da3748d6824342216cfdb27':
  remove analytics

10 years agoam cdd4b82b: remove analytics
John Hoford [Thu, 19 Sep 2013 17:09:27 +0000 (10:09 -0700)]
am cdd4b82b: remove analytics

* commit 'cdd4b82b85f5e134b3357e75d735c5faeada70c9':
  remove analytics

10 years agoremove analytics
John Hoford [Thu, 19 Sep 2013 16:48:37 +0000 (09:48 -0700)]
remove analytics

bug:9467671
Change-Id: I0d0cfc31e152605c42313db5f6603dbccf76fd82

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:26:47 +0000 (03:26 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:26:12 +0000 (03:26 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:21:52 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE

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