OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 41a3a3be: Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:33:09 +0000 (15:33 -0700)]
am 41a3a3be: Fix slider layout

* commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525':
  Fix slider layout

11 years agoFix slider layout
nicolasroard [Tue, 23 Oct 2012 22:25:39 +0000 (15:25 -0700)]
Fix slider layout

bug:7383094
Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c

11 years agoam cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 22:10:56 +0000 (15:10 -0700)]
am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0':
  Express the borders size in percentages

11 years agoam d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:10:55 +0000 (15:10 -0700)]
am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c':
  Fix NPE

11 years agoMerge "Express the borders size in percentages" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 22:09:53 +0000 (15:09 -0700)]
Merge "Express the borders size in percentages" into gb-ub-photos-arches

11 years agoMerge "Fix NPE" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:08:35 +0000 (15:08 -0700)]
Merge "Fix NPE" into gb-ub-photos-arches

11 years agoam 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 22:06:44 +0000 (15:06 -0700)]
am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '7d7f91e1771e67af1fca5f2b3f221968df3de077':
  Fix NPE in detecting panoramas.

11 years agoMerge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 22:03:14 +0000 (15:03 -0700)]
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

11 years agoFix NPE
John Reck [Tue, 23 Oct 2012 20:44:58 +0000 (13:44 -0700)]
Fix NPE

 Bug: 7399438

Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e

11 years agoam ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 21:33:47 +0000 (14:33 -0700)]
am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'ea6360298ca823634c9f2ee8990546f753288da9':
  Hide the history panel on rotation

11 years agoExpress the borders size in percentages
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Express the borders size in percentages

bug:7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb

11 years agoMerge "Hide the history panel on rotation" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 21:31:49 +0000 (14:31 -0700)]
Merge "Hide the history panel on rotation" into gb-ub-photos-arches

11 years agoFix NPE in detecting panoramas.
George Mount [Tue, 23 Oct 2012 21:28:58 +0000 (14:28 -0700)]
Fix NPE in detecting panoramas.

 Bug 7398022

Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724

11 years agoHide the history panel on rotation
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Hide the history panel on rotation

bug:7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93

11 years agoam a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precomp...
Sascha Haeberling [Tue, 23 Oct 2012 21:05:21 +0000 (14:05 -0700)]
am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit 'a681f36f3c0642135a3ad4dcd529cbff08798d53':
  Make sure we use xmp_toolkit from external instead of the precompiled JAR.

11 years agoMerge "Make sure we use xmp_toolkit from external instead of the precompiled JAR...
Sascha Haeberling [Tue, 23 Oct 2012 21:03:32 +0000 (14:03 -0700)]
Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

11 years agoMake sure we use xmp_toolkit from external instead of the precompiled JAR.
Sascha Haeberling [Tue, 23 Oct 2012 20:38:52 +0000 (13:38 -0700)]
Make sure we use xmp_toolkit from external instead of the precompiled JAR.

 Bug: 7400527

Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155

11 years agoam 5d7e98f7: Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 20:05:46 +0000 (13:05 -0700)]
am 5d7e98f7: Fix another potential crash in Curves

* commit '5d7e98f781fbd450295850d00adfb50540d53b3f':
  Fix another potential crash in Curves

11 years agoFix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 19:59:16 +0000 (12:59 -0700)]
Fix another potential crash in Curves

bug:7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080

11 years agoam 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:47:27 +0000 (12:47 -0700)]
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '361f6234c02207b2d812db0b2aeed267013c9a1f':
  Fix flickering in geometry panel

11 years agoMerge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:45:50 +0000 (12:45 -0700)]
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

11 years agoFix flickering in geometry panel
nicolasroard [Tue, 23 Oct 2012 19:18:54 +0000 (12:18 -0700)]
Fix flickering in geometry panel

bug:7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5

11 years agoam c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos...
Bobby Georgescu [Tue, 23 Oct 2012 18:52:53 +0000 (11:52 -0700)]
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0':
  Show Panorama viewer button in filmstrip mode

