OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into...
Ruben Brunk [Thu, 21 Feb 2013 22:17:50 +0000 (14:17 -0800)]
am e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce

* commit 'e406ec4ddcfe6336c4119de9044b27f38197fff7':
  Temporary handling when running out of heap in filtershow.

11 years agoam 8921c28c: add highlight filter
John Hoford [Thu, 21 Feb 2013 22:17:49 +0000 (14:17 -0800)]
am 8921c28c: add highlight filter

* commit '8921c28c7333ad2b4d34f013904ad4737044f366':
  add highlight filter

11 years agoam 91b80b25: Remove SliderController class
nicolasroard [Thu, 21 Feb 2013 22:17:48 +0000 (14:17 -0800)]
am 91b80b25: Remove SliderController class

* commit '91b80b2560e663b15ee75ab1bca775028c7868c0':
  Remove SliderController class

11 years agoam 48f739a3: Merge "Scaling down the stress test defaults iteration counts to some...
Jason Noguchi [Thu, 21 Feb 2013 22:17:48 +0000 (14:17 -0800)]
am 48f739a3: Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block o

* commit '48f739a395194ffcd589751c8689a75721b2ce97':
  Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite.

11 years agoam 431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Feb 2013 22:17:47 +0000 (14:17 -0800)]
am 431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce

* commit '431aa19d3ab2e9d7d87ef6ee67984a4c649841c0':
  Remove slider in ImageShow, cleanup code

11 years agoam 8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Feb 2013 22:17:46 +0000 (14:17 -0800)]
am 8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce

* commit '8850b8e776d984a3924e9849629f096c57920a7a':
  Fix NPE for when camera is disabled

11 years agoam 969fc020: Fix typo
nicolasroard [Thu, 21 Feb 2013 22:17:45 +0000 (14:17 -0800)]
am 969fc020: Fix typo

* commit '969fc02063b47fc2151a6fc6ef9af9793da4c08a':
  Fix typo

11 years agoMerge "Temporary handling when running out of heap in filtershow." into gb-ub-photos...
Ruben Brunk [Thu, 21 Feb 2013 21:12:21 +0000 (21:12 +0000)]
Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce

11 years agoTemporary handling when running out of heap in filtershow.
Ruben Brunk [Thu, 21 Feb 2013 06:45:55 +0000 (22:45 -0800)]
Temporary handling when running out of heap in filtershow.

Bug: 8233895
Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b

11 years agoadd highlight filter
John Hoford [Thu, 21 Feb 2013 01:50:42 +0000 (17:50 -0800)]
add highlight filter

Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872

11 years agoRemove SliderController class
nicolasroard [Thu, 21 Feb 2013 17:52:14 +0000 (09:52 -0800)]
Remove SliderController class

Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331

11 years agoMerge "Scaling down the stress test defaults iteration counts to some base level...
Jason Noguchi [Thu, 21 Feb 2013 04:33:47 +0000 (04:33 +0000)]
Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce

11 years agoMerge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Feb 2013 04:07:27 +0000 (04:07 +0000)]
Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce

11 years agoMerge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Feb 2013 03:36:46 +0000 (03:36 +0000)]
Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce

11 years agoRemove slider in ImageShow, cleanup code
nicolasroard [Thu, 21 Feb 2013 03:32:37 +0000 (19:32 -0800)]
Remove slider in ImageShow, cleanup code

Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683

11 years agoFix typo
nicolasroard [Thu, 21 Feb 2013 01:44:51 +0000 (17:44 -0800)]
Fix typo

Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b

11 years agoam df0b0c4e: Add pinch to zoom
nicolasroard [Thu, 21 Feb 2013 01:08:05 +0000 (17:08 -0800)]
am df0b0c4e: Add pinch to zoom

* commit 'df0b0c4eaafcc9e4652fe6ec0791e4abe1c3b750':
  Add pinch to zoom

11 years agoAdd pinch to zoom
nicolasroard [Fri, 15 Feb 2013 00:33:01 +0000 (16:33 -0800)]
Add pinch to zoom

Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a

11 years agoFix NPE for when camera is disabled
Doris Liu [Thu, 21 Feb 2013 00:29:44 +0000 (16:29 -0800)]
Fix NPE for when camera is disabled

Bug: 7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639

11 years agoScaling down the stress test defaults iteration counts to some base level.
Jason Noguchi [Wed, 20 Feb 2013 22:42:27 +0000 (14:42 -0800)]
Scaling down the stress test defaults iteration counts to some base level.
For true stress testing, need to pass arguments to scale these back up to 100.
Also, temporarily removing SwitchPreview test which needs updating and currently
would block other tests in stress suite.

Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e

11 years agoam 88158f57: Removed unsupported GL operations.
Ruben Brunk [Wed, 20 Feb 2013 23:36:19 +0000 (15:36 -0800)]
am 88158f57: Removed unsupported GL operations.

* commit '88158f577a2d80a7a3ab5ad92452b6e32b059271':
  Removed unsupported GL operations.

11 years agoRemoved unsupported GL operations.
Ruben Brunk [Wed, 20 Feb 2013 22:44:02 +0000 (14:44 -0800)]
Removed unsupported GL operations.

Bug: 8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74

11 years agoMerge remote-tracking branch 'goog/jb-mr2-release'
Ed Heyl [Wed, 20 Feb 2013 21:47:32 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'

11 years agoam c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
Victor Doba [Wed, 20 Feb 2013 17:31:38 +0000 (09:31 -0800)]
am c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce

* commit 'c8e006639baf1512715e0d7f2c02f88204ab55c0':
  Show the Utility Panel by default.

11 years agoMerge "Show the Utility Panel by default." into gb-ub-photos-bryce
Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce

11 years agoam 1863a311: fix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:45:14 +0000 (08:45 -0800)]
am 1863a311: fix vignette startup issues

* commit '1863a3119a802517b1c2a53763f904f73fdc940b':
  fix vignette startup issues

11 years agofix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]
fix vignette startup issues

Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 20 Feb 2013 13:56:07 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoam a93d5ee9: add movable vignette
John Hoford [Tue, 19 Feb 2013 23:35:59 +0000 (15:35 -0800)]
am a93d5ee9: add movable vignette

* commit 'a93d5ee9c409e2328dcbe2326591436f8ac23146':
  add movable vignette

11 years agoadd movable vignette
John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]
add movable vignette

Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d

