OSDN Git Service

android-x86/packages-apps-Camera2.git
12 years agoam 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos...
Wu-cheng Li [Mon, 15 Oct 2012 05:35:26 +0000 (22:35 -0700)]
am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

* commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8':
  Add stitching panorama image to secure album.

12 years agoMerge "Add stitching panorama image to secure album." into gb-ub-photos-arches
Wu-cheng Li [Mon, 15 Oct 2012 05:34:06 +0000 (22:34 -0700)]
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

12 years agoam 5ec40a6b: Fix dimensions to use dips instead of pixels
nicolasroard [Sun, 14 Oct 2012 02:25:17 +0000 (19:25 -0700)]
am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1':
  Fix dimensions to use dips instead of pixels

12 years agoFix dimensions to use dips instead of pixels
nicolasroard [Sun, 14 Oct 2012 01:38:51 +0000 (18:38 -0700)]
Fix dimensions to use dips instead of pixels

bug:7343798
Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21

12 years agoam b470b229: Fix cropping and saving issues
nicolasroard [Sun, 14 Oct 2012 01:10:26 +0000 (18:10 -0700)]
am b470b229:     Fix cropping and saving issues

* commit 'b470b229fbfd782db6758f331e4a6f918e305b02':
  Fix cropping and saving issues

12 years ago Fix cropping and saving issues
nicolasroard [Sun, 14 Oct 2012 00:24:31 +0000 (17:24 -0700)]
Fix cropping and saving issues

    bug:7342359

Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854

12 years agoAdd stitching panorama image to secure album.
Wu-cheng Li [Sat, 13 Oct 2012 07:07:27 +0000 (15:07 +0800)]
Add stitching panorama image to secure album.

bug:7285105
Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580

12 years agoam 48b63eec: Merge "Hide Camera button on empty gallery when not available" into...
Bobby Georgescu [Sat, 13 Oct 2012 02:36:28 +0000 (19:36 -0700)]
am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f':
  Hide Camera button on empty gallery when not available

12 years agoMerge "Hide Camera button on empty gallery when not available" into gb-ub-photos...
Bobby Georgescu [Sat, 13 Oct 2012 02:35:21 +0000 (19:35 -0700)]
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

12 years agoHide Camera button on empty gallery when not available
Bobby Georgescu [Sat, 13 Oct 2012 01:00:51 +0000 (18:00 -0700)]
Hide Camera button on empty gallery when not available

Bug: 7342583
Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a

12 years agoam 9b302e31: Icon fix
John Hoford [Fri, 12 Oct 2012 22:17:32 +0000 (15:17 -0700)]
am 9b302e31: Icon fix

* commit '9b302e31fb92408e1b631988320981910edb8c37':
  Icon fix

12 years agoIcon fix
John Hoford [Fri, 12 Oct 2012 22:07:49 +0000 (15:07 -0700)]
Icon fix

bug:7328726
Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65

12 years agoam 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Fri, 12 Oct 2012 21:09:21 +0000 (14:09 -0700)]
am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb':
  Improve performance of filmstrip

12 years agoMerge "Improve performance of filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Fri, 12 Oct 2012 21:08:03 +0000 (14:08 -0700)]
Merge "Improve performance of filmstrip" into gb-ub-photos-arches

12 years agoam 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub...
Ruben Brunk [Fri, 12 Oct 2012 21:04:11 +0000 (14:04 -0700)]
am 7776408c: Merge "Adding crop UI.  Fixes a number of other UI bugs." into gb-ub-photos-arches

* commit '7776408c5bbd4bb2669b7a577d157dc1967e434e':
  Adding crop UI.  Fixes a number of other UI bugs.

12 years agoMerge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 21:02:27 +0000 (14:02 -0700)]
Merge "Adding crop UI.  Fixes a number of other UI bugs." into gb-ub-photos-arches

12 years agoAdding crop UI. Fixes a number of other UI bugs.
Ruben Brunk [Fri, 12 Oct 2012 12:52:06 +0000 (05:52 -0700)]
Adding crop UI.  Fixes a number of other UI bugs.

Bug:7337191
Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240

