OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 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.

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 years agoam f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu...
Ruben Brunk [Thu, 11 Oct 2012 03:13:26 +0000 (20:13 -0700)]
am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches

* commit 'f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3':
  Removed "Show Image State" and "Settings" from overflow menu.

11 years agoMerge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub...
Ruben Brunk [Thu, 11 Oct 2012 03:12:32 +0000 (20:12 -0700)]
Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches

11 years agoam 4e0ca74a: Change "Save" button in editor
Bobby Georgescu [Thu, 11 Oct 2012 03:03:15 +0000 (20:03 -0700)]
am 4e0ca74a: Change "Save" button in editor

* commit '4e0ca74a064737b8f90c4f29b29ac17be596a68f':
  Change "Save" button in editor

11 years agoMake album set grid view reflect latest UI mocks
Bobby Georgescu [Thu, 11 Oct 2012 01:16:10 +0000 (18:16 -0700)]
Make album set grid view reflect latest UI mocks

Bug: 7300836
Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf

11 years agoRemoved "Show Image State" and "Settings" from overflow menu.
Ruben Brunk [Wed, 10 Oct 2012 23:11:51 +0000 (16:11 -0700)]
Removed "Show Image State" and "Settings" from overflow menu.

Bug: 7324739
Change-Id: I0830b70552da76c798d046c8471e7c1fe8fc57df

11 years agoChange "Save" button in editor
Bobby Georgescu [Thu, 11 Oct 2012 00:30:45 +0000 (17:30 -0700)]
Change "Save" button in editor

Bug:
Change-Id: Ib395812e0eeb83f6d6089142ba8474bf43cd186a

11 years agoDefer expensive UI updates in filmstrip
Bobby Georgescu [Wed, 10 Oct 2012 17:49:51 +0000 (10:49 -0700)]
Defer expensive UI updates in filmstrip

Bug: 7322925
When using the filmstrip, delay expensive updates to
the action bar and share menus, some of which may require
disk accesses, until the rate of change of photos slows
down, instead of doing this work for every single image
that flies by.

Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd

11 years agoam 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos...
George Mount [Thu, 11 Oct 2012 00:04:17 +0000 (17:04 -0700)]
am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches

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

11 years agoam df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:04:17 +0000 (17:04 -0700)]
am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches

* commit 'df2aecb6944f1244fa6e3d35a135c8bea6d16ab0':
  Change "Done" to "Save" in editor

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

11 years agoMerge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:02:27 +0000 (17:02 -0700)]
Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches

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

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

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

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

 Bug 7325685

Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f

11 years agoChange "Done" to "Save" in editor
Bobby Georgescu [Wed, 10 Oct 2012 23:42:48 +0000 (16:42 -0700)]
Change "Done" to "Save" in editor

Bug: 7325784
Change-Id: I82732252ae6047f1bf50ccde2ede22a9f9bc8e31

11 years agoam 53f24f0f: forced fx bitmaps to load unscaled
John Hoford [Wed, 10 Oct 2012 23:41:59 +0000 (16:41 -0700)]
am 53f24f0f: forced fx bitmaps to load unscaled

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

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

Bug: 7326326
Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e

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

bug:7327105
Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866

11 years agoam f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 22:49:07 +0000 (15:49 -0700)]
am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches

* commit 'f0bec555548429f59a798806fb5cb47f9dcc034c':
  Change text size in spinner to avoid overlap

11 years agoMerge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 22:48:15 +0000 (15:48 -0700)]
Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches

11 years agoam f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 22:46:56 +0000 (15:46 -0700)]
am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches

* commit 'f8044659db592f49e6e77c8a1d595955f9d206cb':
  add White balance & disable UI elements

11 years agoMerge "add White balance & disable UI elements" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 22:45:47 +0000 (15:45 -0700)]
Merge "add White balance & disable UI elements" into gb-ub-photos-arches

11 years agoChange text size in spinner to avoid overlap
Bobby Georgescu [Wed, 10 Oct 2012 22:00:59 +0000 (15:00 -0700)]
Change text size in spinner to avoid overlap

Bug: 7321747
Change-Id: Ibc58bff8710f974813d4beb89e971bdfab6acfb7

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

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

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

