OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 509d69b4: am ad3f626c: am 34c807c8: Merge "Added fixed aspect ratio support for...
Nicolas Roard [Wed, 17 Oct 2012 16:37:44 +0000 (09:37 -0700)]
am 509d69b4: am ad3f626c: am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches

* commit '509d69b48e64af933c609ca666257e39c3718d75':
  Added fixed aspect ratio support for cropping.

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

* commit 'de210758c7f22b81927dc2c48b0c71a07f0bd5b2':
  Fixed flip (mirror) orientation.

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

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

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

* commit '2f54ad4cc5c7cf04c708aa249a3147ea154132fa':
  Fixed flip (mirror) orientation.

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 1a477cf5: am 8a3a0003: am a69a86d5: Merge "Add permission to GalleryProvider....
Hung-ying Tyan [Wed, 17 Oct 2012 06:40:14 +0000 (23:40 -0700)]
am 1a477cf5: am 8a3a0003: am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches

* commit '1a477cf5f40d85799f13437e65d0d95cb117be35':
  Add permission to GalleryProvider.

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

* commit '8a3a0003b76ded1f0e9430a9c9029b82bca39528':
  Add permission to GalleryProvider.

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 4b41aacd: am ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into...
Bobby Georgescu [Wed, 17 Oct 2012 06:02:51 +0000 (23:02 -0700)]
am 4b41aacd: am ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches

* commit '4b41aacdffc17877f742195ff6203ae6c4ef50d1':
  Update empty placeholder asset

11 years agoam ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos...
Bobby Georgescu [Wed, 17 Oct 2012 06:00:43 +0000 (23:00 -0700)]
am ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches

* commit 'ac351f4797d4c64cb8a06bb148cde328543d328c':
  Update empty placeholder asset

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 79c67db9: am c57afc77: am a05bf471: Merge "Update Camera album overlay icon asset...
Bobby Georgescu [Wed, 17 Oct 2012 04:45:56 +0000 (21:45 -0700)]
am 79c67db9: am c57afc77: am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches

* commit '79c67db97635f948a0ef816886b6749cb9810de4':
  Update Camera album overlay icon asset

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

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

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 e712c77c: am f99791bf: am e20cc0cb: Add blue highlight when tapping 360 panorama...
Bobby Georgescu [Wed, 17 Oct 2012 04:30:25 +0000 (21:30 -0700)]
am e712c77c: am f99791bf: am e20cc0cb: Add blue highlight when tapping 360 panorama button

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

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

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

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 02ccea8f: am 46720ce0: am 74d5dfd6: Merge "Consistent animations & up button behav...
Bobby Georgescu [Wed, 17 Oct 2012 01:23:23 +0000 (18:23 -0700)]
am 02ccea8f: am 46720ce0: am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches

* commit '02ccea8f2047b8e13b88e0db8e95f6286e55513c':
  Consistent animations & up button behavior in Gallery

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

* commit '46720ce03f12b3e168d6da6b9ba2fcaa8cea51b4':
  Consistent animations & up button behavior in Gallery

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 529dceec: am 324a7804: am 2b543897: Merge "Add hook to manipulate SurfaceTexture...
John Reck [Wed, 17 Oct 2012 00:50:55 +0000 (17:50 -0700)]
am 529dceec: am 324a7804: am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches

* commit '529dceecdbdd8bdd71f8e131c6e61f6f30330a93':
  Add hook to manipulate SurfaceTexture transform

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

* commit '324a7804267c1e7ee34b59bba9f0a6df2354d4c5':
  Add hook to manipulate SurfaceTexture transform

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 3bdbe5ce: am 3dccbdd9: am e34a5a5e: Fix when we cannot load an image
nicolasroard [Tue, 16 Oct 2012 22:03:15 +0000 (15:03 -0700)]
am 3bdbe5ce: am 3dccbdd9: am e34a5a5e: Fix when we cannot load an image

* commit '3bdbe5ce6e1bd16da285a51630ba81778fd4648a':
  Fix when we cannot load an image

11 years agoam 3dccbdd9: am e34a5a5e: Fix when we cannot load an image
nicolasroard [Tue, 16 Oct 2012 22:00:30 +0000 (15:00 -0700)]
am 3dccbdd9: am e34a5a5e: Fix when we cannot load an image

* commit '3dccbdd985521f3cf02403923373eb3d384f984b':
  Fix when we cannot load an image

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 56277b25: am 3f89f750: am 20fb632c: prevent original now acts like any other FX...
John Hoford [Tue, 16 Oct 2012 20:55:44 +0000 (13:55 -0700)]
am 56277b25: am 3f89f750: am 20fb632c: prevent original now acts like any other FX filter

* commit '56277b254ff73d895ae2604b828f88d8d46dd6bf':
  prevent original now acts like any other FX filter

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

* commit '3f89f750a76d52fc31544cd693b083293983aebc':
  prevent original now acts like any other FX filter

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 aaed1215: am 62f1fa3a: am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos...
nicolasroard [Tue, 16 Oct 2012 20:20:48 +0000 (13:20 -0700)]
am aaed1215: am 62f1fa3a: am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches

* commit 'aaed12153bcd55e78ccbf0eddb898802e667555c':
  Fix curves tool

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