11 years agoMerge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 18:51:06 +0000 (11:51 -0700)]
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

11 years agoam a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:42:32 +0000 (11:42 -0700)]
am a9f280f9: Add copyright notices

* commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1':
  Add copyright notices

11 years agoShow Panorama viewer button in filmstrip mode
Bobby Georgescu [Tue, 23 Oct 2012 18:20:48 +0000 (11:20 -0700)]
Show Panorama viewer button in filmstrip mode

Bug: 7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c

11 years agoAdd copyright notices
nicolasroard [Tue, 23 Oct 2012 18:26:38 +0000 (11:26 -0700)]
Add copyright notices

bug:7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1

11 years agoam ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:14:20 +0000 (11:14 -0700)]
am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc':
  Fix slow / jerky tracking in Curves

11 years agoFix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 17:51:42 +0000 (10:51 -0700)]
Fix slow / jerky tracking in Curves

bug:7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91

11 years agoam 2569df23: Merge "Shows filtered images in geometry modules and comparison." into...
nicolasroard [Tue, 23 Oct 2012 17:36:47 +0000 (10:36 -0700)]
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '2569df233987d1f43400a813ceb2ce72c738a4c3':
  Shows filtered images in geometry modules and comparison.

11 years agoMerge "Shows filtered images in geometry modules and comparison." into gb-ub-photos...
nicolasroard [Tue, 23 Oct 2012 17:34:10 +0000 (10:34 -0700)]
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

11 years agoam 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos...
George Mount [Tue, 23 Oct 2012 17:28:35 +0000 (10:28 -0700)]
am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '24af89b96e824e4a5f9053c2024f507087117c22':
  Ensure photo sphere icon shows for panoramas.

11 years agoMerge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 17:26:49 +0000 (10:26 -0700)]
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

11 years agoShows filtered images in geometry modules and comparison.
nicolasroard [Sat, 20 Oct 2012 19:32:05 +0000 (12:32 -0700)]
Shows filtered images in geometry modules and comparison.

bug:7279469
bug:7379286
bug:7344214
bug:7379140

Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves

Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8

11 years agoEnsure photo sphere icon shows for panoramas.
George Mount [Tue, 23 Oct 2012 16:33:20 +0000 (09:33 -0700)]
Ensure photo sphere icon shows for panoramas.

 Bug 7393844

Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63

11 years agoam 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:57:00 +0000 (08:57 -0700)]
am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:55:17 +0000 (07:55 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:53:21 +0000 (07:53 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 02:58:11 +0000 (19:58 -0700)]
am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79':
  on entry check if Tiny Planet if not remove UI

11 years agoon entry check if Tiny Planet if not remove UI
John Hoford [Mon, 22 Oct 2012 23:26:26 +0000 (16:26 -0700)]
on entry check if Tiny Planet if not remove UI

bug:7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83

11 years agoam 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
Mangesh Ghiware [Tue, 23 Oct 2012 01:44:26 +0000 (18:44 -0700)]
am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit '6377075221ef5b31c7f87e7f0103124e5177c2c3':
  Add activity-alias for video camera

11 years agoMerge "Add activity-alias for video camera" into gb-ub-photos-arches
Mangesh Ghiware [Tue, 23 Oct 2012 01:43:03 +0000 (18:43 -0700)]
Merge "Add activity-alias for video camera" into gb-ub-photos-arches

11 years agoam afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:03:02 +0000 (18:03 -0700)]
am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c':
  Minor transition tweaks

11 years agoMerge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:00:44 +0000 (18:00 -0700)]
Merge "Minor transition tweaks" into gb-ub-photos-arches

11 years agoam 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos...
Doris Liu [Tue, 23 Oct 2012 00:57:48 +0000 (17:57 -0700)]
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '3a64ad361b9d48407abd902b26949d3c6b34af66':
  Show panorama thumbs in Gallery grid view

11 years agoMerge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
Doris Liu [Tue, 23 Oct 2012 00:55:57 +0000 (17:55 -0700)]
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