11 years agoadd White balance & disable UI elements
John Hoford [Wed, 10 Oct 2012 21:17:30 +0000 (14:17 -0700)]
add White balance & disable UI elements

bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af

11 years agoDisable in-place crop for 360 panorama
Mangesh Ghiware [Wed, 10 Oct 2012 21:58:35 +0000 (14:58 -0700)]
Disable in-place crop for 360 panorama

Bug: 7281479
Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f

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

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

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

11 years agoam ce81f255: Set width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 21:02:59 +0000 (14:02 -0700)]
am ce81f255: Set width of filmstrip/grid spinner to wrap content

* commit 'ce81f2553dbcacc46c1540bf2a01da8557ba0b40':
  Set width of filmstrip/grid spinner to wrap content

11 years agoFix missing camera thumbnail in filmstrip
Bobby Georgescu [Wed, 10 Oct 2012 20:42:55 +0000 (13:42 -0700)]
Fix missing camera thumbnail in filmstrip

Bug: 7319894
Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:22:01 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:21:40 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE

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

11 years agoSet width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 18:12:14 +0000 (11:12 -0700)]
Set width of filmstrip/grid spinner to wrap content

Bug: 7322464
Change-Id: I273370a212a2b63e195cae11b48b96191672e996

11 years agoam 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
George Mount [Wed, 10 Oct 2012 17:42:56 +0000 (10:42 -0700)]
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches

* commit '21832eb7fba76cd101ad5ef7b131292aa24f3864':
  Change how stitched images are inserted into Gallery.
  Move panorama stitch progress outside the image.

11 years agoMerge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
George Mount [Wed, 10 Oct 2012 17:41:16 +0000 (10:41 -0700)]
Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches

* changes:
  Change how stitched images are inserted into Gallery.
  Move panorama stitch progress outside the image.

11 years agoChange how stitched images are inserted into Gallery.
George Mount [Wed, 10 Oct 2012 04:02:42 +0000 (21:02 -0700)]
Change how stitched images are inserted into Gallery.

 Bug 7299396
 Stitching images now use normal LocalImages for their MediaItem
 instead of LightCycleItems. They are no longer part of a special
 album.

Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7

11 years agoMove panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 00:50:33 +0000 (17:50 -0700)]
Move panorama stitch progress outside the image.

 Bug 7302513

Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385

11 years agoam eece6da4: Support REVERSE in lockOrientation
John Reck [Wed, 10 Oct 2012 16:58:10 +0000 (09:58 -0700)]
am eece6da4: Support REVERSE in lockOrientation

* commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c':
  Support REVERSE in lockOrientation

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

 Bug: 7314703

Change-Id: Id459e49496f562e75c1485d9d717daa28020a587

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

* commit '866ed7abd7960efc7986a3624414a730e17f33a6':
  Fix inverted panorama preview

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

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

Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b

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

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

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

bug:7234321
Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292

11 years agoam 08458dc6: Latest UI
nicolasroard [Wed, 10 Oct 2012 00:48:24 +0000 (17:48 -0700)]
am 08458dc6: Latest UI

* commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d':
  Latest UI

11 years agoLatest UI
nicolasroard [Tue, 9 Oct 2012 23:34:58 +0000 (16:34 -0700)]
Latest UI

bug:7233983
bug:7233980

Also fixes border scaling issues.

Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5

11 years agoam 457e88cd: add filters
John Hoford [Wed, 10 Oct 2012 00:29:04 +0000 (17:29 -0700)]
am 457e88cd: add filters

* commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad':
  add filters

11 years agoadd filters
John Hoford [Tue, 9 Oct 2012 23:17:17 +0000 (16:17 -0700)]
add filters

bug:7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030

11 years agoam d78c5734: Merge "Correct stale background on completely empty gallery" into gb...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:45 +0000 (17:12 -0700)]
am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches

* commit 'd78c5734346cabc2577a5b9100f0f943c381ee47':
  Correct stale background on completely empty gallery

11 years agoam 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos...
Bobby Georgescu [Wed, 10 Oct 2012 00:12:44 +0000 (17:12 -0700)]
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches

* commit '501bd1bff5189542612929b2428b7a69abc575a6':
  Update design for grid/filmstrip switcher

11 years agoMerge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 00:11:38 +0000 (17:11 -0700)]
Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches