OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub...
John Hoford [Thu, 11 Oct 2012 17:13:27 +0000 (10:13 -0700)]
am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches

* commit '7f34a6a5f21209c22584680f280723584e2c28e7':
  Fix application of FX to not wipe out borders etc.

11 years agoMerge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
John Hoford [Thu, 11 Oct 2012 17:11:57 +0000 (10:11 -0700)]
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches

11 years agoam f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 11 Oct 2012 17:11:18 +0000 (10:11 -0700)]
am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 11 Oct 2012 17:10:56 +0000 (10:10 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Thu, 11 Oct 2012 17:10:19 +0000 (10:10 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoFix application of FX to not wipe out borders etc.
John Hoford [Thu, 11 Oct 2012 16:13:40 +0000 (09:13 -0700)]
Fix application of FX to not wipe out borders etc.

bug:7289442
Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d

11 years agoam fb6edb42: Remove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 07:38:31 +0000 (00:38 -0700)]
am fb6edb42: Remove compare and reset from apply bar and fix text.

* commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684':
  Remove compare and reset from apply bar and fix text.

11 years agoRemove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 01:28:12 +0000 (18:28 -0700)]
Remove compare and reset from apply bar and fix text.

Bug: 7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024

11 years agoam 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
Bart Sears [Thu, 11 Oct 2012 07:26:10 +0000 (00:26 -0700)]
am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches

* commit '73c60ceed9a8df0907cee52d804100f65771f3b6':
  Hide unwanted scrollbars in editor

11 years agoHide unwanted scrollbars in editor
Bobby Georgescu [Thu, 11 Oct 2012 06:10:36 +0000 (23:10 -0700)]
Hide unwanted scrollbars in editor

Bug: 7327321
Change-Id: I445ea9e223698da2ee587c3f63f1dd0d9b9c692a

11 years agoam c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub...
Bobby Georgescu [Thu, 11 Oct 2012 04:09:54 +0000 (21:09 -0700)]
am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches

* commit 'c735669fdbd1aec674412f43e64b956e8c10b643':
  Make album set grid view reflect latest UI mocks

11 years agoMerge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 04:09:07 +0000 (21:09 -0700)]
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches

11 years agoam f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu...
Ruben Brunk [Thu, 11 Oct 2012 03:13:26 +0000 (20:13 -0700)]
am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches

* commit 'f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3':
  Removed "Show Image State" and "Settings" from overflow menu.

11 years agoMerge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub...
Ruben Brunk [Thu, 11 Oct 2012 03:12:32 +0000 (20:12 -0700)]
Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches

11 years agoam 4e0ca74a: Change "Save" button in editor
Bobby Georgescu [Thu, 11 Oct 2012 03:03:15 +0000 (20:03 -0700)]
am 4e0ca74a: Change "Save" button in editor

* commit '4e0ca74a064737b8f90c4f29b29ac17be596a68f':
  Change "Save" button in editor

11 years agoMake album set grid view reflect latest UI mocks
Bobby Georgescu [Thu, 11 Oct 2012 01:16:10 +0000 (18:16 -0700)]
Make album set grid view reflect latest UI mocks

Bug: 7300836
Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf

11 years agoRemoved "Show Image State" and "Settings" from overflow menu.
Ruben Brunk [Wed, 10 Oct 2012 23:11:51 +0000 (16:11 -0700)]
Removed "Show Image State" and "Settings" from overflow menu.

Bug: 7324739
Change-Id: I0830b70552da76c798d046c8471e7c1fe8fc57df

11 years agoChange "Save" button in editor
Bobby Georgescu [Thu, 11 Oct 2012 00:30:45 +0000 (17:30 -0700)]
Change "Save" button in editor

Bug:
Change-Id: Ib395812e0eeb83f6d6089142ba8474bf43cd186a

11 years agoam df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:04:17 +0000 (17:04 -0700)]
am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches

* commit 'df2aecb6944f1244fa6e3d35a135c8bea6d16ab0':
  Change "Done" to "Save" in editor

11 years agoMerge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:02:27 +0000 (17:02 -0700)]
Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches

11 years agoChange "Done" to "Save" in editor
Bobby Georgescu [Wed, 10 Oct 2012 23:42:48 +0000 (16:42 -0700)]
Change "Done" to "Save" in editor