12 years agoImprove performance of filmstrip
Bobby Georgescu [Fri, 12 Oct 2012 00:53:22 +0000 (17:53 -0700)]
Improve performance of filmstrip

Bug: 7336758

Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f

12 years agoam 43b6cf3a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 18:10:24 +0000 (11:10 -0700)]
am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE

* commit '43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 17:45:43 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 17:45:20 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

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

12 years agoam 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues...
Ruben Brunk [Fri, 12 Oct 2012 17:30:29 +0000 (10:30 -0700)]
am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches

* commit '4247c2325851501cb7f4b72ea4a4b84abc0e6da7':
  Moves matrix function to GeometryMetadata. Fixes scaling issues.

12 years agoMerge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb...
Ruben Brunk [Fri, 12 Oct 2012 17:28:22 +0000 (10:28 -0700)]
Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches

12 years agoMoves matrix function to GeometryMetadata. Fixes scaling issues.
Ruben Brunk [Fri, 12 Oct 2012 09:03:18 +0000 (02:03 -0700)]
Moves matrix function to GeometryMetadata. Fixes scaling issues.

Bug:7337191
Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d

12 years agoam 143a4eb4: Fix XML layout
nicolasroard [Fri, 12 Oct 2012 16:25:26 +0000 (09:25 -0700)]
am 143a4eb4: Fix XML layout

* commit '143a4eb4578abd5b319516a68a1b63ab27cf6ee3':
  Fix XML layout

12 years agoFix XML layout
nicolasroard [Fri, 12 Oct 2012 08:16:31 +0000 (01:16 -0700)]
Fix XML layout

bug:7302553
Change-Id: Id889c9c4ac083b85f5d85e316aee6a10bb4bbbd0

12 years agoam 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches
nicolasroard [Fri, 12 Oct 2012 07:59:23 +0000 (00:59 -0700)]
am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches

* commit '808dbe19752361ad171b58836df7f195deee8019':
  Add back button handling

12 years agoMerge "Add back button handling" into gb-ub-photos-arches
nicolasroard [Fri, 12 Oct 2012 07:58:04 +0000 (00:58 -0700)]
Merge "Add back button handling" into gb-ub-photos-arches

12 years agoAdd back button handling
nicolasroard [Fri, 12 Oct 2012 07:18:51 +0000 (00:18 -0700)]
Add back button handling

bug:7332980

- fix crash as well.

Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4

12 years agoam 423e45e4: Refresh panorama image after stitching completion
Mangesh Ghiware [Fri, 12 Oct 2012 06:29:56 +0000 (23:29 -0700)]
am 423e45e4: Refresh panorama image after stitching completion

* commit '423e45e492d4ebdc41ecfeba73299de23b1463c4':
  Refresh panorama image after stitching completion

12 years agoRefresh panorama image after stitching completion
Mangesh Ghiware [Fri, 12 Oct 2012 06:11:27 +0000 (23:11 -0700)]
Refresh panorama image after stitching completion

Bug: 7336784

Updating photo refreshes the supported operations which indiate if said
MediaItem is a panorama or not.

Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0

12 years agoam 6111c54d: Fix UI
nicolasroard [Fri, 12 Oct 2012 05:38:34 +0000 (22:38 -0700)]
am 6111c54d: Fix UI

* commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9':
  Fix UI

12 years agoFix UI
nicolasroard [Fri, 12 Oct 2012 04:36:12 +0000 (21:36 -0700)]
Fix UI

bug:7328726

- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons

Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7

12 years agoam ea5df36a: layouts, image icons, and layer behavour
John Hoford [Fri, 12 Oct 2012 04:33:48 +0000 (21:33 -0700)]
am ea5df36a: layouts, image icons, and layer behavour

* commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5':
  layouts, image icons, and layer behavour

12 years agolayouts, image icons, and layer behavour
John Hoford [Fri, 12 Oct 2012 04:04:41 +0000 (21:04 -0700)]
layouts, image icons, and layer behavour

bug:7328726
Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92

12 years agoam 7d161351: Adjust text on Apply button
Bart Sears [Fri, 12 Oct 2012 04:14:37 +0000 (21:14 -0700)]
am 7d161351: Adjust text on Apply button