11 years agoMinor transition tweaks
Bobby Georgescu [Mon, 22 Oct 2012 22:28:04 +0000 (15:28 -0700)]
Minor transition tweaks

Bug: 7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c

11 years agoShow panorama thumbs in Gallery grid view
Doris Liu [Sat, 20 Oct 2012 02:16:14 +0000 (19:16 -0700)]
Show panorama thumbs in Gallery grid view

Bug: 7362229
Bug: 7378208

In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.

Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b

11 years agoam bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
Hung-ying Tyan [Mon, 22 Oct 2012 23:23:47 +0000 (16:23 -0700)]
am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468':
  Move new exif lib to gallerycommon.

11 years agoMerge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
Hung-ying Tyan [Mon, 22 Oct 2012 23:22:21 +0000 (16:22 -0700)]
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

11 years agoam ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:21:38 +0000 (16:21 -0700)]
am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit 'ff4e0460b4cdeb329e37cb5f41eedc45717a17c4':
  Drive GLRootView with Choreographer

11 years agoMerge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:19:52 +0000 (16:19 -0700)]
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

11 years agoDrive GLRootView with Choreographer
John Reck [Mon, 22 Oct 2012 23:11:01 +0000 (16:11 -0700)]
Drive GLRootView with Choreographer

 Bug: 7332724
 By routing requestRender through postOnAnimation we can drive
 the GLRootView's rendering with the UI thread's coreographer, which
 ensures that touch events are processed before drawing

Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c

11 years agoam e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into...
Bobby Georgescu [Mon, 22 Oct 2012 22:56:08 +0000 (15:56 -0700)]
am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit 'e96e907a01c0d633828dade014f07a5b93b07356':
  Scroll to placeholder in gallery filmstrip launches camera

11 years agoMerge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 22:53:30 +0000 (15:53 -0700)]
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

11 years agoAdd activity-alias for video camera
Mangesh Ghiware [Mon, 22 Oct 2012 22:47:22 +0000 (15:47 -0700)]
Add activity-alias for video camera

Bug: 7390076
Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357

11 years agoam 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Ruben Brunk [Mon, 22 Oct 2012 22:22:45 +0000 (15:22 -0700)]
am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '168db2f10069c3a15a9c3b9d0325cac0ae779b99':
  Fix geometry xforms & minor bug.

11 years agoMerge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Ruben Brunk [Mon, 22 Oct 2012 22:20:55 +0000 (15:20 -0700)]
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

11 years agoScroll to placeholder in gallery filmstrip launches camera
Bobby Georgescu [Mon, 22 Oct 2012 20:49:35 +0000 (13:49 -0700)]
Scroll to placeholder in gallery filmstrip launches camera

Bug: 7368079
Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97

11 years agoam 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 21:50:22 +0000 (14:50 -0700)]
am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4':
  Increase album label size on high-res screens

11 years agoMerge "Increase album label size on high-res screens" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 21:48:42 +0000 (14:48 -0700)]
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

11 years agoam 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos...
George Mount [Mon, 22 Oct 2012 21:37:09 +0000 (14:37 -0700)]
am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit '58d326ea368ae275f03ec158a9ec5f9d2965593a':
  Add null-check for StitchingServiceProvider.

11 years agoMerge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
George Mount [Mon, 22 Oct 2012 21:35:50 +0000 (14:35 -0700)]
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

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

* commit '73c89b45b122cbdcbcffa618f0fa2386829d710a':
  Import translations. DO NOT MERGE

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 21:27:14 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoIncrease album label size on high-res screens
Bobby Georgescu [Mon, 22 Oct 2012 21:18:32 +0000 (14:18 -0700)]
Increase album label size on high-res screens

Bug: 7382498
Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947

11 years agoFix geometry xforms & minor bug.
Ruben Brunk [Fri, 19 Oct 2012 06:39:18 +0000 (23:39 -0700)]
Fix geometry xforms & minor bug.

Bug: 7376048

Fixed geometry transform.  Fixed minor bug where the foldername
for saved edited images was incorrect.

Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3

11 years agoAdd null-check for StitchingServiceProvider.
George Mount [Mon, 22 Oct 2012 18:39:25 +0000 (11:39 -0700)]
Add null-check for StitchingServiceProvider.

 Bug 7386827

Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03

11 years agoam 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 18:26:39 +0000 (11:26 -0700)]
am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit '1dace572562075e755823bbb7b02d09bb6ca1259':
  Better transition between Gallery and editor

11 years agoam 0a32b7af: Fix to ensure visible history adapter strings are from xml.
Ruben Brunk [Mon, 22 Oct 2012 18:26:37 +0000 (11:26 -0700)]
am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '0a32b7afc5286a5c7aa334b9338591d61a49731f':
  Fix to ensure visible history adapter strings are from xml.

11 years agoMerge "Better transition between Gallery and editor" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 18:25:46 +0000 (11:25 -0700)]
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

11 years agoFix to ensure visible history adapter strings are from xml.
Ruben Brunk [Sat, 20 Oct 2012 01:48:22 +0000 (18:48 -0700)]
Fix to ensure visible history adapter strings are from xml.

Bug: 7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1

11 years agoBetter transition between Gallery and editor
Bobby Georgescu [Mon, 22 Oct 2012 18:13:34 +0000 (11:13 -0700)]
Better transition between Gallery and editor

Bug: 7346155
Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf

11 years agoam 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
nicolasroard [Mon, 22 Oct 2012 16:49:59 +0000 (09:49 -0700)]
am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit '51e5b7198dbf31bdfaefc7d01517050359571eb8':
  Fix the undo/redo/reset menu item state

11 years agoMerge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
nicolasroard [Mon, 22 Oct 2012 16:47:34 +0000 (09:47 -0700)]
Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

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

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 15:14:33 +0000 (08:14 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 03:29:44 +0000 (20:29 -0700)]
am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches

* commit 'e42eca39c726bce2452ee9d9a1c4d4cb042031ba':
  Tweak transition animations

11 years agoMerge "Tweak transition animations" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 03:27:21 +0000 (20:27 -0700)]
Merge "Tweak transition animations" into gb-ub-photos-arches

11 years agoTweak transition animations
Bobby Georgescu [Mon, 22 Oct 2012 03:17:08 +0000 (20:17 -0700)]
Tweak transition animations

Bug: 7376109
Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8

11 years agoMove new exif lib to gallerycommon.
Hung-ying Tyan [Fri, 19 Oct 2012 12:50:50 +0000 (20:50 +0800)]
Move new exif lib to gallerycommon.

https://googleplex-android-review.googlesource.com/#/c/242047 depends on this.

Bug: 6667860
Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570

11 years agoFix the undo/redo/reset menu item state
nicolasroard [Mon, 22 Oct 2012 01:42:07 +0000 (18:42 -0700)]
Fix the undo/redo/reset menu item state

bug:7357734

- enable/disable the undo/redo/reset menu item
depending on the history.

Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825

11 years agoam c778aab1: Prevent unveil direction to change as long as no touch up
nicolasroard [Mon, 22 Oct 2012 00:17:03 +0000 (17:17 -0700)]
am c778aab1: Prevent unveil direction to change as long as no touch up

* commit 'c778aab129fb001fdff1ccf167867fc40fbf7523':
  Prevent unveil direction to change as long as no touch up

11 years agoPrevent unveil direction to change as long as no touch up
nicolasroard [Sun, 21 Oct 2012 23:51:08 +0000 (16:51 -0700)]
Prevent unveil direction to change as long as no touch up

bug:7385925
Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64

11 years agoam 15a056e3: Fix crash in Curves module
nicolasroard [Sun, 21 Oct 2012 23:37:50 +0000 (16:37 -0700)]
am 15a056e3: Fix crash in Curves module

* commit '15a056e3cc1970bc0b99dba71df8222ba0345859':
  Fix crash in Curves module