* commit '62f1fa3a8d1364179acb9216d8c1c4211b2c897d':
  Fix curves tool

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 ff685bf3: am 119ea224: am b7a0b092: Make save button in video trimming consistent
Doris Liu [Tue, 16 Oct 2012 19:57:26 +0000 (12:57 -0700)]
am ff685bf3: am 119ea224: am b7a0b092: Make save button in video trimming consistent

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

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

* commit '119ea224980ebd304ed211c0e65724a7b29fc037':
  Make save button in video trimming consistent

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 d591e618: am 48bb7c06: am ea3c037a: Merge "Update save button in photo editor...
Doris Liu [Tue, 16 Oct 2012 18:29:04 +0000 (11:29 -0700)]
am d591e618: am 48bb7c06: am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches

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

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

* commit '48bb7c06f4289a83870cb81e5290dafd8b4a1c90':
  Update save button in photo editor

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 cc8a4ca8: am 85f2f5ee: am b9c316af: Merge "filters now support orientation" into...
John Hoford [Tue, 16 Oct 2012 18:06:10 +0000 (11:06 -0700)]
am cc8a4ca8: am 85f2f5ee: am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches

* commit 'cc8a4ca82421318f6d288b89788aa1c61c154d61':
  filters now support orientation

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

* commit '85f2f5ee226a5fb83373229be2589e2cd8841ed8':
  filters now support orientation

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 e43672c0: am 8a4a4cdc: am c7d90032: Merge "Correct toast text for clarity" into...
Chris Craik [Tue, 16 Oct 2012 17:37:34 +0000 (10:37 -0700)]
am e43672c0: am 8a4a4cdc: am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches

* commit 'e43672c0757c7f7b8a5f4cc8e728af3feeb04e18':
  Correct toast text for clarity

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

* commit '8a4a4cdc4ff7e004f260d8ce333567a12151763c':
  Correct toast text for clarity

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 d14d4dc1: am c07b9374: am 84440670: Remove old camera classes.
Wu-cheng Li [Tue, 16 Oct 2012 07:22:27 +0000 (00:22 -0700)]
am d14d4dc1: am c07b9374: am 84440670: Remove old camera classes.

* commit 'd14d4dc110489c90b7b14ea1e7291468e8134e31':
  Remove old camera classes.

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

* commit 'c07b9374d265bdd79b4898c8a882b7a8ed06c1ba':
  Remove old camera classes.

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 36c46796: am 4a03e18f: am 030f8dad: Fixes bugs in TiledTexture.
Owen Lin [Tue, 16 Oct 2012 03:19:37 +0000 (20:19 -0700)]
am 36c46796: am 4a03e18f: am 030f8dad: Fixes bugs in TiledTexture.

* commit '36c467968196502d86b40e0802c24da377658e3c':
  Fixes bugs in TiledTexture.

11 years agoam 2380da24: am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails...
Owen Lin [Tue, 16 Oct 2012 03:19:35 +0000 (20:19 -0700)]
am 2380da24: am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

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

11 years agoam b9a4bd22: am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 03:18:38 +0000 (20:18 -0700)]
am b9a4bd22: am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit 'b9a4bd22de1a6ae236722d9155798fcded37d58b':
  Fix build

11 years agoam e4a3a434: am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos...
John Hoford [Tue, 16 Oct 2012 03:18:37 +0000 (20:18 -0700)]
am e4a3a434: am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit 'e4a3a4340fa65b4e0eab28e2677d914944561571':
  fix for the cache

11 years agoam 1db393b5: am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 73447...
Mangesh Ghiware [Tue, 16 Oct 2012 03:18:10 +0000 (20:18 -0700)]
am 1db393b5: am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

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

11 years agoam d36b534d: am 2f17145b: am b1a28418: Fix SRI Pano orientation
John Reck [Tue, 16 Oct 2012 03:18:08 +0000 (20:18 -0700)]
am d36b534d: am 2f17145b: am b1a28418: Fix SRI Pano orientation

* commit 'd36b534dc6c90f713624b90283188510188708cc':
  Fix SRI Pano orientation

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

* commit '4a03e18f7e8f1acf36f54dba7906a72927c9fb01':
  Fixes bugs in TiledTexture.

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 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to preve...
Owen Lin [Tue, 16 Oct 2012 02:25:18 +0000 (19:25 -0700)]
am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

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

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 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:13:19 +0000 (17:13 -0700)]
am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit '94dbd96dea60224e2c3bc7c148af147fe3f83bcb':
  Fix build

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 c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches
John Hoford [Mon, 15 Oct 2012 23:56:55 +0000 (16:56 -0700)]
am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit 'c80b4f8f61ce08d674cdb632a91c22648833eab9':
  fix for the cache

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 cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also....
Mangesh Ghiware [Mon, 15 Oct 2012 23:46:15 +0000 (16:46 -0700)]
am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

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

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 agoam 2f17145b: am b1a28418: Fix SRI Pano orientation
John Reck [Mon, 15 Oct 2012 23:42:45 +0000 (16:42 -0700)]
am 2f17145b: am b1a28418: Fix SRI Pano orientation

* commit '2f17145b0c82fff64f2f1667889ce2fe2920d83e':
  Fix SRI Pano orientation

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