Bug: 7325784
Change-Id: I82732252ae6047f1bf50ccde2ede22a9f9bc8e31

11 years agoam f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 22:49:07 +0000 (15:49 -0700)]
am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches

* commit 'f0bec555548429f59a798806fb5cb47f9dcc034c':
  Change text size in spinner to avoid overlap

11 years agoMerge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 22:48:15 +0000 (15:48 -0700)]
Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches

11 years agoam f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 22:46:56 +0000 (15:46 -0700)]
am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches

* commit 'f8044659db592f49e6e77c8a1d595955f9d206cb':
  add White balance & disable UI elements

11 years agoChange text size in spinner to avoid overlap
Bobby Georgescu [Wed, 10 Oct 2012 22:00:59 +0000 (15:00 -0700)]
Change text size in spinner to avoid overlap

Bug: 7321747
Change-Id: Ibc58bff8710f974813d4beb89e971bdfab6acfb7

11 years agoadd White balance & disable UI elements
John Hoford [Wed, 10 Oct 2012 21:17:30 +0000 (14:17 -0700)]
add White balance & disable UI elements

bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af

11 years agoam ce81f255: Set width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 21:02:59 +0000 (14:02 -0700)]
am ce81f255: Set width of filmstrip/grid spinner to wrap content

* commit 'ce81f2553dbcacc46c1540bf2a01da8557ba0b40':
  Set width of filmstrip/grid spinner to wrap content

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:22:01 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:21:40 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE

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

11 years agoSet width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 18:12:14 +0000 (11:12 -0700)]
Set width of filmstrip/grid spinner to wrap content

Bug: 7322464
Change-Id: I273370a212a2b63e195cae11b48b96191672e996

11 years agoam 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
George Mount [Wed, 10 Oct 2012 17:42:56 +0000 (10:42 -0700)]
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches

* commit '21832eb7fba76cd101ad5ef7b131292aa24f3864':
  Change how stitched images are inserted into Gallery.
  Move panorama stitch progress outside the image.

11 years agoChange how stitched images are inserted into Gallery.
George Mount [Wed, 10 Oct 2012 04:02:42 +0000 (21:02 -0700)]
Change how stitched images are inserted into Gallery.

 Bug 7299396
 Stitching images now use normal LocalImages for their MediaItem
 instead of LightCycleItems. They are no longer part of a special
 album.

Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7

11 years agoMove panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 00:50:33 +0000 (17:50 -0700)]
Move panorama stitch progress outside the image.

 Bug 7302513

Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385

11 years agoam 08458dc6: Latest UI
nicolasroard [Wed, 10 Oct 2012 00:48:24 +0000 (17:48 -0700)]
am 08458dc6: Latest UI

* commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d':
  Latest UI

11 years agoLatest UI
nicolasroard [Tue, 9 Oct 2012 23:34:58 +0000 (16:34 -0700)]
Latest UI

bug:7233983
bug:7233980

Also fixes border scaling issues.

Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5

11 years agoam 457e88cd: add filters
John Hoford [Wed, 10 Oct 2012 00:29:04 +0000 (17:29 -0700)]
am 457e88cd: add filters

* commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad':
  add filters

11 years agoadd filters
John Hoford [Tue, 9 Oct 2012 23:17:17 +0000 (16:17 -0700)]
add filters

bug:7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030

11 years agoam 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:44 +0000 (17:12 -0700)]
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches

* commit '501bd1bff5189542612929b2428b7a69abc575a6':
  Update design for grid/filmstrip switcher

11 years agoUpdate design for grid/filmstrip switcher
Bobby Georgescu [Tue, 9 Oct 2012 21:53:22 +0000 (14:53 -0700)]
Update design for grid/filmstrip switcher

Bug: 7317501
Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e

11 years agoam ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches
nicolasroard [Tue, 9 Oct 2012 15:46:18 +0000 (08:46 -0700)]
am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches

* commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72':
  Add procedural borders

11 years agoAdd procedural borders
nicolasroard [Tue, 9 Oct 2012 04:04:48 +0000 (21:04 -0700)]
Add procedural borders

bug:7233980
Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5

11 years agoam 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
John Hoford [Mon, 8 Oct 2012 22:21:37 +0000 (15:21 -0700)]
am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