11 years agoFix crash in Curves module
nicolasroard [Sun, 21 Oct 2012 22:58:50 +0000 (15:58 -0700)]
Fix crash in Curves module

bug:7379140
Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325

11 years agoam 104165f1: Fix several issues with crop/straighten
nicolasroard [Sun, 21 Oct 2012 22:54:29 +0000 (15:54 -0700)]
am 104165f1: Fix several issues with crop/straighten

* commit '104165f1f9858bdebb2d219b077f5227203f7c02':
  Fix several issues with crop/straighten

11 years agoFix several issues with crop/straighten
nicolasroard [Sun, 21 Oct 2012 22:39:44 +0000 (15:39 -0700)]
Fix several issues with crop/straighten

bug:7386266
bug:7386270
bug:7385727

- use a transparent white for the bounds instead of green
- add "rule of third" lines to the crop tool
- improves preview image quality for geometric operations

Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d

11 years agoam 4d276f33: Only translate the main panel if we have to.
nicolasroard [Sun, 21 Oct 2012 22:20:13 +0000 (15:20 -0700)]
am 4d276f33: Only translate the main panel if we have to.

* commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c':
  Only translate the main panel if we have to.

11 years agoOnly translate the main panel if we have to.
nicolasroard [Sun, 21 Oct 2012 21:53:03 +0000 (14:53 -0700)]
Only translate the main panel if we have to.

bug:7386882
Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc

11 years agoam 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com...
nicolasroard [Sun, 21 Oct 2012 20:28:38 +0000 (13:28 -0700)]
am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

* commit '267c4c6a513671441031a9c21839995aecc4fc52':
  Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

11 years agoRevert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
nicolasroard [Sun, 21 Oct 2012 19:58:59 +0000 (12:58 -0700)]
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

bug:7384984
Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a

11 years agoam 2daced6b: Fix for active action bar in camera
Doris Liu [Sat, 20 Oct 2012 17:56:29 +0000 (10:56 -0700)]
am 2daced6b: Fix for active action bar in camera

* commit '2daced6baacd59850e7c64ea02f2479530654ed8':
  Fix for active action bar in camera

11 years agoFix for active action bar in camera
Doris Liu [Sat, 20 Oct 2012 01:18:39 +0000 (18:18 -0700)]
Fix for active action bar in camera

Bug: 7377404
Bug: 7384972
Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a

11 years agoam 2f879102: Adds a tiny planet (stereographic projection) image filter.
Sascha Haeberling [Sat, 20 Oct 2012 00:27:44 +0000 (17:27 -0700)]
am 2f879102: Adds a tiny planet (stereographic projection) image filter.

* commit '2f879102d630815df64636b8d37e3a7eea8e8b65':
  Adds a tiny planet (stereographic projection) image filter.

11 years agoAdds a tiny planet (stereographic projection) image filter.
Sascha Haeberling [Fri, 19 Oct 2012 22:43:03 +0000 (15:43 -0700)]
Adds a tiny planet (stereographic projection) image filter.

 Bug: 7293391

Also fixes an issue where the preview value was statically set to 100.
This adds a preview parameter value that can be set for this purpose.

Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e

11 years agoam e9c55b28: Add the infrastructure to support Tiny Planet
John Hoford [Fri, 19 Oct 2012 23:26:14 +0000 (16:26 -0700)]
am e9c55b28: Add the infrastructure to support Tiny Planet

* commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4':
  Add the infrastructure to support Tiny Planet

11 years agoam 41b3cff6: Fix delete and undo behavior on filmstrip
Bobby Georgescu [Fri, 19 Oct 2012 23:21:05 +0000 (16:21 -0700)]
am 41b3cff6: Fix delete and undo behavior on filmstrip

* commit '41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605':
  Fix delete and undo behavior on filmstrip

11 years agoAdd the infrastructure to support Tiny Planet
John Hoford [Fri, 19 Oct 2012 22:32:12 +0000 (15:32 -0700)]
Add the infrastructure to support Tiny Planet

bug:7293391
Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19