OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam ed7848bb: am a83c9beb: am 457e88cd: add filters
John Hoford [Wed, 10 Oct 2012 00:33:40 +0000 (17:33 -0700)]
am ed7848bb: am a83c9beb: am 457e88cd: add filters

* commit 'ed7848bb444a72a71d66e52844b5d4c19f948e0d':
  add filters

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

* commit 'a83c9beb952f68622757ac73ccab6a47f7a6e516':
  add filters

11 years agoam 457e88cd: add filters
John Hoford [Wed, 10 Oct 2012 00:29:03 +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 44cfd731: am 41fda3d3: am d78c5734: Merge "Correct stale background on completely...
Bobby Georgescu [Wed, 10 Oct 2012 00:16:56 +0000 (17:16 -0700)]
am 44cfd731: am 41fda3d3: am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches

* commit '44cfd7311111cda6d440ac251d284b4550ae577c':
  Correct stale background on completely empty gallery

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

* commit '17f943ce220ce933514e5ed69d3e733cb74b30d1':
  Update design for grid/filmstrip switcher

11 years agoam 41fda3d3: am d78c5734: Merge "Correct stale background on completely empty gallery...
Bobby Georgescu [Wed, 10 Oct 2012 00:14:51 +0000 (17:14 -0700)]
am 41fda3d3: am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches

* commit '41fda3d39b60be35760a27619e0c755f5025ccb9':
  Correct stale background on completely empty gallery

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

* commit '08e510887119516ac8031fe276df7e0f8e223a8c':
  Update design for grid/filmstrip switcher

11 years agoam 037c1a7f: am 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short...
Bobby Georgescu [Wed, 10 Oct 2012 00:14:03 +0000 (17:14 -0700)]
am 037c1a7f: am 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches

* commit '037c1a7faba9695f98a6754552b599517f7dbb4a':
  Fix lack of snapback on very short scroll

11 years agoam d78c5734: Merge "Correct stale background on completely empty gallery" into gb...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:46 +0000 (17:12 -0700)]
am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches

* commit 'd78c5734346cabc2577a5b9100f0f943c381ee47':
  Correct stale background on completely empty gallery

11 years agoam 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:45 +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 agoam 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:17 +0000 (17:12 -0700)]
am 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches

* commit '07f340a9a1b0a63aaf73bb1eb1fdf284d5847dcb':
  Fix lack of snapback on very short scroll

11 years agoMerge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 00:11:38 +0000 (17:11 -0700)]
Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches

11 years agoMerge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 00:11:16 +0000 (17:11 -0700)]
Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches

11 years agoam 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 00:09:35 +0000 (17:09 -0700)]
am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches

* commit '3d81fdfd5916747b237229a2515152daf639447a':
  Fix lack of snapback on very short scroll

11 years agoMerge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 00:08:27 +0000 (17:08 -0700)]
Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches

11 years agoCorrect stale background on completely empty gallery
Bobby Georgescu [Tue, 9 Oct 2012 23:23:36 +0000 (16:23 -0700)]
Correct stale background on completely empty gallery

Bug: 7314560
When the last album is delete by long pressing and pressing
the delete icon, and the gallery is left completely empty,
the slotview was not being correctly invalidated.

Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d

11 years agoFix lack of snapback on very short scroll
Bobby Georgescu [Tue, 9 Oct 2012 22:59:40 +0000 (15:59 -0700)]
Fix lack of snapback on very short scroll

Bug: 7318609

snapToNeighborImage returns false if it didn't
actually need to move to a neighboring image, so
use this information to correctly snapback if
needed.

Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff

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 1db811c5: am bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations...
Ruben Brunk [Tue, 9 Oct 2012 20:53:18 +0000 (13:53 -0700)]
am 1db811c5: am bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches

* commit '1db811c5a009e32e5bbc9e1a8aed62887b0e5de8':
  Implementing Geometry save operations.

11 years agoam bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations." into gb...
Ruben Brunk [Tue, 9 Oct 2012 20:52:08 +0000 (13:52 -0700)]
am bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches

* commit 'bc56bd0b83e52ed9ca3b17d5b41d4b03e33a17f8':
  Implementing Geometry save operations.

11 years agoam bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches
Ruben Brunk [Tue, 9 Oct 2012 20:49:55 +0000 (13:49 -0700)]
am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches

* commit 'bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0':
  Implementing Geometry save operations.

