OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels
nicolasroard [Sun, 14 Oct 2012 02:28:21 +0000 (19:28 -0700)]
am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '1aff8e6f3090ccae53bcb6b3a1f35fb58c3705ee':
  Fix dimensions to use dips instead of pixels

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 cd3803c2: am b470b229: Fix cropping and saving issues
nicolasroard [Sun, 14 Oct 2012 01:11:37 +0000 (18:11 -0700)]
am cd3803c2: am b470b229:     Fix cropping and saving issues

* commit 'cd3803c20d25dce03a8cd0450dc97b5b8e7d07c6':
  Fix cropping and saving issues

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 agoam 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not availab...
Bobby Georgescu [Sat, 13 Oct 2012 02:39:14 +0000 (19:39 -0700)]
am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit '367707d4186d0d79401184a9db5b1ffe83374337':
  Hide Camera button on empty gallery when not available

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 agoam 1e89d463: am 9b302e31: Icon fix
John Hoford [Fri, 12 Oct 2012 22:20:16 +0000 (15:20 -0700)]
am 1e89d463: am 9b302e31: Icon fix

* commit '1e89d46332ef6fbe78864abada8d77da2be9504c':
  Icon fix

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 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos...
Bobby Georgescu [Fri, 12 Oct 2012 21:11:35 +0000 (14:11 -0700)]
am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit '2b652421321fa6b5ac119be3512d0dbba2bbaa18':
  Improve performance of filmstrip

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 eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs...
Ruben Brunk [Fri, 12 Oct 2012 21:06:50 +0000 (14:06 -0700)]
am eea31d9a: am 7776408c: Merge "Adding crop UI.  Fixes a number of other UI bugs." into gb-ub-photos-arches

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

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 a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 18:12:07 +0000 (11:12 -0700)]
am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 664b8541: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 18:12:06 +0000 (11:12 -0700)]
am 664b8541: Import translations. DO NOT MERGE

* commit '664b8541ffb24b77085a3dd0edac1ecc5b36d277':
  Import translations. DO NOT MERGE

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:46:06 +0000 (10:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1275d2d1790213b060c823548671ab760bbf0021
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 add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes...
Ruben Brunk [Fri, 12 Oct 2012 17:31:34 +0000 (10:31 -0700)]
am add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches

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

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 4b2aad53: am 143a4eb4: Fix XML layout
nicolasroard [Fri, 12 Oct 2012 16:27:45 +0000 (09:27 -0700)]
am 4b2aad53: am 143a4eb4: Fix XML layout

* commit '4b2aad53905a52ad25a6fa6a42c34e9fd8554bd5':
  Fix XML layout

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 agoam 9a635f78: Merge "Make getSupportedOperations() call getSupportedOperations(boolean...
Chih-Chung Chang [Fri, 12 Oct 2012 12:37:56 +0000 (05:37 -0700)]
am 9a635f78: Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev

* commit '9a635f78d6e10996a1ef0179989850b9e5a49e58':
  Make getSupportedOperations() call getSupportedOperations(boolean) by default.

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 a3c04479: am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches
nicolasroard [Fri, 12 Oct 2012 08:01:20 +0000 (01:01 -0700)]
am a3c04479: am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches

* commit 'a3c0447910522b91a546c616ab0df6a3e10e6804':
  Add back button handling

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

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

bug:7332980

- fix crash as well.

Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4

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

* commit 'e4474775479cb327dfb078d6b84b586628cd9ddb':
  Refresh panorama image after stitching completion

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

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

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

Bug: 7336784

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

Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0

11 years agoam 0bb15527: am 6111c54d: Fix UI
nicolasroard [Fri, 12 Oct 2012 05:41:04 +0000 (22:41 -0700)]
am 0bb15527: am 6111c54d: Fix UI

* commit '0bb155271ebeb595ccb1bfce7ae6ff355007f7b0':
  Fix UI

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

* commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9':
  Fix UI

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

bug:7328726

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

Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7

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

* commit '756fb491bcdba5bf5d4a94f3207679830a29ea84':
  layouts, image icons, and layer behavour

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

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

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

bug:7328726
Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92

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

* commit 'f8500e40e4d8c4b092c09162076f9c13933c5d60':
  Adjust text on Apply button

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

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

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

* commit '0acba30ebb360eeac89cf5acd51d72db88840645':
  Hide history panel for now

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

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

Bug: 7333492
Change-Id: I18885808437e6328ec94c40df25ea0678d381825

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

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

11 years agoam 90d68928: am 8e1536da: Add new borders
nicolasroard [Fri, 12 Oct 2012 04:03:30 +0000 (21:03 -0700)]
am 90d68928: am 8e1536da: Add new borders

* commit '90d68928387a5d38a69cb918be5f162415b53132':
  Add new borders

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

bug:7325872
Change-Id: Ica442d50e797a8ae73f1ddf94daee02d907583d2

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

* commit '8e1536da92f155731d5fd729ec5b2bf00709091a':
  Add new borders

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

bug:7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a

11 years agoam 5a1b150c: am e533f659: Fixes Rotate, Flip, Straighten tools.
nicolasroard [Fri, 12 Oct 2012 03:18:46 +0000 (20:18 -0700)]
am 5a1b150c: am e533f659: Fixes Rotate, Flip, Straighten tools.

* commit '5a1b150c965a68403c77bfe6e94036bd7535b745':
  Fixes Rotate, Flip, Straighten tools.

11 years agoam f18fa41a: am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 12 Oct 2012 03:18:45 +0000 (20:18 -0700)]
am f18fa41a: am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

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

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

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

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

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

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

11 years agoam fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 00:32:40 +0000 (17:32 -0700)]
am fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

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

* commit '3d6fd0b237fccafb3331a5f8a3505a07928f6f3d':
  Fixed apply bar text.  Moved strings to xml.

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 00:30:29 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 12 Oct 2012 00:30:05 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoam 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos...
Ruben Brunk [Fri, 12 Oct 2012 00:28:17 +0000 (17:28 -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 20286576: am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraAc...
Chris Craik [Fri, 12 Oct 2012 00:23:45 +0000 (17:23 -0700)]
am 20286576: am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches

* commit '2028657604c9a41aa3d88f09715206cf81b54bab':
  Alias com.android.camera.Camera to point at CameraActivity

11 years agoam 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into...
Chris Craik [Fri, 12 Oct 2012 00:15:51 +0000 (17:15 -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 agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 00:15:23 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE

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

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

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

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

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

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 f685a36c: am a4ccb4af: Merge "fixed manta image size and double FX issue" into...
John Hoford [Fri, 12 Oct 2012 00:11:36 +0000 (17:11 -0700)]
am f685a36c: am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches

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

11 years agoam a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos...
John Hoford [Fri, 12 Oct 2012 00:10:38 +0000 (17:10 -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 agoam 468e33b2: am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
Michael Kolb [Fri, 12 Oct 2012 00:00:44 +0000 (17:00 -0700)]
am 468e33b2: am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches

* commit '468e33b2475be63accd296dad51251cf1714494d':
  Remove old 360 icons

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:22 +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 60c536e0: am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photo...
Sascha Haeberling [Thu, 11 Oct 2012 23:40:31 +0000 (16:40 -0700)]
am 60c536e0: am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches

* commit '60c536e0cb27b085c14c78f421ed3cd5517b36be':
  Removing the disabled undo button.

11 years agoam 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
Sascha Haeberling [Thu, 11 Oct 2012 23:37:57 +0000 (16:37 -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 87da4055: am dd158691: Merge "Change ActionBar spinner text size on rotate" into...
Bobby Georgescu [Thu, 11 Oct 2012 23:02:42 +0000 (16:02 -0700)]
am 87da4055: am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches

* commit '87da4055bb066419e0d41114e4ac160730532dff':
  Change ActionBar spinner text size on rotate

11 years agoam dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos...
Bobby Georgescu [Thu, 11 Oct 2012 23:01:32 +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 e7b51ae0: am 825afb1b: Move calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 22:55:45 +0000 (15:55 -0700)]
am e7b51ae0: am 825afb1b: Move calls to LightCycleHelper off the UI thread.

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

11 years agoam 825afb1b: Move calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 22:54:13 +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 abe40160: am 47df0d2f: Add more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 22:06:35 +0000 (15:06 -0700)]
am abe40160: am 47df0d2f: Add more space between save icon and text

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

11 years agoam 47df0d2f: Add more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 22:04:43 +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