OSDN Git Service

android-x86/packages-apps-Camera2.git
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 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 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos...
George Mount [Thu, 11 Oct 2012 00:04:17 +0000 (17:04 -0700)]
am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches

* commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c':
  Fix NPE due to progress bar not existing.

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 "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
George Mount [Thu, 11 Oct 2012 00:03:10 +0000 (17:03 -0700)]
Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches

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 agoam b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub...
Bobby Georgescu [Thu, 11 Oct 2012 00:02:09 +0000 (17:02 -0700)]
am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches

* commit 'b4a3f4764a58d6d918d96399e1b05db887b9f9ad':
  Change FilterShow theme and extra remove gray line

11 years agoMerge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:00:48 +0000 (17:00 -0700)]
Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches

11 years agoFix NPE due to progress bar not existing.
George Mount [Wed, 10 Oct 2012 23:59:45 +0000 (16:59 -0700)]
Fix NPE due to progress bar not existing.

 Bug 7325685

Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f

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 53f24f0f: forced fx bitmaps to load unscaled
John Hoford [Wed, 10 Oct 2012 23:41:59 +0000 (16:41 -0700)]
am 53f24f0f: forced fx bitmaps to load unscaled

* commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f':
  forced fx bitmaps to load unscaled

11 years agoChange FilterShow theme and extra remove gray line
Bobby Georgescu [Wed, 10 Oct 2012 22:57:17 +0000 (15:57 -0700)]
Change FilterShow theme and extra remove gray line

Bug: 7326326
Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e

11 years agoforced fx bitmaps to load unscaled
John Hoford [Wed, 10 Oct 2012 23:13:36 +0000 (16:13 -0700)]
forced fx bitmaps to load unscaled

bug:7327105
Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866

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 agoMerge "add White balance & disable UI elements" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 22:45:47 +0000 (15:45 -0700)]
Merge "add White balance & disable UI elements" into gb-ub-photos-arches

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 agoam 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
Mangesh Ghiware [Wed, 10 Oct 2012 22:20:39 +0000 (15:20 -0700)]
am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches

* commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f':
  Disable in-place crop for 360 panorama

11 years agoMerge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
Mangesh Ghiware [Wed, 10 Oct 2012 22:19:03 +0000 (15:19 -0700)]
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches

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 agoDisable in-place crop for 360 panorama
Mangesh Ghiware [Wed, 10 Oct 2012 21:58:35 +0000 (14:58 -0700)]
Disable in-place crop for 360 panorama

Bug: 7281479
Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f

11 years agoam db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 21:06:10 +0000 (14:06 -0700)]
am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches

* commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b':
  Fix missing camera thumbnail in filmstrip

11 years agoMerge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 21:04:06 +0000 (14:04 -0700)]
Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches

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 agoFix missing camera thumbnail in filmstrip
Bobby Georgescu [Wed, 10 Oct 2012 20:42:55 +0000 (13:42 -0700)]
Fix missing camera thumbnail in filmstrip

Bug: 7319894
Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6

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 agoMerge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
George Mount [Wed, 10 Oct 2012 17:41:16 +0000 (10:41 -0700)]
Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches

* changes:
  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 eece6da4: Support REVERSE in lockOrientation
John Reck [Wed, 10 Oct 2012 16:58:10 +0000 (09:58 -0700)]
am eece6da4: Support REVERSE in lockOrientation

* commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c':
  Support REVERSE in lockOrientation

11 years agoSupport REVERSE in lockOrientation
John Reck [Wed, 10 Oct 2012 16:44:48 +0000 (09:44 -0700)]
Support REVERSE in lockOrientation

 Bug: 7314703

Change-Id: Id459e49496f562e75c1485d9d717daa28020a587

11 years agoam 866ed7ab: Fix inverted panorama preview
John Reck [Wed, 10 Oct 2012 15:30:27 +0000 (08:30 -0700)]
am 866ed7ab: Fix inverted panorama preview

* commit '866ed7abd7960efc7986a3624414a730e17f33a6':
  Fix inverted panorama preview

11 years agoFix inverted panorama preview
John Reck [Wed, 10 Oct 2012 05:10:13 +0000 (22:10 -0700)]
Fix inverted panorama preview

 Bug: 7314703
 Panorama only support rotations of 0 and 90, so if it is greater
 than that flip the output surface texture

Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b

11 years agoam 1b72a2f1: small fix to red eye code
John Hoford [Wed, 10 Oct 2012 01:13:49 +0000 (18:13 -0700)]
am 1b72a2f1: small fix to red eye code

* commit '1b72a2f1124610b8050dbbdff9f1bb548199fd2e':
  small fix to red eye code

11 years agosmall fix to red eye code
John Hoford [Wed, 10 Oct 2012 01:05:51 +0000 (18:05 -0700)]
small fix to red eye code

bug:7234321
Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292

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 d78c5734: Merge "Correct stale background on completely empty gallery" into gb...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:45 +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: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 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 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 d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos...
Bobby Georgescu [Tue, 9 Oct 2012 20:23:27 +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 6e733b74: Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:47:22 +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 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 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 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into...
Wu-cheng Li [Tue, 9 Oct 2012 15:00:52 +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 2c83c5f0: Handle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 14:55:40 +0000 (07:55 -0700)]
am 2c83c5f0: Handle stitching progress in secure album.

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

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 71ce96fc: Fix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 14:49:17 +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 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 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 02:34:22 +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:21 +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 a66df0c9: Added the rest of the Geometryfilter stubs.
Ruben Brunk [Tue, 9 Oct 2012 01:28:07 +0000 (18:28 -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 f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos...
nicolasroard [Tue, 9 Oct 2012 00:55:40 +0000 (17:55 -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 4438a7cc: Fix details dialog not being dismissed
Doris Liu [Tue, 9 Oct 2012 00:23:16 +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 a29eeac8: Use framework orientation
John Reck [Mon, 8 Oct 2012 22:27:12 +0000 (15:27 -0700)]
am a29eeac8: Use framework orientation

* commit 'a29eeac8993b221d98cffbec5583b5cba1921c89':
  Use framework orientation

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:47 +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 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: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 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 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:27 +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 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