* commit '7d161351c5aac3f88eb61003d56f30275ad4a180':
  Adjust text on Apply button

12 years agoAdjust text on Apply button
Bart Sears [Fri, 12 Oct 2012 03:34:21 +0000 (20:34 -0700)]
Adjust text on Apply button

ALL CAPS was a bit loud, so go back to mixed case, lower
font size to 18dip, and remove ":".

Bug: 7333492
Change-Id: I18885808437e6328ec94c40df25ea0678d381825

12 years agoam 8985e064: Hide history panel for now
nicolasroard [Fri, 12 Oct 2012 04:11:29 +0000 (21:11 -0700)]
am 8985e064: Hide history panel for now

* commit '8985e0647b6a2966e710a51d4f6001faf44b5ddc':
  Hide history panel for now

12 years agoHide history panel for now
nicolasroard [Fri, 12 Oct 2012 04:02:51 +0000 (21:02 -0700)]
Hide history panel for now

bug:7325872
Change-Id: Ica442d50e797a8ae73f1ddf94daee02d907583d2

12 years agoam 8e1536da: Add new borders
nicolasroard [Fri, 12 Oct 2012 04:02:17 +0000 (21:02 -0700)]
am 8e1536da: Add new borders

* commit '8e1536da92f155731d5fd729ec5b2bf00709091a':
  Add new borders

12 years agoAdd new borders
nicolasroard [Fri, 12 Oct 2012 03:17:44 +0000 (20:17 -0700)]
Add new borders

bug:7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a

12 years agoam e533f659: Fixes Rotate, Flip, Straighten tools.
nicolasroard [Fri, 12 Oct 2012 03:16:57 +0000 (20:16 -0700)]
am e533f659: Fixes Rotate, Flip, Straighten tools.

* commit 'e533f65961ed601ded1803caeab6cef0a778d2f2':
  Fixes Rotate, Flip, Straighten tools.

12 years agoFixes Rotate, Flip, Straighten tools.
nicolasroard [Fri, 12 Oct 2012 01:12:09 +0000 (18:12 -0700)]
Fixes Rotate, Flip, Straighten tools.

bug:7314849
Bug:7224232
Bug:7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e

12 years agoMerge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce
Hung-ying Tyan [Fri, 12 Oct 2012 00:57:46 +0000 (17:57 -0700)]
Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce

12 years agoam ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 12 Oct 2012 00:30:53 +0000 (17:30 -0700)]
am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