11 years agoMerge "Implementing Geometry save operations." into gb-ub-photos-arches
Ruben Brunk [Tue, 9 Oct 2012 20:48:10 +0000 (13:48 -0700)]
Merge "Implementing Geometry save operations." into gb-ub-photos-arches

11 years agoam d13d1e21: am 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid...
Bobby Georgescu [Tue, 9 Oct 2012 20:27:02 +0000 (13:27 -0700)]
am d13d1e21: am 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches

* commit 'd13d1e21642068417ea386c0cf328fc12fc93b82':
  Dejank camera roll scrolling in grid view.

11 years agoam 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into...
Bobby Georgescu [Tue, 9 Oct 2012 20:25:08 +0000 (13:25 -0700)]
am 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches

* commit '1f6a2d898092d87734e41080b55fecf84d12ec0a':
  Dejank camera roll scrolling in grid view.

11 years agoam d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos...
Bobby Georgescu [Tue, 9 Oct 2012 20:23:28 +0000 (13:23 -0700)]
am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches

* commit 'd490f1aa851db853b9865a380abd01c67605d58b':
  Dejank camera roll scrolling in grid view.

11 years agoMerge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 20:21:34 +0000 (13:21 -0700)]
Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches

11 years agoImplementing Geometry save operations.
Ruben Brunk [Tue, 9 Oct 2012 04:15:16 +0000 (21:15 -0700)]
Implementing Geometry save operations.

Bug: 7224232
Bug: 7218935
Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97

11 years agoam 34e934ce: am a90d5d2d: am 6e733b74: Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:50:37 +0000 (11:50 -0700)]
am 34e934ce: am a90d5d2d: am 6e733b74: Fix share crash after closing photo editor

* commit '34e934ce82867339e3c82bde713c9cd531291128':
  Fix share crash after closing photo editor

11 years agoam a90d5d2d: am 6e733b74: Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:49:07 +0000 (11:49 -0700)]
am a90d5d2d: am 6e733b74: Fix share crash after closing photo editor

* commit 'a90d5d2d3d50ff07406c3e60bab23de1df288891':
  Fix share crash after closing photo editor

11 years agoam 6e733b74: Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:47:13 +0000 (11:47 -0700)]
am 6e733b74: Fix share crash after closing photo editor

* commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3':
  Fix share crash after closing photo editor

11 years agoFix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:02:38 +0000 (11:02 -0700)]
Fix share crash after closing photo editor

Bug: 7306707
Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d

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

* commit '6f1f877c43e199fcf3f59534ad478a69dbe8c978':
  Add procedural borders

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

* commit 'e5c579872b254489f85b396055607ecbc4a5a664':
  Add procedural borders

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

* commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72':
  Add procedural borders

11 years agoMerge "Add procedural borders" into gb-ub-photos-arches
nicolasroard [Tue, 9 Oct 2012 15:44:59 +0000 (08:44 -0700)]
Merge "Add procedural borders" into gb-ub-photos-arches

11 years agoam 93f4df7b: am 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and version...
Wu-cheng Li [Tue, 9 Oct 2012 15:05:17 +0000 (08:05 -0700)]
am 93f4df7b: am 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches

* commit '93f4df7bb9ad61c344be5702d7126bc2254e4cf3':
  Change versionCode to 40001 and versionName to 1.1.40001.

11 years agoam 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1...
Wu-cheng Li [Tue, 9 Oct 2012 15:02:12 +0000 (08:02 -0700)]
am 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches

* commit '59aefb08fbd6d4b95409f25190c6004664eceb15':
  Change versionCode to 40001 and versionName to 1.1.40001.

11 years agoam 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into...
Wu-cheng Li [Tue, 9 Oct 2012 15:00:46 +0000 (08:00 -0700)]
am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches

* commit '5635aa9f99c4f364019b37298cc09f0e696a4c1b':
  Change versionCode to 40001 and versionName to 1.1.40001.

11 years agoMerge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos...
Wu-cheng Li [Tue, 9 Oct 2012 14:59:39 +0000 (07:59 -0700)]
Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches

11 years agoam bb4490d1: am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 14:59:16 +0000 (07:59 -0700)]
am bb4490d1: am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album.

* commit 'bb4490d16f25de31e22b5e923fc2e77fdc3bcc60':
  Handle stitching progress in secure album.

11 years agoam 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 14:57:38 +0000 (07:57 -0700)]
am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album.

