OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 95404c66: Fix UI stuff
nicolasroard [Wed, 17 Oct 2012 20:52:17 +0000 (13:52 -0700)]
am 95404c66: Fix UI stuff

* commit '95404c666640177abf72ca2278585a16f30cf390':
  Fix UI stuff

11 years agoFix UI stuff
nicolasroard [Wed, 17 Oct 2012 19:47:53 +0000 (12:47 -0700)]
Fix UI stuff

bug:7354368
bug:7362027
bug:7344915
Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4

11 years agoam eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches
John Hoford [Wed, 17 Oct 2012 19:42:16 +0000 (12:42 -0700)]
am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches

* commit 'eb321f77e97b22acab15d60eeacf8a65dc8cceb1':
  rotate images before saving

11 years agoMerge "rotate images before saving" into gb-ub-photos-arches
John Hoford [Wed, 17 Oct 2012 19:40:30 +0000 (12:40 -0700)]
Merge "rotate images before saving" into gb-ub-photos-arches

11 years agoam e3b50f1b: Adds GMS Core PanoramaClient to Gallery
Sascha Haeberling [Wed, 17 Oct 2012 19:02:45 +0000 (12:02 -0700)]
am e3b50f1b: Adds GMS Core PanoramaClient to Gallery

* commit 'e3b50f1bfcfa5c8729f31788eac1a6109a88988b':
  Adds GMS Core PanoramaClient to Gallery

11 years agorotate images before saving
John Hoford [Wed, 17 Oct 2012 18:41:17 +0000 (11:41 -0700)]
rotate images before saving

bug:7353416
Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f

11 years agoAdds GMS Core PanoramaClient to Gallery
Sascha Haeberling [Tue, 16 Oct 2012 01:28:42 +0000 (18:28 -0700)]
Adds GMS Core PanoramaClient to Gallery

 Bug: 7319099

Also updates the API call to LightCycleHelper.
This depends on http://go/ag/#/c/239523/

Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc

11 years agoam 3038d014: add support for configurable slider ranges
John Hoford [Wed, 17 Oct 2012 17:09:02 +0000 (10:09 -0700)]
am 3038d014: add support for configurable slider ranges

* commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf':
  add support for configurable slider ranges

11 years agoadd support for configurable slider ranges
John Hoford [Wed, 17 Oct 2012 00:09:27 +0000 (17:09 -0700)]
add support for configurable slider ranges

bug:7293391
Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96

11 years agoam 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos...
Nicolas Roard [Wed, 17 Oct 2012 16:33:36 +0000 (09:33 -0700)]
am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches

* commit '34c807c8d89f9bfa9565ab52746d845acfb714fd':
  Added fixed aspect ratio support for cropping.

11 years agoam 178a1c11: Fixed flip (mirror) orientation.
Ruben Brunk [Wed, 17 Oct 2012 16:33:35 +0000 (09:33 -0700)]
am 178a1c11: Fixed flip (mirror) orientation.

* commit '178a1c115552a22526fb3a263a01c3cc66300328':
  Fixed flip (mirror) orientation.

11 years agoMerge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
Nicolas Roard [Wed, 17 Oct 2012 16:32:40 +0000 (09:32 -0700)]
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches

11 years agoFixed flip (mirror) orientation.
Ruben Brunk [Wed, 17 Oct 2012 10:52:25 +0000 (03:52 -0700)]
Fixed flip (mirror) orientation.

Bug: 7342859
Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300

11 years agoam a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
Hung-ying Tyan [Wed, 17 Oct 2012 06:35:48 +0000 (23:35 -0700)]
am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches

* commit 'a69a86d5541a9e10e23f0a034cdf6e4416495221':
  Add permission to GalleryProvider.

11 years agoMerge "Add permission to GalleryProvider." into gb-ub-photos-arches
Hung-ying Tyan [Wed, 17 Oct 2012 06:34:06 +0000 (23:34 -0700)]
Merge "Add permission to GalleryProvider." into gb-ub-photos-arches

