OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 5 Feb 2013 20:14:01 +0000 (20:14 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 5 Feb 2013 20:13:31 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoam a93d5839: Merge "Remove RS intermediates to trigger a clean build." into gb-ub...
Stephen Hines [Tue, 5 Feb 2013 02:51:52 +0000 (18:51 -0800)]
am a93d5839: Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit 'a93d583970819f2bea4b12f1233655fb9ede3387':
  Remove RS intermediates to trigger a clean build.

11 years agoMerge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce
Stephen Hines [Tue, 5 Feb 2013 02:49:48 +0000 (02:49 +0000)]
Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce

11 years agoRemove RS intermediates to trigger a clean build.
Stephen Hines [Tue, 5 Feb 2013 02:19:04 +0000 (18:19 -0800)]
Remove RS intermediates to trigger a clean build.

Change-Id: I4925dbf21b81876bac85413f8057049e84ca324c

11 years agoam 7d072016: Merge "Handle syncing better" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 02:01:28 +0000 (18:01 -0800)]
am 7d072016: Merge "Handle syncing better" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Reck (1)
* commit '7d07201654ef965f3fe2e322a857fc911cc54ec9':
  Handle syncing better

11 years agoMerge "Handle syncing better" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 02:00:38 +0000 (02:00 +0000)]
Merge "Handle syncing better" into gb-ub-photos-bryce

11 years agoHandle syncing better
John Reck [Tue, 5 Feb 2013 01:18:32 +0000 (17:18 -0800)]
Handle syncing better

 Bug: 8104531
 Limit to every 15 minutes
 Avoid requesting a sync on a MediaSet that's already syncing

Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893

11 years agoam a6405169: Switch Gallery over to RS compatibility library.
Tim Murray [Mon, 4 Feb 2013 22:39:15 +0000 (14:39 -0800)]
am a6405169: Switch Gallery over to RS compatibility library.

# Via Tim Murray
* commit 'a64051696e46fb5d5e1c76e53ac95a4feba18585':
  Switch Gallery over to RS compatibility library.

11 years agoSwitch Gallery over to RS compatibility library.
Tim Murray [Mon, 4 Feb 2013 21:09:27 +0000 (13:09 -0800)]
Switch Gallery over to RS compatibility library.

Change-Id: If27809236534f3b196949bf455faed45c99f3da5

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Feb 2013 18:14:31 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Feb 2013 18:13:39 +0000 (10:13 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam 87e889b1: fix performance problem with large images in draw
John Hoford [Sat, 2 Feb 2013 00:49:16 +0000 (16:49 -0800)]
am 87e889b1: fix performance problem with large images in draw

# Via John Hoford
* commit '87e889b195de98334048bb70bb1263a2ab76c76a':
  fix performance problem with large images in draw

11 years agofix performance problem with large images in draw
John Hoford [Sat, 2 Feb 2013 00:22:50 +0000 (16:22 -0800)]
fix performance problem with large images in draw

Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e

11 years agoam ff7743f5: Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
John Hoford [Fri, 1 Feb 2013 22:24:44 +0000 (14:24 -0800)]
am ff7743f5: Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Hoford (1)
* commit 'ff7743f592fa5499acdbbbb9a0d303ace6f6e08b':
  fix sharpen to work under the new system

11 years agoam c47b572a: Merge "Fix async loading of borders" into gb-ub-photos-bryce
nicolasroard [Fri, 1 Feb 2013 22:24:43 +0000 (14:24 -0800)]
am c47b572a: Merge "Fix async loading of borders" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit 'c47b572abf302992bbdee33f9e36be8de1dfcb6a':
  Fix async loading of borders

11 years agoam 46526e49: Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
Doris Liu [Fri, 1 Feb 2013 22:24:41 +0000 (14:24 -0800)]
am 46526e49: Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '46526e49de8f0a68e107cae2f64c70f8123f2249':
  Move tests from camera to gallery2

11 years agoMerge "fix sharpen to work under the new system" into gb-ub-photos-bryce
John Hoford [Fri, 1 Feb 2013 21:56:26 +0000 (21:56 +0000)]
Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce

11 years agoMerge "Fix async loading of borders" into gb-ub-photos-bryce
nicolasroard [Fri, 1 Feb 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Fix async loading of borders" into gb-ub-photos-bryce

11 years agofix sharpen to work under the new system
John Hoford [Fri, 1 Feb 2013 21:41:16 +0000 (13:41 -0800)]
fix sharpen to work under the new system

Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19

11 years agoFix async loading of borders
nicolasroard [Fri, 1 Feb 2013 21:48:21 +0000 (13:48 -0800)]
Fix async loading of borders

bug:8099597
Change-Id: I62584c87eff03539ec50aafafda4238850b4f743

11 years agoMerge "Move tests from camera to gallery2" into gb-ub-photos-bryce
Doris Liu [Fri, 1 Feb 2013 21:22:25 +0000 (21:22 +0000)]
Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce

11 years agoMove tests from camera to gallery2
Doris Liu [Fri, 1 Feb 2013 03:03:48 +0000 (19:03 -0800)]
Move tests from camera to gallery2

Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9

11 years agoam 55aae5be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 1 Feb 2013 18:35:01 +0000 (10:35 -0800)]
am 55aae5be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '55aae5be9edcb95aed62106018671e68c3f42bda':
  Import translations. DO NOT MERGE

11 years agoam b8c62c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 1 Feb 2013 18:35:00 +0000 (10:35 -0800)]
am b8c62c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit 'b8c62c9ee6ff9c31151860047857fd13b1930a6d':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 1 Feb 2013 18:32:29 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 1 Feb 2013 18:31:59 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 1 Feb 2013 18:31:44 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 1 Feb 2013 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 2007faf1: Merge "Make video snapshot save images in the background." into gb-ub...
Angus Kong [Fri, 1 Feb 2013 18:22:34 +0000 (10:22 -0800)]
am 2007faf1: Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Angus Kong (1)
* commit '2007faf1f1f6f3aa589d907ff3416a671cea9abc':
  Make video snapshot save images in the background.