11 years agoam 03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Tue, 19 Feb 2013 19:23:32 +0000 (11:23 -0800)]
am 03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '03010e45387b8f1a715fd7f5cfac0793008fdc9b':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:23:18 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 19 Feb 2013 19:22:16 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:21:08 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoam fc18a75c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am fc18a75c: (-s ours) Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:09:12 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:08:44 +0000 (11:08 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:07:32 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:06:45 +0000 (11:06 -0800)]
Import translations. DO NOT MERGE

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

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Tue, 19 Feb 2013 17:51:51 +0000 (09:51 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoam a96e8879: Fix auto-focus areas
Michael Kolb [Tue, 19 Feb 2013 17:51:48 +0000 (09:51 -0800)]
am a96e8879: Fix auto-focus areas

* commit 'a96e8879473c9f9c937a5f14dbbd35579b4d0952':
  Fix auto-focus areas

11 years agoFix auto-focus areas
Michael Kolb [Sat, 16 Feb 2013 21:13:47 +0000 (13:13 -0800)]
Fix auto-focus areas

  Use a specific focus area in continuous AF
  Use a smaller AF area for tap to focus

Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6

11 years agoam 1bf8b9a5: Fix AF animation
Michael Kolb [Mon, 18 Feb 2013 23:38:56 +0000 (15:38 -0800)]
am 1bf8b9a5: Fix AF animation

* commit '1bf8b9a5b418891836435f4ec502846640368690':
  Fix AF animation

11 years agoFix AF animation
Michael Kolb [Mon, 18 Feb 2013 23:16:44 +0000 (15:16 -0800)]
Fix AF animation

  Bug: 8219462

Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5

11 years agoam d9de7afa: Merge "Make photo orientation consistent with UI" into gb-ub-photos...
Doris Liu [Sat, 16 Feb 2013 01:41:23 +0000 (17:41 -0800)]
am d9de7afa: Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce

* commit 'd9de7afa6c343e85b9c2c0221ca280c69a349c5f':
  Make photo orientation consistent with UI

11 years agoMerge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
Doris Liu [Sat, 16 Feb 2013 01:39:59 +0000 (01:39 +0000)]
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce

11 years agoMake photo orientation consistent with UI
Doris Liu [Fri, 15 Feb 2013 18:55:37 +0000 (10:55 -0800)]
Make photo orientation consistent with UI

Also fixed the wrong animation orientation.

Bug: 7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5

11 years agoam c86e1ca3: Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
Angus Kong [Sat, 16 Feb 2013 00:15:52 +0000 (16:15 -0800)]
am c86e1ca3: Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce

* commit 'c86e1ca339d770b9199cc332a27edcd0f0c42900':
  Bump up the version number to 1.1.40002

11 years agoMerge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
Angus Kong [Sat, 16 Feb 2013 00:14:01 +0000 (00:14 +0000)]
Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce

11 years agoam 7db6eb02: Remove more com.android.camera.R
John Reck [Sat, 16 Feb 2013 00:12:45 +0000 (16:12 -0800)]
am 7db6eb02: Remove more com.android.camera.R

* commit '7db6eb02312a4c649d34351d1d78add1d8ec814b':
  Remove more com.android.camera.R

11 years agoRemove more com.android.camera.R
John Reck [Sat, 16 Feb 2013 00:08:26 +0000 (16:08 -0800)]
Remove more com.android.camera.R

Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966

11 years agoBump up the version number to 1.1.40002
Angus Kong [Sat, 16 Feb 2013 00:09:11 +0000 (16:09 -0800)]
Bump up the version number to 1.1.40002

Change-Id: I5911eb3345b7774a6690372999fce3673b551f84

11 years agoam ace62b69: Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
John Reck [Sat, 16 Feb 2013 00:02:34 +0000 (16:02 -0800)]
am ace62b69: Merge "Remove com.android.camera.R" into gb-ub-photos-bryce

* commit 'ace62b69bd53518faea7be986f6c7481b271ca3f':
  Remove com.android.camera.R

11 years agoMerge "Remove com.android.camera.R" into gb-ub-photos-bryce
John Reck [Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)]
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce

11 years agoRemove com.android.camera.R
John Reck [Fri, 15 Feb 2013 23:51:30 +0000 (15:51 -0800)]
Remove com.android.camera.R

Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449

