OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Mon, 25 Feb 2013 13:56:19 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoam e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub...
Doris Liu [Sat, 23 Feb 2013 00:07:19 +0000 (16:07 -0800)]
am e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce

* commit 'e455b777139921c5e72a9afca3f9ba3ae21975ba':
  Release surface texture to fix gray camera preview

11 years agoMerge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
Doris Liu [Sat, 23 Feb 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce

11 years agoam 5f30b98d: Start of photos
John Reck [Fri, 22 Feb 2013 23:45:07 +0000 (15:45 -0800)]
am 5f30b98d: Start of photos

* commit '5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820':
  Start of photos

11 years agoRelease surface texture to fix gray camera preview
Doris Liu [Fri, 22 Feb 2013 22:31:17 +0000 (14:31 -0800)]
Release surface texture to fix gray camera preview

Bug: 8133672

Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80

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

11 years agoStart of photos
John Reck [Fri, 15 Feb 2013 22:32:08 +0000 (14:32 -0800)]
Start of photos

Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75

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

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

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

11 years agoam d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues....
Ruben Brunk [Fri, 22 Feb 2013 22:00:21 +0000 (14:00 -0800)]
am d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce

* commit 'd5633ea950ab82be13189705004ce97bce6a5715':
  Stopgap fixes for more of the photo editor's memory issues.

11 years agoMerge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos...
Ruben Brunk [Fri, 22 Feb 2013 21:58:33 +0000 (21:58 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce

11 years agoStopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.

Bug: 8253109
Bug: 8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b

11 years agoam ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory...
Ruben Brunk [Fri, 22 Feb 2013 21:49:12 +0000 (13:49 -0800)]
am ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce

* commit 'ddec680a6d4604bc6fd44b29dfbf964422f40fcb':
  Revert "Stopgap fixes for more of the photo editor's memory issues."

11 years agoMerge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into...
Ruben Brunk [Fri, 22 Feb 2013 21:47:06 +0000 (21:47 +0000)]
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce

11 years agoRevert "Stopgap fixes for more of the photo editor's memory issues."
Ruben Brunk [Fri, 22 Feb 2013 21:45:26 +0000 (21:45 +0000)]
Revert "Stopgap fixes for more of the photo editor's memory issues."

This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd

Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed

11 years agoam fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues....
Ruben Brunk [Fri, 22 Feb 2013 21:44:01 +0000 (13:44 -0800)]
am fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce

* commit 'fc673e131aa3482e5202fad1b54208442df35c2c':
  Stopgap fixes for more of the photo editor's memory issues.

11 years agoMerge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos...
Ruben Brunk [Fri, 22 Feb 2013 21:41:03 +0000 (21:41 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce

11 years agoStopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.

Bug: 8253109
Bug: 8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456

11 years agoam fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into...
Bobby Georgescu [Fri, 22 Feb 2013 21:05:41 +0000 (13:05 -0800)]
am fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce

* commit 'fae7bf8557f7de818a768d7a8c30425a9a5641d8':
  Replace various BitmapPools with a smarter unified pool

11 years agoMerge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos...
Bobby Georgescu [Fri, 22 Feb 2013 21:03:45 +0000 (21:03 +0000)]
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce

11 years agoReplace various BitmapPools with a smarter unified pool
Bobby Georgescu [Tue, 19 Feb 2013 23:49:14 +0000 (15:49 -0800)]
Replace various BitmapPools with a smarter unified pool

Make all of gallery use a single shared pool, and pave the
way for making the pool more adaptive based on the current
workload.

Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac

11 years agoam ea332c69: Don\'t apply the filters twice in partial rendering...
nicolasroard [Fri, 22 Feb 2013 19:43:14 +0000 (11:43 -0800)]
am ea332c69: Don\'t apply the filters twice in partial rendering...

* commit 'ea332c69f084322ebdd13419424ee5fab2351760':
  Don't apply the filters twice in partial rendering...

11 years agoDon't apply the filters twice in partial rendering...
nicolasroard [Fri, 22 Feb 2013 19:35:41 +0000 (11:35 -0800)]
Don't apply the filters twice in partial rendering...

Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28

11 years agoam 2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos...
Ruben Brunk [Fri, 22 Feb 2013 17:54:35 +0000 (09:54 -0800)]
am 2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce

* commit '2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e':
  Move setting wallpaper to a background thread.

11 years agoMerge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)]
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce

11 years agoMove setting wallpaper to a background thread.
Ruben Brunk [Fri, 22 Feb 2013 04:13:20 +0000 (20:13 -0800)]
Move setting wallpaper to a background thread.

Bug: 8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3

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

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

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

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

11 years agoMerge commit '8539fc1a5406af9edd5414fba3615cc045aa63ec' into jb-mr2-release
The Android Automerger [Fri, 22 Feb 2013 05:13:37 +0000 (21:13 -0800)]
Merge commit '8539fc1a5406af9edd5414fba3615cc045aa63ec' into jb-mr2-release

11 years agoam e5498da0: Pinch to zoom refine
nicolasroard [Fri, 22 Feb 2013 01:48:52 +0000 (17:48 -0800)]
am e5498da0: Pinch to zoom refine

* commit 'e5498da0262fc836738aad63ea30286d8afa643c':
  Pinch to zoom refine

11 years agoPinch to zoom refine
nicolasroard [Thu, 21 Feb 2013 23:52:49 +0000 (15:52 -0800)]
Pinch to zoom refine

Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a

11 years agoam 0f8047fe: Fix for null check with RS allocations.
Ruben Brunk [Thu, 21 Feb 2013 23:53:07 +0000 (15:53 -0800)]
am 0f8047fe: Fix for null check with RS allocations.

* commit '0f8047fe826a84829ab37bc7cd24c8a4dea0db64':
  Fix for null check with RS allocations.

11 years agoFix for null check with RS allocations.
Ruben Brunk [Thu, 21 Feb 2013 23:43:33 +0000 (15:43 -0800)]
Fix for null check with RS allocations.

Bug: 8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7

11 years agoam 2fc7efdc: fix draw and ellipse to handle pinch to zoom
John Hoford [Thu, 21 Feb 2013 23:30:53 +0000 (15:30 -0800)]
am 2fc7efdc: fix draw and ellipse to handle pinch to zoom

* commit '2fc7efdcd75279649091471dda3ee600db25a995':
  fix draw and ellipse to handle pinch to zoom

11 years agofix draw and ellipse to handle pinch to zoom
John Hoford [Thu, 21 Feb 2013 23:18:37 +0000 (15:18 -0800)]
fix draw and ellipse to handle pinch to zoom

Change-Id: I8af9b37dcd98425959742a4142756963363d1cec

11 years agoam 8539fc1a: Adjust capture animation timing
Michael Kolb [Thu, 21 Feb 2013 23:11:31 +0000 (15:11 -0800)]
am 8539fc1a: Adjust capture animation timing

* commit '8539fc1a5406af9edd5414fba3615cc045aa63ec':
  Adjust capture animation timing

11 years agoAdjust capture animation timing
Michael Kolb [Thu, 21 Feb 2013 19:37:45 +0000 (11:37 -0800)]
Adjust capture animation timing

Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb

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