* commit '1a291db030b2f3f7752026dd347ec34b82f8891e':
  add redeye and improve shadow removal

11 years agoadd redeye and improve shadow removal
John Hoford [Mon, 8 Oct 2012 21:21:57 +0000 (14:21 -0700)]
add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681

11 years agoam 7bd60250: Added stub for applying geometry flip.
Ruben Brunk [Mon, 8 Oct 2012 21:26:07 +0000 (14:26 -0700)]
am 7bd60250: Added stub for applying geometry flip.

* commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd':
  Added stub for applying geometry flip.

11 years agoAdded stub for applying geometry flip.
Ruben Brunk [Mon, 8 Oct 2012 20:48:46 +0000 (13:48 -0700)]
Added stub for applying geometry flip.

Bug: 7224232
Bug: 7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0

11 years agoam 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
Ruben Brunk [Mon, 8 Oct 2012 20:18:52 +0000 (13:18 -0700)]
am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit '8e7b50948261570ec1d75ba451236b971dc5dc0f':
  Adding Crop, Rotate, Flip.

11 years agoMerge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
Ruben Brunk [Mon, 8 Oct 2012 20:17:18 +0000 (13:17 -0700)]
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

11 years agoam d199202e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 19:54:18 +0000 (12:54 -0700)]
am d199202e: (-s ours) Import translations. DO NOT MERGE

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

11 years agoAdding Crop, Rotate, Flip.
Ruben Brunk [Thu, 27 Sep 2012 19:38:08 +0000 (12:38 -0700)]
Adding Crop, Rotate, Flip.

Bug: 7224232
Bug: 7218935

Adding geometry manipulation UI features.

Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 18:16:44 +0000 (11:16 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 18:16:15 +0000 (11:16 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches
Bobby Georgescu [Sun, 7 Oct 2012 19:16:58 +0000 (12:16 -0700)]
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '4de36129b57e3a5308c109a407ea17b4fa103fe4':
  Change display of 360 panorama button

11 years agoam 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sun, 7 Oct 2012 19:11:22 +0000 (12:11 -0700)]
am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit '87b226cd6777431be09d3c1fcb01453e386256b2':
  Move LightCycle undo to settings area.

11 years agoChange display of 360 panorama button
Bobby Georgescu [Sat, 6 Oct 2012 22:22:03 +0000 (15:22 -0700)]
Change display of 360 panorama button

Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
 filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc

11 years agoMerge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sat, 6 Oct 2012 19:25:08 +0000 (12:25 -0700)]
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

11 years agoMove LightCycle undo to settings area.
George Mount [Fri, 5 Oct 2012 23:17:13 +0000 (16:17 -0700)]
Move LightCycle undo to settings area.

 Bug 7294328

Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e

11 years agoam df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub...
nicolasroard [Fri, 5 Oct 2012 23:22:28 +0000 (16:22 -0700)]
am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

* commit 'df479ddec29551216a9344e4bae925f60185210a':
  Add scale factor / quality parameters in filters

11 years agoMerge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 23:20:49 +0000 (16:20 -0700)]
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

11 years agoam e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Oct 2012 23:14:17 +0000 (16:14 -0700)]
am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Oct 2012 23:13:01 +0000 (16:13 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 23:12:42 +0000 (16:12 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoAdd scale factor / quality parameters in filters
nicolasroard [Fri, 5 Oct 2012 22:55:56 +0000 (15:55 -0700)]
Add scale factor / quality parameters in filters

bug:7248352
Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Oct 2012 22:23:36 +0000 (15:23 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Oct 2012 21:55:59 +0000 (14:55 -0700)]
am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 21:54:25 +0000 (14:54 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 20:05:17 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 20:04:51 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:31:48 +0000 (12:31 -0700)]
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches

* commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58':
  New UI...

11 years agoNew UI...
nicolasroard [Fri, 5 Oct 2012 10:48:34 +0000 (03:48 -0700)]
New UI...

bug:7289525
bug:7289361

Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:47:58 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:47:35 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam f47e790e: Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:53:57 +0000 (17:53 -0700)]
am f47e790e: Add a reset item menu

* commit 'f47e790e3f3553f69abe054eec20bd7585118843':
  Add a reset item menu

11 years agoAdd a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:50:20 +0000 (17:50 -0700)]
Add a reset item menu

bug:7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb

11 years agoam 5448bf80: Implement sharpen
nicolasroard [Fri, 5 Oct 2012 00:21:29 +0000 (17:21 -0700)]
am 5448bf80: Implement sharpen

* commit '5448bf8095483574649afcc2add7f153670c7450':
  Implement sharpen

11 years agoImplement sharpen
nicolasroard [Wed, 3 Oct 2012 04:57:22 +0000 (21:57 -0700)]
Implement sharpen

bug:7279964
bug:7247494
bug:7234321

- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI

Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01

11 years agoam d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 4 Oct 2012 22:52:42 +0000 (15:52 -0700)]
am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 4 Oct 2012 22:50:54 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Thu, 4 Oct 2012 22:50:35 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 9c6c01dd: Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:17:28 +0000 (15:17 -0700)]
am 9c6c01dd: Fix build. Missing dummy class for Gallery2.

* commit '9c6c01ddd5b7fce725bf4b3cec317820b16963b8':
  Fix build. Missing dummy class for Gallery2.

11 years agoFix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:04:23 +0000 (15:04 -0700)]
Fix build. Missing dummy class for Gallery2.

 Bug 7259843

Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:41:21 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:40:56 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 9778705a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 04:55:54 +0000 (21:55 -0700)]
am 9778705a: (-s ours) Import translations. DO NOT MERGE

* commit '9778705aa8ea34a9bff27f9d77ac46d35514278a':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 00:22:02 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 00:21:38 +0000 (17:21 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama...
Mangesh Ghiware [Wed, 3 Oct 2012 23:00:13 +0000 (16:00 -0700)]
am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches

* commit '6090237f178914fa7d7eef514c2e2512d4c27847':
  Revert "Add a overflow menu item to view 360-degree panorama."

11 years agoRevert "Add a overflow menu item to view 360-degree panorama."
Mangesh Ghiware [Wed, 3 Oct 2012 22:48:54 +0000 (15:48 -0700)]
Revert "Add a overflow menu item to view 360-degree panorama."

This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7

Change-Id: I5921cbb476034da2798480534e9084e287312f04

11 years agoam d84ae72a: Add a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 19:45:33 +0000 (12:45 -0700)]
am d84ae72a: Add a overflow menu item to view 360-degree panorama.

* commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7':
  Add a overflow menu item to view 360-degree panorama.

11 years agoAdd a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 06:26:29 +0000 (23:26 -0700)]
Add a overflow menu item to view 360-degree panorama.

Bug: 7276026
Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4

11 years agoam 217acd7c: Change LightCycle assets.
George Mount [Wed, 3 Oct 2012 18:32:59 +0000 (11:32 -0700)]
am 217acd7c: Change LightCycle assets.

* commit '217acd7c338871f426f4c975a8f9b889275cd321':
  Change LightCycle assets.

11 years agoChange LightCycle assets.
George Mount [Wed, 3 Oct 2012 17:46:16 +0000 (10:46 -0700)]
Change LightCycle assets.

 Bug 7279463

Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369

11 years agoam e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Oct 2012 15:29:09 +0000 (08:29 -0700)]
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:19:13 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:18:50 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 13360629: Remove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 09:10:02 +0000 (02:10 -0700)]
am 13360629: Remove ActionBarSherlock

* commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca':
  Remove ActionBarSherlock

11 years agoRemove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb

11 years agoam 935b9cfe: Merge "Update assets of the lock screen image in the secure album."...
Wu-cheng Li [Tue, 2 Oct 2012 06:32:00 +0000 (23:32 -0700)]
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

* commit '935b9cfe991c3afe119720c487dc24cc02c55584':
  Update assets of the lock screen image in the secure album.

11 years agoMerge "Update assets of the lock screen image in the secure album." into gb-ub-photos...
Wu-cheng Li [Tue, 2 Oct 2012 04:51:52 +0000 (21:51 -0700)]
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

11 years agoam 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub...
Bobby Georgescu [Tue, 2 Oct 2012 01:19:59 +0000 (18:19 -0700)]
am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

* commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d':
  Improve display of ActionBar album mode switcher

11 years agoImprove display of ActionBar album mode switcher
Bobby Georgescu [Tue, 2 Oct 2012 00:49:30 +0000 (17:49 -0700)]
Improve display of ActionBar album mode switcher

Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
  latest UX mocks, making more room for title

Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940