11 years agoam d87305a5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 15 Feb 2013 22:28:50 +0000 (14:28 -0800)]
am d87305a5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 3b6283e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 15 Feb 2013 22:28:50 +0000 (14:28 -0800)]
am 3b6283e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '3b6283e9c6756d7416eb985670f1eb4c4eb21ec9':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 15 Feb 2013 22:20:43 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 15 Feb 2013 22:19:55 +0000 (22:19 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

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

11 years agoam 4a94787f: Merge "Don\'t use AsyncTasks to fetch images via MTP" into gb-ub-photos...
Bobby Georgescu [Fri, 15 Feb 2013 21:07:30 +0000 (13:07 -0800)]
am 4a94787f: Merge "Don\'t use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce

* commit '4a94787ffc692090ec83b3f3c402c5d65afde4d9':
  Don't use AsyncTasks to fetch images via MTP

11 years agoMerge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 15 Feb 2013 21:05:21 +0000 (21:05 +0000)]
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 20:13:45 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 20:12:37 +0000 (12:12 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 20:11:51 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam a54931e0: Merge "New capture animation" into gb-ub-photos-bryce
Michael Kolb [Fri, 15 Feb 2013 15:45:11 +0000 (07:45 -0800)]
am a54931e0: Merge "New capture animation" into gb-ub-photos-bryce

* commit 'a54931e070a9134cf0a8d16cc628997844fc93dc':
  New capture animation

11 years agoMerge "New capture animation" into gb-ub-photos-bryce
Michael Kolb [Fri, 15 Feb 2013 15:43:12 +0000 (15:43 +0000)]
Merge "New capture animation" into gb-ub-photos-bryce

11 years agoShow the Utility Panel by default.
Victor Doba [Fri, 15 Feb 2013 12:24:41 +0000 (13:24 +0100)]
Show the Utility Panel by default.

11 years agoam c1560663: Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
Jason Noguchi [Fri, 15 Feb 2013 03:03:53 +0000 (19:03 -0800)]
am c1560663: Merge "Merging camera test with gallery test." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Jason Noguchi (1)
* commit 'c15606633d024e0351517470b800590261403e8e':
  Merging camera test with gallery test.

11 years agoMerge "Merging camera test with gallery test." into gb-ub-photos-bryce
Jason Noguchi [Fri, 15 Feb 2013 03:01:56 +0000 (03:01 +0000)]
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce

11 years agoDon't use AsyncTasks to fetch images via MTP
Bobby Georgescu [Thu, 14 Feb 2013 03:23:54 +0000 (19:23 -0800)]
Don't use AsyncTasks to fetch images via MTP

Bug: 8192491

Avoids allocations when scrolling through the importer
grid by not using AsyncTasks anymore (which meant one
object creation per change of the source image). Also
fix an NPE if a device is unplugged during scrolling.

Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0

11 years agoam aa4c3460: Merge "Fixed crop display for setting contacts/wallpapers." into gb...
Ruben Brunk [Fri, 15 Feb 2013 01:31:24 +0000 (17:31 -0800)]
am aa4c3460: Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit 'aa4c34606a697172987e5ac379e82ce41b7cbaa5':
  Fixed crop display for setting contacts/wallpapers.

11 years agoMerge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
Ruben Brunk [Fri, 15 Feb 2013 01:29:31 +0000 (01:29 +0000)]
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce

11 years agoFixed crop display for setting contacts/wallpapers.
Ruben Brunk [Fri, 15 Feb 2013 00:18:22 +0000 (16:18 -0800)]
Fixed crop display for setting contacts/wallpapers.

Bug: 8187056
Bug: 8196779
Bug: 8140241

Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c

11 years agoMerging camera test with gallery test.
Jason Noguchi [Wed, 13 Feb 2013 23:35:23 +0000 (15:35 -0800)]
Merging camera test with gallery test.

Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841

11 years agoam 886202f1: Merge "refactor to support many filter based on RedEye" into gb-ub-photo...
John Hoford [Thu, 14 Feb 2013 23:41:46 +0000 (15:41 -0800)]
am 886202f1: Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '886202f1f45ee49ee6571d0592aa1395607302aa':
  refactor to support many filter based on RedEye

11 years agoMerge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
John Hoford [Thu, 14 Feb 2013 23:40:25 +0000 (23:40 +0000)]
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce

11 years agorefactor to support many filter based on RedEye
John Hoford [Thu, 14 Feb 2013 23:08:28 +0000 (15:08 -0800)]
refactor to support many filter based on RedEye

Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e

11 years agoNew capture animation
Michael Kolb [Thu, 14 Feb 2013 21:40:39 +0000 (13:40 -0800)]
New capture animation

Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4

11 years agoam 0ada802b: Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Feb 2013 21:44:09 +0000 (13:44 -0800)]
am 0ada802b: Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit '0ada802ba4753b08dea010aad0a35c3237034f7a':
  Fix inexplicable monkey NPE

11 years agoMerge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Feb 2013 21:43:00 +0000 (21:43 +0000)]
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce

11 years agoFix inexplicable monkey NPE
Michael Kolb [Thu, 14 Feb 2013 16:30:59 +0000 (08:30 -0800)]
Fix inexplicable monkey NPE

  Bug: 8049510

Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Thu, 14 Feb 2013 13:56:13 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoam e0d4962f: Fix video disappearing when rotated
Doris Liu [Thu, 14 Feb 2013 02:42:56 +0000 (18:42 -0800)]
am e0d4962f: Fix video disappearing when rotated

# Via Doris Liu
* commit 'e0d4962f96a01b0ff403f8149b9e92ae81f58b77':
  Fix video disappearing when rotated

11 years agoFix video disappearing when rotated
Doris Liu [Thu, 14 Feb 2013 02:28:03 +0000 (18:28 -0800)]
Fix video disappearing when rotated

Bug: 7459723
Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37

11 years agoam a9ec959c: Make ShutterButton visible after initialization.
Angus Kong [Thu, 14 Feb 2013 02:25:45 +0000 (18:25 -0800)]
am a9ec959c: Make ShutterButton visible after initialization.

# Via Angus Kong
* commit 'a9ec959c6e43c00db0e74856f76efba976300f80':
  Make ShutterButton visible after initialization.

11 years agoMake ShutterButton visible after initialization.
Angus Kong [Thu, 14 Feb 2013 02:13:13 +0000 (18:13 -0800)]
Make ShutterButton visible after initialization.

bug:8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2

11 years agoam 4e6c07b7: get redeye working again
John Hoford [Thu, 14 Feb 2013 02:07:27 +0000 (18:07 -0800)]
am 4e6c07b7: get redeye working again

# Via John Hoford
* commit '4e6c07b71b269ee3fe7f6fa455bc540238df9ded':
  get redeye working again

11 years agoget redeye working again
John Hoford [Wed, 13 Feb 2013 23:52:31 +0000 (15:52 -0800)]
get redeye working again

11 years agoam 31ebfb40: Merge "Fix sync representations" into gb-ub-photos-bryce
nicolasroard [Thu, 14 Feb 2013 01:30:09 +0000 (17:30 -0800)]
am 31ebfb40: Merge "Fix sync representations" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '31ebfb400aa73c51980ef78e4c26fcc1a39fdd4d':
  Fix sync representations

11 years agoMerge "Fix sync representations" into gb-ub-photos-bryce
nicolasroard [Thu, 14 Feb 2013 01:28:53 +0000 (01:28 +0000)]
Merge "Fix sync representations" into gb-ub-photos-bryce

11 years agoFix sync representations
nicolasroard [Wed, 13 Feb 2013 23:51:25 +0000 (15:51 -0800)]
Fix sync representations

Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b

11 years agoam 92decf25: Merge "Fix proguard and makefile targets for tests." into gb-ub-photos...
Ruben Brunk [Wed, 13 Feb 2013 23:25:13 +0000 (15:25 -0800)]
am 92decf25: Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit '92decf254d7feb277d68fb94a4e4f90ba2c2dbeb':
  Fix proguard and makefile targets for tests.

11 years agoMerge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
Ruben Brunk [Wed, 13 Feb 2013 23:24:17 +0000 (23:24 +0000)]
Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce

11 years agoam ecdda817: fix draw to support rotation/crop
John Hoford [Wed, 13 Feb 2013 22:32:38 +0000 (14:32 -0800)]
am ecdda817: fix draw to support rotation/crop

# Via John Hoford
* commit 'ecdda817f112286ac6bab2ac4bf508e7dd8609ac':
  fix draw to support rotation/crop

11 years agoFix proguard and makefile targets for tests.
Ruben Brunk [Wed, 13 Feb 2013 21:36:21 +0000 (13:36 -0800)]
Fix proguard and makefile targets for tests.

Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861

11 years agofix draw to support rotation/crop
John Hoford [Wed, 13 Feb 2013 19:40:52 +0000 (11:40 -0800)]
fix draw to support rotation/crop

Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2

11 years agoam add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into...
Bobby Georgescu [Wed, 13 Feb 2013 19:47:55 +0000 (11:47 -0800)]
am add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit 'add77dfcee665d309e5eb20e344e1d10e7c4070e':
  Importer: Full-screen viewing, UI refinement, refactoring