11 years agoam 1b1a79f1: Fix curves refresh bug
John Hoford [Fri, 1 Feb 2013 18:22:33 +0000 (10:22 -0800)]
am 1b1a79f1: Fix curves refresh bug

# Via John Hoford
* commit '1b1a79f1ccb6f847d017a72fa4c288b2195ffd99':
  Fix curves refresh bug

11 years agoMerge "Make video snapshot save images in the background." into gb-ub-photos-bryce
Angus Kong [Fri, 1 Feb 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce

11 years agoFix curves refresh bug
John Hoford [Fri, 1 Feb 2013 17:56:19 +0000 (09:56 -0800)]
Fix curves refresh bug

Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Feb 2013 16:59:15 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Feb 2013 16:58:55 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Feb 2013 16:58:30 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Feb 2013 16:57:48 +0000 (08:57 -0800)]
Import translations. DO NOT MERGE

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

11 years agoMake video snapshot save images in the background.
Angus Kong [Fri, 1 Feb 2013 02:22:44 +0000 (18:22 -0800)]
Make video snapshot save images in the background.

bug:8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed

11 years agoam 346a15d3: Merge "Animate between photo modules" into gb-ub-photos-bryce
John Reck [Fri, 1 Feb 2013 01:33:51 +0000 (17:33 -0800)]
am 346a15d3: Merge "Animate between photo modules" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Reck (1)
* commit '346a15d3c7452927b3088a2c70410b90dfc36180':
  Animate between photo modules

11 years agoMerge "Animate between photo modules" into gb-ub-photos-bryce
John Reck [Fri, 1 Feb 2013 01:32:42 +0000 (01:32 +0000)]
Merge "Animate between photo modules" into gb-ub-photos-bryce

11 years agoAnimate between photo modules
John Reck [Wed, 7 Nov 2012 21:38:35 +0000 (13:38 -0800)]
Animate between photo modules

Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d

11 years agoam 066f0517: Merge "Make background media saving a service" into gb-ub-photos-bryce
Angus Kong [Thu, 31 Jan 2013 23:09:26 +0000 (15:09 -0800)]
am 066f0517: Merge "Make background media saving a service" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Angus Kong (1)
* commit '066f05178e8c4d8ce67b4b457b6f00ebeac9fcbe':
  Make background media saving a service