12 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 12 Oct 2012 00:29:41 +0000 (17:29 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

12 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 12 Oct 2012 00:29:13 +0000 (17:29 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

12 years agoam 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos...
Ruben Brunk [Fri, 12 Oct 2012 00:27:42 +0000 (17:27 -0700)]
am 11a21df4: Merge "Fixed apply bar text.  Moved strings to xml." into gb-ub-photos-arches

* commit '11a21df4be6984a180e27b9915a9d6af7e7ef359':
  Fixed apply bar text.  Moved strings to xml.

12 years agoMerge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 00:26:29 +0000 (17:26 -0700)]
Merge "Fixed apply bar text.  Moved strings to xml." into gb-ub-photos-arches

12 years agoam 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into...
Chris Craik [Fri, 12 Oct 2012 00:16:15 +0000 (17:16 -0700)]
am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches

* commit '8e9072b0a95d48caa8b1d9cdb9b385e92c33e292':
  Alias com.android.camera.Camera to point at CameraActivity

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 00:14:30 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 00:14:06 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMerge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos...
Chris Craik [Fri, 12 Oct 2012 00:14:05 +0000 (17:14 -0700)]
Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches

12 years agoam a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos...
John Hoford [Fri, 12 Oct 2012 00:11:02 +0000 (17:11 -0700)]
am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches

* commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197':
  fixed manta image size and double FX issue

12 years agoMerge "fixed manta image size and double FX issue" into gb-ub-photos-arches
John Hoford [Fri, 12 Oct 2012 00:09:39 +0000 (17:09 -0700)]
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches

12 years agoFixed apply bar text. Moved strings to xml.
Ruben Brunk [Thu, 11 Oct 2012 22:16:58 +0000 (15:16 -0700)]
Fixed apply bar text.  Moved strings to xml.

Bug: 7333492
Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada

12 years agoam 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
Michael Kolb [Thu, 11 Oct 2012 23:58:43 +0000 (16:58 -0700)]
am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches

* commit '310a93dc17574f3595b03da6988a2fbf3b382f51':
  Remove old 360 icons

12 years agoMerge "Remove old 360 icons" into gb-ub-photos-arches
Michael Kolb [Thu, 11 Oct 2012 23:56:27 +0000 (16:56 -0700)]
Merge "Remove old 360 icons" into gb-ub-photos-arches

12 years agoam 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
Sascha Haeberling [Thu, 11 Oct 2012 23:38:16 +0000 (16:38 -0700)]
am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches

* commit '93f074e4672b81a5a4e38ea7ddebe3c916ccddfd':
  Removing the disabled undo button.

12 years agoMerge "Removing the disabled undo button." into gb-ub-photos-arches
Sascha Haeberling [Thu, 11 Oct 2012 23:36:05 +0000 (16:36 -0700)]
Merge "Removing the disabled undo button." into gb-ub-photos-arches

12 years agoAlias com.android.camera.Camera to point at CameraActivity
Chris Craik [Thu, 11 Oct 2012 21:06:45 +0000 (14:06 -0700)]
Alias com.android.camera.Camera to point at CameraActivity

bug:7291128
Change-Id: Id6649024516ba79fa042284db95d29a37552eef4

12 years agoRemove old 360 icons
Michael Kolb [Thu, 11 Oct 2012 23:26:00 +0000 (16:26 -0700)]
Remove old 360 icons

  Bug: 7331839

Change-Id: Ie2de6336cd1c485ddacf51b6092c29f6feb9e4da

12 years agoRemoving the disabled undo button.
Sascha Haeberling [Thu, 11 Oct 2012 23:04:01 +0000 (16:04 -0700)]
Removing the disabled undo button.

 Bug: 7333546

Addendum to http://go/ag//#/c/238167/

Change-Id: If39d93ffa9367ecd6b731c2c32ed0cab055000f4

12 years agoam dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos...
Bobby Georgescu [Thu, 11 Oct 2012 23:01:45 +0000 (16:01 -0700)]
am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches

* commit 'dd1586912b5da958b33a0d9f07312160d1cb103b':
  Change ActionBar spinner text size on rotate

12 years agoMerge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 23:00:01 +0000 (16:00 -0700)]
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches

12 years agoam 825afb1b: Move calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 22:54:22 +0000 (15:54 -0700)]
am 825afb1b: Move calls to LightCycleHelper off the UI thread.

* commit '825afb1b3e7d15b5c258d664ee008dc68da1c407':
  Move calls to LightCycleHelper off the UI thread.

12 years agoMove calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 01:37:24 +0000 (18:37 -0700)]
Move calls to LightCycleHelper off the UI thread.

Bug: 7320303

Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.

Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e

12 years agoChange ActionBar spinner text size on rotate
Bobby Georgescu [Thu, 11 Oct 2012 21:49:09 +0000 (14:49 -0700)]
Change ActionBar spinner text size on rotate

Bug: 7333151
Update the grid/filmstrip spinner switch text to
look and behave like the text in the Gmail app, as
requested by UX.

Change-Id: If822b21899172a35402477868d4f146a8e00cfea

12 years agoam 47df0d2f: Add more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 22:04:58 +0000 (15:04 -0700)]
am 47df0d2f: Add more space between save icon and text

* commit '47df0d2ffb68ae01ee7732b890c4510b8a167616':
  Add more space between save icon and text

12 years agoAdd more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 21:51:13 +0000 (14:51 -0700)]
Add more space between save icon and text

Bug: 7333278
Change-Id: Ief263b9cecc3448b85d00c0e5fc05e8b80cc9bdd

12 years agofixed manta image size and double FX issue
John Hoford [Thu, 11 Oct 2012 19:55:05 +0000 (12:55 -0700)]
fixed manta image size and double FX issue