* commit '6ddbf0db026fbf8b8d3e21a7fa1351764a095359':
  Handle stitching progress in secure album.

11 years agoam 2c83c5f0: Handle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 14:55:37 +0000 (07:55 -0700)]
am 2c83c5f0: Handle stitching progress in secure album.

* commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d':
  Handle stitching progress in secure album.

11 years agoam 69c5efcf: am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree...
Mangesh Ghiware [Tue, 9 Oct 2012 14:53:20 +0000 (07:53 -0700)]
am 69c5efcf: am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama

* commit '69c5efcfe4db097d5f52afd8734c7647abaaaea7':
  Fix sharing as photo option for 360 degree panorama

11 years agoHandle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 06:44:31 +0000 (14:44 +0800)]
Handle stitching progress in secure album.

- In secure album, show stitching progress only if it is
  captured after the device is locked.
- Make sure image capture intent does not show stitching
  progress.

bug:7285105

Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb

11 years agoam fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 14:50:44 +0000 (07:50 -0700)]
am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama

* commit 'fcc92a7e74f0e10458dfada217c286ac08d0eec1':
  Fix sharing as photo option for 360 degree panorama

11 years agoam 71ce96fc: Fix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 14:49:16 +0000 (07:49 -0700)]
am 71ce96fc: Fix sharing as photo option for 360 degree panorama

* commit '71ce96fc79787dedac56af75385dc227d52be3af':
  Fix sharing as photo option for 360 degree panorama

11 years agoFix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 06:55:38 +0000 (23:55 -0700)]
Fix sharing as photo option for 360 degree panorama

Bug: 7310190
Bug: 7302023

Also, fix disappearing sharing menu item in action bar.

Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:30:21 +0000 (07:30 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I75b38f828159385c8a29c20a2050433bce8049ca

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 13:59:44 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoDejank camera roll scrolling in grid view.
Pin Ting [Tue, 9 Oct 2012 09:43:46 +0000 (17:43 +0800)]
Dejank camera roll scrolling in grid view.

Bug:7302644
Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45

11 years agoChange versionCode to 40001 and versionName to 1.1.40001.
Wu-cheng Li [Tue, 9 Oct 2012 11:46:53 +0000 (19:46 +0800)]
Change versionCode to 40001 and versionName to 1.1.40001.

bug:7310127
Change-Id: Id2648c3eab0b6e3a64c6013530551af40a1cdced

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 1887ea76: am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into...
Bobby Georgescu [Tue, 9 Oct 2012 02:37:47 +0000 (19:37 -0700)]
am 1887ea76: am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches

* commit '1887ea76f28ebe938f811cb379117e9c2d6a0396':
  Start Camera album in grid mode

11 years agoam fea902aa: am a74f1f4c: am 895e13e8: Fix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:37:46 +0000 (19:37 -0700)]
am fea902aa: am a74f1f4c: am 895e13e8: Fix crash when starting the editor

* commit 'fea902aa6a8035cb6ccd1c89e002c722ccc5c8df':
  Fix crash when starting the editor

11 years agoam e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos...
Bobby Georgescu [Tue, 9 Oct 2012 02:35:37 +0000 (19:35 -0700)]
am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches

* commit 'e28986dda9d58c834fd10b179f4e2b0131260f9d':
  Start Camera album in grid mode

11 years agoam a74f1f4c: am 895e13e8: Fix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:35:36 +0000 (19:35 -0700)]
am a74f1f4c: am 895e13e8: Fix crash when starting the editor

* commit 'a74f1f4c2228ad43de5385682656cf780d84d3dd':
  Fix crash when starting the editor

11 years agoam 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 02:34:13 +0000 (19:34 -0700)]
am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches

* commit '3a1279f11ec88e62a75303469b886f1cb9d50c30':
  Start Camera album in grid mode

11 years agoam 895e13e8: Fix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:34:12 +0000 (19:34 -0700)]
am 895e13e8: Fix crash when starting the editor

* commit '895e13e85dcb156cdc4eff882e10c4497a56de1e':
  Fix crash when starting the editor

11 years agoMerge "Start Camera album in grid mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 02:32:55 +0000 (19:32 -0700)]
Merge "Start Camera album in grid mode" into gb-ub-photos-arches

11 years agoFix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:29:58 +0000 (19:29 -0700)]
Fix crash when starting the editor

Bug: 7224232

CL 236429 readded offending lines after the merge...

Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819

11 years agoStart Camera album in grid mode
Bobby Georgescu [Tue, 9 Oct 2012 02:26:54 +0000 (19:26 -0700)]
Start Camera album in grid mode

Bug: 7304603
Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388

11 years agoam 6940d823: am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs.
Ruben Brunk [Tue, 9 Oct 2012 01:31:33 +0000 (18:31 -0700)]
am 6940d823: am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs.

* commit '6940d823c31db4baf27012600c5763f6b80deaa0':
  Added the rest of the Geometryfilter stubs.

11 years agoam cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs.
Ruben Brunk [Tue, 9 Oct 2012 01:29:50 +0000 (18:29 -0700)]
am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs.

* commit 'cf66c41401af64b2b3446602302cc94fff8fbfe4':
  Added the rest of the Geometryfilter stubs.

11 years agoam a66df0c9: Added the rest of the Geometryfilter stubs.
Ruben Brunk [Tue, 9 Oct 2012 01:27:58 +0000 (18:27 -0700)]
am a66df0c9: Added the rest of the Geometryfilter stubs.

* commit 'a66df0c9e8106ef6a275e20ab2a47286e054fe7c':
  Added the rest of the Geometryfilter stubs.

11 years agoAdded the rest of the Geometryfilter stubs.
Ruben Brunk [Mon, 8 Oct 2012 23:05:48 +0000 (16:05 -0700)]
Added the rest of the Geometryfilter stubs.

Bug: 7224232
Bug: 7218935
Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8

11 years agoam cf07db76: am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryM...
nicolasroard [Tue, 9 Oct 2012 01:00:31 +0000 (18:00 -0700)]
am cf07db76: am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

* commit 'cf07db761fa9086f69ec4ab72571b2fc76b712d9':
  Fix crash introduced with the GeometryMetadata

11 years agoam 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata"...
nicolasroard [Tue, 9 Oct 2012 00:58:55 +0000 (17:58 -0700)]
am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

* commit '8e5ccb2197b2322ecffa5c6b4195f7ac85d3119c':
  Fix crash introduced with the GeometryMetadata

11 years agoam f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos...
nicolasroard [Tue, 9 Oct 2012 00:56:39 +0000 (17:56 -0700)]
am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

* commit 'f70a356842a14fee9e2ba9ab3aa31195841715f1':
  Fix crash introduced with the GeometryMetadata

11 years agoMerge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
nicolasroard [Tue, 9 Oct 2012 00:54:25 +0000 (17:54 -0700)]
Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

11 years agoam 476563d3: am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed
Doris Liu [Tue, 9 Oct 2012 00:27:31 +0000 (17:27 -0700)]
am 476563d3: am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed

* commit '476563d31de1b8742c08a9150ffb4b7e65368d45':
  Fix details dialog not being dismissed

11 years agoam fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed
Doris Liu [Tue, 9 Oct 2012 00:25:47 +0000 (17:25 -0700)]
am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed

* commit 'fe02f8c1dee70f766828444e820b5766fd16147e':
  Fix details dialog not being dismissed

11 years agoam 4438a7cc: Fix details dialog not being dismissed
Doris Liu [Tue, 9 Oct 2012 00:23:56 +0000 (17:23 -0700)]
am 4438a7cc: Fix details dialog not being dismissed

* commit '4438a7cce00cb19cb35cfc3cc149533f40043c00':
  Fix details dialog not being dismissed

11 years agoFix details dialog not being dismissed
Doris Liu [Mon, 8 Oct 2012 23:31:00 +0000 (16:31 -0700)]
Fix details dialog not being dismissed

Bug: 7300997
Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5

11 years agoFix crash introduced with the GeometryMetadata
nicolasroard [Mon, 8 Oct 2012 23:38:19 +0000 (16:38 -0700)]
Fix crash introduced with the GeometryMetadata

bug:7224232
bug:7279964
bug:7298708

- Also remove the slide gesture (only use the slider widget)
- use scaleFactor to apply sharpen proportionally

Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3

11 years agoam c7b7c342: am 73d3785c: am a29eeac8: Use framework orientation
John Reck [Mon, 8 Oct 2012 22:30:41 +0000 (15:30 -0700)]
am c7b7c342: am 73d3785c: am a29eeac8: Use framework orientation

* commit 'c7b7c342a26452d89747d92dd7a847a4f2a67aa4':
  Use framework orientation

11 years agoam 73d3785c: am a29eeac8: Use framework orientation
John Reck [Mon, 8 Oct 2012 22:28:50 +0000 (15:28 -0700)]
am 73d3785c: am a29eeac8: Use framework orientation

* commit '73d3785cf92da3cc81ea75f44ab1eb34294655fd':
  Use framework orientation

11 years agoam fe9c82cf: am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait...
nicolasroard [Mon, 8 Oct 2012 22:27:45 +0000 (15:27 -0700)]
am fe9c82cf: am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit 'fe9c82cff36c778ab8f853cd8b303519458ded78':
  Fix the filtershow activity to portrait

11 years agoam a29eeac8: Use framework orientation
John Reck [Mon, 8 Oct 2012 22:26:54 +0000 (15:26 -0700)]
am a29eeac8: Use framework orientation

* commit 'a29eeac8993b221d98cffbec5583b5cba1921c89':
  Use framework orientation

11 years agoam 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb...
nicolasroard [Mon, 8 Oct 2012 22:25:49 +0000 (15:25 -0700)]
am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit '821b775d7790fd3c9bc2a098294a9ac3a49af0f9':
  Fix the filtershow activity to portrait

11 years agoUse framework orientation
John Reck [Mon, 8 Oct 2012 21:52:07 +0000 (14:52 -0700)]
Use framework orientation

 Bug: 7292373

Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2

11 years agoam 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
nicolasroard [Mon, 8 Oct 2012 22:23:29 +0000 (15:23 -0700)]
am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit '8eb8c39a4820f04f9fc5f1edcea73670ee0b913c':
  Fix the filtershow activity to portrait

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

* commit '932f3da67a204bdb8371ebeae588176d56be9279':
  add redeye and improve shadow removal

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

* commit '3122f4d1eba587749a790f28cf3a91694bbf6307':
  add redeye and improve shadow removal

11 years agoMerge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
nicolasroard [Mon, 8 Oct 2012 22:21:59 +0000 (15:21 -0700)]
Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

11 years agoam 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
John Hoford [Mon, 8 Oct 2012 22:21:20 +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 agoMerge "add redeye and improve shadow removal" into gb-ub-photos-arches
John Hoford [Mon, 8 Oct 2012 22:19:55 +0000 (15:19 -0700)]
Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

11 years agoam 341335c1: am 05ae0806: am 639095c6: Correct undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 22:15:29 +0000 (15:15 -0700)]
am 341335c1: am 05ae0806: am 639095c6: Correct undo behavior

* commit '341335c1afd14dac36c4c74297da16e41b033c39':
  Correct undo behavior

11 years agoam 05ae0806: am 639095c6: Correct undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 22:03:27 +0000 (15:03 -0700)]
am 05ae0806: am 639095c6: Correct undo behavior

* commit '05ae08060173934dcd180b6de2a1d7c5b1d0d7ca':
  Correct undo behavior

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 agoFix the filtershow activity to portrait
nicolasroard [Mon, 8 Oct 2012 22:00:39 +0000 (15:00 -0700)]
Fix the filtershow activity to portrait

bug:7279214

Stop-gap for factory rom.

Change-Id: I6073d148dff1016577244cf26c7048ca00d58a54

11 years agoam 639095c6: Correct undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 22:02:09 +0000 (15:02 -0700)]
am 639095c6: Correct undo behavior

* commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1':
  Correct undo behavior

11 years agoCorrect undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 20:37:41 +0000 (13:37 -0700)]
Correct undo behavior

Bug: 7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b

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

* commit '8fd2a1e873305e8a74a2a08fff235d4ec580869a':
  Added stub for applying geometry flip.

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

* commit '0efc1133fa3c8f512ef6adccf0fefc291ebe36f1':
  Added stub for applying geometry flip.

11 years agoam 7bd60250: Added stub for applying geometry flip.
Ruben Brunk [Mon, 8 Oct 2012 21:25:49 +0000 (14:25 -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 be4d0574: am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb...
Ruben Brunk [Mon, 8 Oct 2012 20:22:25 +0000 (13:22 -0700)]
am be4d0574: am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit 'be4d0574388a91f5bf0e70c2a8383ec08ff39cc7':
  Adding Crop, Rotate, Flip.

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

* commit '3f496bb02f11067b4b66d9a1dce74262dcb80c3f':
  Adding Crop, Rotate, Flip.

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

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