11 years agoam a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 05:59:25 +0000 (22:59 -0700)]
am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches

* commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872':
  Update empty placeholder asset

11 years agoMerge "Update empty placeholder asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 05:57:12 +0000 (22:57 -0700)]
Merge "Update empty placeholder asset" into gb-ub-photos-arches

11 years agoUpdate empty placeholder asset
Bobby Georgescu [Wed, 17 Oct 2012 05:41:58 +0000 (22:41 -0700)]
Update empty placeholder asset

Bug: 7362100
Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269

11 years agoam a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 04:41:48 +0000 (21:41 -0700)]
am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches

* commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20':
  Update Camera album overlay icon asset

11 years agoMerge "Update Camera album overlay icon asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 04:39:42 +0000 (21:39 -0700)]
Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches

11 years agoUpdate Camera album overlay icon asset
Bobby Georgescu [Wed, 17 Oct 2012 04:35:23 +0000 (21:35 -0700)]
Update Camera album overlay icon asset

Bug: 7332688
Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929

11 years agoam e20cc0cb: Add blue highlight when tapping 360 panorama button
Bobby Georgescu [Wed, 17 Oct 2012 04:25:24 +0000 (21:25 -0700)]
am e20cc0cb: Add blue highlight when tapping 360 panorama button

* commit 'e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d':
  Add blue highlight when tapping 360 panorama button

11 years agoAdd permission to GalleryProvider.
Owen Lin [Tue, 16 Oct 2012 02:22:54 +0000 (10:22 +0800)]
Add permission to GalleryProvider.

bug: 7202384
Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4

11 years agoAdd blue highlight when tapping 360 panorama button
Bobby Georgescu [Wed, 17 Oct 2012 04:06:28 +0000 (21:06 -0700)]
Add blue highlight when tapping 360 panorama button

Bug: 7336676
Change-Id: If16e5aacf1102d0bd7de7ce5d6c90efae4c786f7

11 years agoAdded fixed aspect ratio support for cropping.
Ruben Brunk [Mon, 15 Oct 2012 19:02:54 +0000 (12:02 -0700)]
Added fixed aspect ratio support for cropping.

Bug: 7350377
Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46

11 years agoam 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb...
Bobby Georgescu [Wed, 17 Oct 2012 01:18:47 +0000 (18:18 -0700)]
am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches

* commit '74d5dfd662b92c9ce1aee225291b9d1775cfb49e':
  Consistent animations & up button behavior in Gallery

11 years agoMerge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 01:17:16 +0000 (18:17 -0700)]
Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches

11 years agoam 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photo...
John Reck [Wed, 17 Oct 2012 00:45:15 +0000 (17:45 -0700)]
am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches

* commit '2b543897e077ee4803fa60b6fd7a6a604835b0b3':
  Add hook to manipulate SurfaceTexture transform

11 years agoMerge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
John Reck [Wed, 17 Oct 2012 00:42:32 +0000 (17:42 -0700)]
Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches

11 years agoAdd hook to manipulate SurfaceTexture transform
John Reck [Wed, 17 Oct 2012 00:06:13 +0000 (17:06 -0700)]
Add hook to manipulate SurfaceTexture transform

 Bug: 7302956

Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28

11 years agoConsistent animations & up button behavior in Gallery
Bobby Georgescu [Mon, 15 Oct 2012 20:48:08 +0000 (13:48 -0700)]
Consistent animations & up button behavior in Gallery

Bug: 7302857
Bug: 7295464
This CL makes all of the transition animations throughout
the Gallery app consistent. The animation is the previous
view shrinking and fading out while the new view starts out
bigger than the view port and is coming in to the viewport
size as it fades in. Having consistent animations allows us
to not keep PhotoPage/AlbumPage instances around in certain
cases, making it possible to have consistent up button
behavior when switching between the grid and filmstrip.
Finally, this also makes the transitions in the camera app
filmstrip/grid switching consistent with those in the
gallery app.
Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb

11 years agoam e34a5a5e: Fix when we cannot load an image
nicolasroard [Tue, 16 Oct 2012 21:58:02 +0000 (14:58 -0700)]
am e34a5a5e: Fix when we cannot load an image

* commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0':
  Fix when we cannot load an image

11 years agoFix when we cannot load an image
nicolasroard [Tue, 16 Oct 2012 21:25:09 +0000 (14:25 -0700)]
Fix when we cannot load an image

bug:7321636
Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1

11 years agoam 20fb632c: prevent original now acts like any other FX filter
John Hoford [Tue, 16 Oct 2012 20:50:08 +0000 (13:50 -0700)]
am 20fb632c: prevent original now acts like any other FX filter

* commit '20fb632c407a2dfb5ec769560c61deacc77b8764':
  prevent original now acts like any other FX filter

11 years agoprevent original now acts like any other FX filter
John Hoford [Tue, 16 Oct 2012 19:39:29 +0000 (12:39 -0700)]
prevent original now acts like any other FX filter

bug:7353358
Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf

11 years agoam 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches
nicolasroard [Tue, 16 Oct 2012 20:16:44 +0000 (13:16 -0700)]
am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches

* commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db':
  Fix curves tool

11 years agoMerge "Fix curves tool" into gb-ub-photos-arches
nicolasroard [Tue, 16 Oct 2012 20:14:38 +0000 (13:14 -0700)]
Merge "Fix curves tool" into gb-ub-photos-arches

11 years agoFix curves tool
nicolasroard [Tue, 16 Oct 2012 01:03:37 +0000 (18:03 -0700)]
Fix curves tool

bug:7344301
bug:7328680
bug:7289525
bug:7234239
Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e

11 years agoam b7a0b092: Make save button in video trimming consistent
Doris Liu [Tue, 16 Oct 2012 19:52:31 +0000 (12:52 -0700)]
am b7a0b092: Make save button in video trimming consistent

* commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d':
  Make save button in video trimming consistent

11 years agoMake save button in video trimming consistent
Doris Liu [Tue, 16 Oct 2012 18:18:58 +0000 (11:18 -0700)]
Make save button in video trimming consistent

Bug: 7353884

Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f

11 years agoam ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches
Doris Liu [Tue, 16 Oct 2012 18:24:45 +0000 (11:24 -0700)]
am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches

* commit 'ea3c037a82c31734bcea1f5c74da5904882df193':
  Update save button in photo editor

11 years agoMerge "Update save button in photo editor" into gb-ub-photos-arches
Doris Liu [Tue, 16 Oct 2012 18:23:50 +0000 (11:23 -0700)]
Merge "Update save button in photo editor" into gb-ub-photos-arches

11 years agoUpdate save button in photo editor
Doris Liu [Tue, 16 Oct 2012 17:27:58 +0000 (10:27 -0700)]
Update save button in photo editor

Bug: 7346315
Change-Id: I64e663b3a12c19db280855282722883f6866176e

11 years agoam b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches
John Hoford [Tue, 16 Oct 2012 18:02:33 +0000 (11:02 -0700)]
am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches

* commit 'b9c316af94f66bd708d40306e4920ae009795d4b':
  filters now support orientation

11 years agoMerge "filters now support orientation" into gb-ub-photos-arches
John Hoford [Tue, 16 Oct 2012 18:00:35 +0000 (11:00 -0700)]
Merge "filters now support orientation" into gb-ub-photos-arches

11 years agofilters now support orientation
John Hoford [Tue, 16 Oct 2012 17:41:40 +0000 (10:41 -0700)]
filters now support orientation

bug:7353416
Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa

11 years agoam c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches
Chris Craik [Tue, 16 Oct 2012 17:32:10 +0000 (10:32 -0700)]
am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches

* commit 'c7d90032c8ea9fd73634c311ed0ba9d5128fe861':
  Correct toast text for clarity

11 years agoMerge "Correct toast text for clarity" into gb-ub-photos-arches
Chris Craik [Tue, 16 Oct 2012 17:29:29 +0000 (10:29 -0700)]
Merge "Correct toast text for clarity" into gb-ub-photos-arches

11 years agoCorrect toast text for clarity
Chris Craik [Tue, 16 Oct 2012 01:52:52 +0000 (18:52 -0700)]
Correct toast text for clarity

bug:7353760

Makes the English string better, but should still be a format string.

Change-Id: If998aab71d8f859911df6c7b332e908dcb43afc2

11 years agoam 84440670: Remove old camera classes.
Wu-cheng Li [Tue, 16 Oct 2012 07:17:08 +0000 (00:17 -0700)]
am 84440670: Remove old camera classes.

* commit '84440670da46866867ace3be2c358a54db984a6d':
  Remove old camera classes.

11 years agoRemove old camera classes.
Wu-cheng Li [Sun, 14 Oct 2012 13:28:31 +0000 (21:28 +0800)]
Remove old camera classes.

bug:7201108
Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90

11 years agoam 030f8dad: Fixes bugs in TiledTexture.
Owen Lin [Tue, 16 Oct 2012 02:41:17 +0000 (19:41 -0700)]
am 030f8dad: Fixes bugs in TiledTexture.

* commit '030f8dad6aefc42d0af39bc1b93f370937d3e2ab':
  Fixes bugs in TiledTexture.

11 years agoFixes bugs in TiledTexture.
Owen Lin [Thu, 11 Oct 2012 07:50:38 +0000 (15:50 +0800)]
Fixes bugs in TiledTexture.

1. Upload tiles in SinglePhotoDataAdapter
2. Rebuild the upload queue after the screen nails being recycled

bug: 6399444

Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc

11 years agoam ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank"...
Owen Lin [Tue, 16 Oct 2012 02:23:04 +0000 (19:23 -0700)]
am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

* commit 'ff025412e2cacedd8cbb7901140e580f76634ee6':
  Revert "Revert "Upload screennails in tiles to prevent jank""

11 years agoMerge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub...
Owen Lin [Tue, 16 Oct 2012 02:20:57 +0000 (19:20 -0700)]
Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

11 years agoam a38801ed: Merge "Fix build" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:10:37 +0000 (17:10 -0700)]
am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit 'a38801edd3a39d888bf36607b567171f8b9527ad':
  Fix build

11 years agoMerge "Fix build" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:09:04 +0000 (17:09 -0700)]
Merge "Fix build" into gb-ub-photos-arches

11 years agoFix build
John Reck [Tue, 16 Oct 2012 00:08:10 +0000 (17:08 -0700)]
Fix build

Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c

11 years agoam 80789c08: Merge "fix for the cache" into gb-ub-photos-arches
John Hoford [Mon, 15 Oct 2012 23:54:20 +0000 (16:54 -0700)]
am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit '80789c089e8795968426838ff9c1e71c84cfee6f':
  fix for the cache

11 years agoMerge "fix for the cache" into gb-ub-photos-arches
John Hoford [Mon, 15 Oct 2012 23:52:53 +0000 (16:52 -0700)]
Merge "fix for the cache" into gb-ub-photos-arches

11 years agofix for the cache
John Hoford [Mon, 15 Oct 2012 22:51:02 +0000 (15:51 -0700)]
fix for the cache

Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff
bug:7345592

11 years agoam c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photo...
Mangesh Ghiware [Mon, 15 Oct 2012 23:43:55 +0000 (16:43 -0700)]
am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

* commit 'c42bb220434926c23332c0f93baad4ca2c6b7588':
  Cherry-pick of 092fd92 to fix bug 7344730 also.

11 years agoMerge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
Mangesh Ghiware [Mon, 15 Oct 2012 23:42:17 +0000 (16:42 -0700)]
Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