bug:7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6

12 years agoUse exiftool as ground truth for Exif API test
Earl Ou [Fri, 5 Oct 2012 07:22:33 +0000 (15:22 +0800)]
Use exiftool as ground truth for Exif API test

The ground truth XML file was generated by parsing the
output from Phil Harvey's exiftool. Then we can test photos
from 5000+ different camera provided by exiftool's website.

Change-Id: Ida2c0409929be450a3cbb4331504aadb41138bea

12 years agoam 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos...
George Mount [Thu, 11 Oct 2012 17:35:46 +0000 (10:35 -0700)]
am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches

* commit '37a9333651cead185d982d9b809cb3425a24d3d8':
  Clear cached stitching preview thumbnails.

12 years agoMerge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
George Mount [Thu, 11 Oct 2012 17:35:01 +0000 (10:35 -0700)]
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches

12 years agoam bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into...
Bobby Georgescu [Thu, 11 Oct 2012 17:19:36 +0000 (10:19 -0700)]
am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches

* commit 'bebc94be08667b474587592169155e6cb9855e77':
  Fix size of peripheral items when first opening filmstrip

12 years agoMerge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos...
Bobby Georgescu [Thu, 11 Oct 2012 17:17:40 +0000 (10:17 -0700)]
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches

12 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.

12 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

12 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

12 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

12 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

12 years agoam 5cca8b99: Fix portrait orientation on landscape devices
John Reck [Thu, 11 Oct 2012 17:09:02 +0000 (10:09 -0700)]
am 5cca8b99: Fix portrait orientation on landscape devices

* commit '5cca8b99bebe6a9fbb191a8e1364b81e309a1390':
  Fix portrait orientation on landscape devices

12 years agoClear cached stitching preview thumbnails.
George Mount [Thu, 11 Oct 2012 16:51:32 +0000 (09:51 -0700)]
Clear cached stitching preview thumbnails.

 Bug 7328408

Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064

12 years agoFix portrait orientation on landscape devices
John Reck [Thu, 11 Oct 2012 16:40:18 +0000 (09:40 -0700)]
Fix portrait orientation on landscape devices

 Bug: 7328349

Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9

12 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

12 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.

12 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

12 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

12 years agoMerge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
Bart Sears [Thu, 11 Oct 2012 07:25:17 +0000 (00:25 -0700)]
Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches

12 years agoam 7761357f: Behavior of camera filmstrip in gallery closer to camera
Bobby Georgescu [Thu, 11 Oct 2012 07:25:02 +0000 (00:25 -0700)]
am 7761357f: Behavior of camera filmstrip in gallery closer to camera

* commit '7761357f4a55de6745ac5172355d1a09a9a37492':
  Behavior of camera filmstrip in gallery closer to camera

12 years agoBehavior of camera filmstrip in gallery closer to camera
Bobby Georgescu [Thu, 11 Oct 2012 06:48:52 +0000 (23:48 -0700)]
Behavior of camera filmstrip in gallery closer to camera

Bug: 7329118
Change-Id: I0a5753db301cc53050251455439555aa7ae414c4

12 years agoam 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 07:20:53 +0000 (00:20 -0700)]
am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations

* commit '4d302b8a826ece492c2abefd56b780a65899663e':
  Fix NPE in PhotoPage.updateMenuOperations

12 years agoFix size of peripheral items when first opening filmstrip
Bobby Georgescu [Thu, 11 Oct 2012 06:29:18 +0000 (23:29 -0700)]
Fix size of peripheral items when first opening filmstrip

Bug: 7327570
Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff

12 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

12 years agoFix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 05:04:54 +0000 (22:04 -0700)]
Fix NPE in PhotoPage.updateMenuOperations

Bug: 7324012
Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b

12 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

12 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

12 years agoam f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 04:08:47 +0000 (21:08 -0700)]
am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches

* commit 'f8a46874235b3169a68f8bd6566c81b44de34e7a':
  Defer expensive UI updates in filmstrip

12 years agoMerge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 04:08:06 +0000 (21:08 -0700)]
Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches

12 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.