11 years agoMerge "Make background media saving a service" into gb-ub-photos-bryce
Angus Kong [Thu, 31 Jan 2013 22:36:34 +0000 (22:36 +0000)]
Merge "Make background media saving a service" into gb-ub-photos-bryce

11 years agoMake background media saving a service
Angus Kong [Wed, 30 Jan 2013 01:43:48 +0000 (17:43 -0800)]
Make background media saving a service

bug:8091328
Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48

11 years agoam 915d60a3: add color selection ui to draw
John Hoford [Thu, 31 Jan 2013 03:30:25 +0000 (19:30 -0800)]
am 915d60a3: add color selection ui to draw

# Via John Hoford
* commit '915d60a378b0ca7bbe3af6312ccd2f4b94eb2da1':
  add color selection ui to draw

11 years agoadd color selection ui to draw
John Hoford [Fri, 25 Jan 2013 21:28:34 +0000 (13:28 -0800)]
add color selection ui to draw

Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02

11 years agoam 5540a0d1: Merge "show enable sync option for canvas" into gb-ub-photos-bryce
John Reck [Thu, 31 Jan 2013 01:02:14 +0000 (17:02 -0800)]
am 5540a0d1: Merge "show enable sync option for canvas" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Reck (1)
* commit '5540a0d130aa295d11e908719923faec3bce4029':
  show enable sync option for canvas

11 years agoMerge "show enable sync option for canvas" into gb-ub-photos-bryce
John Reck [Thu, 31 Jan 2013 01:00:13 +0000 (01:00 +0000)]
Merge "show enable sync option for canvas" into gb-ub-photos-bryce

11 years agoshow enable sync option for canvas
John Reck [Thu, 31 Jan 2013 00:37:48 +0000 (16:37 -0800)]
show enable sync option for canvas

Temporary change for testing

Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961

11 years agoam 27f14ec6: Merge "Clean up invalidate / redraw loop Move the recopy to the main...
nicolasroard [Thu, 31 Jan 2013 00:01:44 +0000 (16:01 -0800)]
am 27f14ec6: Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '27f14ec6ff7565d96f6c838e7417a25c15beade3':
  Clean up invalidate / redraw loop Move the recopy to the main thread

11 years agoMerge "Clean up invalidate / redraw loop Move the recopy to the main thread" into...
nicolasroard [Wed, 30 Jan 2013 23:54:29 +0000 (23:54 +0000)]
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce

11 years agoClean up invalidate / redraw loop
nicolasroard [Tue, 29 Jan 2013 21:57:42 +0000 (13:57 -0800)]
Clean up invalidate / redraw loop
Move the recopy to the main thread

Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce

11 years agoam 0d0ec194: Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 23:25:57 +0000 (15:25 -0800)]
am 0d0ec194: Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit '0d0ec194f3a73267ad29fc7627b1f445bca77338':
  Copy camera resources into Gallery2

11 years agoMerge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 23:24:34 +0000 (23:24 +0000)]
Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce

11 years agoCopy camera resources into Gallery2
Michael Kolb [Tue, 29 Jan 2013 22:03:06 +0000 (14:03 -0800)]
Copy camera resources into Gallery2

Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684

11 years agoam e606b862: Extract constants/boilerplate
John Reck [Tue, 29 Jan 2013 22:55:31 +0000 (14:55 -0800)]
am e606b862: Extract constants/boilerplate

# Via John Reck
* commit 'e606b862f26ba9e499db4f15940f8200841b9dc3':
  Extract constants/boilerplate

11 years agoExtract constants/boilerplate
John Reck [Tue, 29 Jan 2013 21:55:57 +0000 (13:55 -0800)]
Extract constants/boilerplate

Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97

11 years agoam 4588a3cb: Merge "Fix thumbnail generation" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:47:16 +0000 (13:47 -0800)]
am 4588a3cb: Merge "Fix thumbnail generation" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '4588a3cb75457f98b6b0fd1b7dc41e9db2079b16':
  Fix thumbnail generation

11 years agoMerge "Fix thumbnail generation" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:41:51 +0000 (21:41 +0000)]
Merge "Fix thumbnail generation" into gb-ub-photos-bryce

11 years agoam 2da45514: Merge "Importer: when view is reused for same image, don\'t reload"...
Bobby Georgescu [Tue, 29 Jan 2013 21:40:05 +0000 (13:40 -0800)]
am 2da45514: Merge "Importer: when view is reused for same image, don\'t reload" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '2da455143a4cb59d289f24c23b8f93c29da14fd0':
  Importer: when view is reused for same image, don't reload

11 years agoMerge "Importer: when view is reused for same image, don't reload" into gb-ub-photos...
Bobby Georgescu [Tue, 29 Jan 2013 21:38:34 +0000 (21:38 +0000)]
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce

11 years agoFix thumbnail generation
nicolasroard [Tue, 29 Jan 2013 21:37:33 +0000 (13:37 -0800)]
Fix thumbnail generation

Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb

11 years agoImporter: when view is reused for same image, don't reload
Bobby Georgescu [Tue, 29 Jan 2013 21:30:12 +0000 (13:30 -0800)]
Importer: when view is reused for same image, don't reload

Bug: 7968780
Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216

11 years agoam 7bbdf56b: Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:24:55 +0000 (13:24 -0800)]
am 7bbdf56b: Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '7bbdf56b74ec0ba029b1fc5f0d96cf8e8c1e7618':
  Fix scaling + quality parameters

11 years agoMerge "Fix scaling + quality parameters" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:23:46 +0000 (21:23 +0000)]
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce

11 years agoFix scaling + quality parameters
nicolasroard [Tue, 29 Jan 2013 21:16:21 +0000 (13:16 -0800)]
Fix scaling + quality parameters

Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d

11 years agoam b17796f3: Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos...
Michael Kolb [Tue, 29 Jan 2013 20:54:23 +0000 (12:54 -0800)]
am b17796f3: Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit 'b17796f30a1b9cdde29f5b0e338c482ba447a4b1':
  Move Camera Java/Native source into Gallery2

11 years agoMerge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 20:51:56 +0000 (20:51 +0000)]
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce

11 years agoam b380f174: Add comment about MenuExecutor assumptions in BatchService
Bobby Georgescu [Tue, 29 Jan 2013 19:17:48 +0000 (11:17 -0800)]
am b380f174: Add comment about MenuExecutor assumptions in BatchService

# Via Bobby Georgescu
* commit 'b380f17426f419e3663da80985dc62f544d47048':
  Add comment about MenuExecutor assumptions in BatchService

11 years agoAdd comment about MenuExecutor assumptions in BatchService
Bobby Georgescu [Tue, 29 Jan 2013 18:58:34 +0000 (10:58 -0800)]
Add comment about MenuExecutor assumptions in BatchService

Bug: 7998915
Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d

11 years agoMove Camera Java/Native source into Gallery2
Michael Kolb [Tue, 29 Jan 2013 18:33:22 +0000 (10:33 -0800)]
Move Camera Java/Native source into Gallery2

Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1

11 years agoam d0f8807c: Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos...
John Reck [Tue, 29 Jan 2013 01:37:01 +0000 (17:37 -0800)]
am d0f8807c: Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Reck (1)
* commit 'd0f8807ca66b006e4049e32ad187a808c42e1f00':
  Launching gallery shows browse ui on canvas

11 years agoMerge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
John Reck [Tue, 29 Jan 2013 01:35:38 +0000 (01:35 +0000)]
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce

11 years agoam 2251adcd: Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
Ruben Brunk [Tue, 29 Jan 2013 00:56:43 +0000 (16:56 -0800)]
am 2251adcd: Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit '2251adcd841d597eb6673fc6d2810979753ceb73':
  Fixed BasicEditor NPE.

11 years agoMerge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
Ruben Brunk [Tue, 29 Jan 2013 00:54:58 +0000 (00:54 +0000)]
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce

11 years agoam 7805371b: Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos...
Bobby Georgescu [Tue, 29 Jan 2013 00:53:32 +0000 (16:53 -0800)]
am 7805371b: Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '7805371bbe17bca129bfd1902f23227b27312854':
  Fix ANRs due to waiting for IO on UI thread

11 years agoMerge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 00:51:51 +0000 (00:51 +0000)]
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce

11 years agoam 3a67b242: Fix apply geometry.
nicolasroard [Tue, 29 Jan 2013 00:51:22 +0000 (16:51 -0800)]
am 3a67b242: Fix apply geometry.