11 years agoam b1a28418: Fix SRI Pano orientation
John Reck [Mon, 15 Oct 2012 23:40:45 +0000 (16:40 -0700)]
am b1a28418: Fix SRI Pano orientation

* commit 'b1a28418848ce0adeb8a845a78e246b01913d176':
  Fix SRI Pano orientation

11 years agoFix SRI Pano orientation
John Reck [Mon, 15 Oct 2012 23:11:04 +0000 (16:11 -0700)]
Fix SRI Pano orientation

 Bug: 7345511

Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829

11 years agoCherry-pick of 092fd92 to fix bug 7344730 also.
Chih-Chung Chang [Fri, 12 Oct 2012 10:54:06 +0000 (18:54 +0800)]
Cherry-pick of 092fd92 to fix bug 7344730 also.

Make getSupportedOperations() call getSupportedOperations(boolean) by default.

So things will work for MediaObject who doesn't override the new method.

Bug: 7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef

11 years agoam f034e3d9: Update the assets of unlock and camera icons in filmstrip.
Wu-cheng Li [Mon, 15 Oct 2012 16:05:14 +0000 (09:05 -0700)]
am f034e3d9: Update the assets of unlock and camera icons in filmstrip.

* commit 'f034e3d9b5d72ebea44d4928fb449a4cf239c3e1':
  Update the assets of unlock and camera icons in filmstrip.

11 years agoUpdate the assets of unlock and camera icons in filmstrip.
Wu-cheng Li [Mon, 15 Oct 2012 10:20:32 +0000 (18:20 +0800)]
Update the assets of unlock and camera icons in filmstrip.

bug:7318891
Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37

11 years agoMerge "Let's enhance." into jb-mr1-dev
Jason Chen [Mon, 15 Oct 2012 06:01:15 +0000 (23:01 -0700)]
Merge "Let's enhance." into jb-mr1-dev

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

11 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

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

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

11 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

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

* commit 'b470b229fbfd782db6758f331e4a6f918e305b02':
  Fix cropping and saving issues

11 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

11 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

11 years agoam 48b63eec: Merge "Hide Camera button on empty gallery when not available" into...
Bobby Georgescu [Sat, 13 Oct 2012 02:37:01 +0000 (19:37 -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

11 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

11 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

11 years agoLet's enhance.
Jason Chen [Fri, 12 Oct 2012 17:42:06 +0000 (10:42 -0700)]
Let's enhance.

Add mipmap-xxhdpi launcher icon asset.

Bug: 6718166
Change-Id: Iedb9a380fc6b1e7045bed84164792f8a51ddcd01

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

* commit '9b302e31fb92408e1b631988320981910edb8c37':
  Icon fix

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

bug:7328726
Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65

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

* commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb':
  Improve performance of filmstrip

11 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

11 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:46 +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.

11 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

11 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

11 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

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

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

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

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

11 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

11 years agoam 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues...
Ruben Brunk [Fri, 12 Oct 2012 17:29:54 +0000 (10:29 -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.

11 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

11 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

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

* commit '143a4eb4578abd5b319516a68a1b63ab27cf6ee3':
  Fix XML layout

11 years agoMerge "Make getSupportedOperations() call getSupportedOperations(boolean) by default...
Chih-Chung Chang [Fri, 12 Oct 2012 11:20:42 +0000 (04:20 -0700)]
Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev

11 years agoMake getSupportedOperations() call getSupportedOperations(boolean) by default.
Chih-Chung Chang [Fri, 12 Oct 2012 10:54:06 +0000 (18:54 +0800)]
Make getSupportedOperations() call getSupportedOperations(boolean) by default.

So things will work for MediaObject who doesn't override the new method.

Bug: 7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef

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

bug:7302553
Change-Id: Id889c9c4ac083b85f5d85e316aee6a10bb4bbbd0

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

* commit '808dbe19752361ad171b58836df7f195deee8019':
  Add back button handling

11 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