# Via nicolasroard
* commit '3a67b242889f81d3a124de7a9763a6ca72bc5194':
  Fix apply geometry.

11 years agoFix apply geometry.
nicolasroard [Tue, 29 Jan 2013 00:46:12 +0000 (16:46 -0800)]
Fix apply geometry.

bug:8068166
Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8

11 years agoLaunching gallery shows browse ui on canvas
John Reck [Tue, 29 Jan 2013 00:38:47 +0000 (16:38 -0800)]
Launching gallery shows browse ui on canvas

Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622

11 years agoFixed BasicEditor NPE.
Ruben Brunk [Tue, 29 Jan 2013 00:30:26 +0000 (16:30 -0800)]
Fixed BasicEditor NPE.

Bug: 8068020
Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5

11 years agoFix ANRs due to waiting for IO on UI thread
Bobby Georgescu [Tue, 29 Jan 2013 00:16:44 +0000 (16:16 -0800)]
Fix ANRs due to waiting for IO on UI thread

Bug: 7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab

11 years agoam ca593b02: Code drop
John Reck [Mon, 28 Jan 2013 21:45:31 +0000 (13:45 -0800)]
am ca593b02: Code drop

# Via John Reck
* commit 'ca593b02ab6a3054f625878621ee5117953f7385':
  Code drop

11 years agoCode drop
John Reck [Mon, 28 Jan 2013 21:35:56 +0000 (13:35 -0800)]
Code drop

Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8

11 years agoam c1bbc208: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Jan 2013 18:51:08 +0000 (10:51 -0800)]
am c1bbc208: (-s ours) Import translations. DO NOT MERGE

# Via Baligh Uddin
* commit 'c1bbc208d1bc3541ca7ae6816de244fe7cec865c':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Jan 2013 16:59:39 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam 0f19e0af: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 23 Jan 2013 22:38:32 +0000 (14:38 -0800)]
am 0f19e0af: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '0f19e0af5bffb88436912a1028f6dd8851f4e511':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 23 Jan 2013 22:36:36 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 23 Jan 2013 22:36:04 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Jan 2013 19:53:57 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Jan 2013 19:53:27 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam 24063430: Revert "Switch Gallery over to RS compatibility library."
Stephen Hines [Wed, 23 Jan 2013 18:42:11 +0000 (10:42 -0800)]
am 24063430: Revert "Switch Gallery over to RS compatibility library."

* commit '240634303ac2368ab0faa19a8f8f4687cac5fc1e':
  Revert "Switch Gallery over to RS compatibility library."

11 years agoRevert "Switch Gallery over to RS compatibility library."
Stephen Hines [Wed, 23 Jan 2013 18:38:42 +0000 (18:38 +0000)]
Revert "Switch Gallery over to RS compatibility library."

This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c

Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50

11 years agoam 0746ce09: Switch Gallery over to RS compatibility library.
Stephen Hines [Wed, 23 Jan 2013 18:24:51 +0000 (10:24 -0800)]
am 0746ce09: Switch Gallery over to RS compatibility library.

* commit '0746ce0977cde616d25ce35fee0d8d554235a21c':
  Switch Gallery over to RS compatibility library.

11 years agoSwitch Gallery over to RS compatibility library.
Stephen Hines [Thu, 17 Jan 2013 01:54:08 +0000 (17:54 -0800)]
Switch Gallery over to RS compatibility library.

Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad

11 years agoam b49e4804: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 23 Jan 2013 01:05:37 +0000 (17:05 -0800)]
am b49e4804: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 23 Jan 2013 01:03:24 +0000 (01:03 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 23 Jan 2013 01:03:13 +0000 (01:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 57eedfd9: Better caching for RS filters
nicolasroard [Wed, 23 Jan 2013 00:32:01 +0000 (16:32 -0800)]
am 57eedfd9: Better caching for RS filters

* commit '57eedfd99676913f575b1f76e3a874026d1ddf7c':
  Better caching for RS filters

11 years agoBetter caching for RS filters
nicolasroard [Wed, 16 Jan 2013 03:57:49 +0000 (19:57 -0800)]
Better caching for RS filters

Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d