git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

George Mount [Fri, 19 Oct 2012 00:00:55 +0000 (17:00 -0700)]

am 79bb3b6b: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches

* commit '79bb3b6b2af943fc40163a79645eb79768164593':
Remove panorama checks from supported operations.

commit | commitdiff | tree

nicolasroard [Fri, 19 Oct 2012 00:00:51 +0000 (17:00 -0700)]

am 73483c52: am f52d90a1: am 60d25279: Handle screen rotation

* commit '73483c52364faa3dac45f812754f531417bb9a24':
Handle screen rotation

commit | commitdiff | tree

George Mount [Thu, 18 Oct 2012 23:57:52 +0000 (16:57 -0700)]

am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches

* commit 'b69af65f5c1e957f4b5b39c7c381c7a28eb409ce':
Remove panorama checks from supported operations.

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:57:51 +0000 (16:57 -0700)]

am f52d90a1: am 60d25279: Handle screen rotation

* commit 'f52d90a1610469dfa195ee89cee7a72ac2333400':
Handle screen rotation

commit | commitdiff | tree

George Mount [Thu, 18 Oct 2012 23:56:30 +0000 (16:56 -0700)]

am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches

* commit '0745eba4898419aad2b6e79be137a2a1edf4d0fc':
Remove panorama checks from supported operations.

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:55:19 +0000 (16:55 -0700)]

am 60d25279: Handle screen rotation

* commit '60d252795f41d0cfe4d0e11b4d1e32d4547368c9':
Handle screen rotation

commit | commitdiff | tree

George Mount [Thu, 18 Oct 2012 23:54:27 +0000 (16:54 -0700)]

Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches

commit | commitdiff | tree

George Mount [Thu, 18 Oct 2012 21:20:39 +0000 (14:20 -0700)]

Remove panorama checks from supported operations.

Bug 7351383
Bug 7349438
Move panorama support checks from getSupportedOperations so
that calls to getSupportedOperations are consistent. Panorama
checks are moved to only based on callbacks.

Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:16:36 +0000 (16:16 -0700)]

Handle screen rotation

bug:7328773
Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:08:43 +0000 (16:08 -0700)]

am 246456be: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches

* commit '246456be144200b5cd8e08dae7659cc5562a3e35':
Fix broken build

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:06:30 +0000 (16:06 -0700)]

am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches

* commit '99679734ef9b1665ae306fbecaa7e3ebf16d1b8e':
Fix broken build

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:04:47 +0000 (16:04 -0700)]

am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches

* commit 'c6ea040010a0794bc78a43c4522cfb03d9e488e2':
Fix broken build

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 23:03:08 +0000 (16:03 -0700)]

Merge "Fix broken build" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 22:59:47 +0000 (15:59 -0700)]

Fix broken build

Change-Id: I088926bd7fad32017861027d7786a4c178aca122

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 22:51:54 +0000 (15:51 -0700)]

am cb10b317: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches

* commit 'cb10b317069ca5aeba0febeac55e265bb5b3afc0':
Hide curve channel picker

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 22:51:52 +0000 (15:51 -0700)]

am 92cbe770: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches

* commit '92cbe770821fcdbe07f970614e41a202ca72d04e':
Various transition tweaks/fixes in Gallery

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 22:50:38 +0000 (15:50 -0700)]

am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches

* commit 'ff5061c84f6dd9914387fdd226ce44780f83407c':
Hide curve channel picker

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 22:50:37 +0000 (15:50 -0700)]

am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches

* commit '255dad6d5265b5cae74c34e3af68d86aeb313370':
Various transition tweaks/fixes in Gallery

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 22:48:33 +0000 (15:48 -0700)]

am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches

* commit '4aad8963b583d812d61cbaa920b914876c5fa7d2':
Hide curve channel picker

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 22:48:32 +0000 (15:48 -0700)]

am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches

* commit '0136dc75dc4069ca36c077a8a078db64f0fc35c6':
Various transition tweaks/fixes in Gallery

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 22:45:56 +0000 (15:45 -0700)]

Merge "Hide curve channel picker" into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 22:45:47 +0000 (15:45 -0700)]

Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Thu, 18 Oct 2012 22:37:50 +0000 (15:37 -0700)]

Hide curve channel picker

bug:7375053
Change-Id: I7aa5f9db44dc657b0f4282a1bb2ea41bde322d36

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 21:02:16 +0000 (14:02 -0700)]

Various transition tweaks/fixes in Gallery

Bug: 7376109
-Add new animation preset for photos based on UX feedback
-Fix showing of highlight when tapping album grid photo
-Move StateTransition enum to StateTransitionAnimation.State

Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Oct 2012 21:55:35 +0000 (14:55 -0700)]

am a90e5aad: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter.

* commit 'a90e5aad36fc14582d99577cede5b74f9f940b3a':
First cut at a skeleton for the TinyPlanets filter.

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Oct 2012 21:52:47 +0000 (14:52 -0700)]

am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter.

* commit 'e3106a8c7fa64faaa0446a5ca94255ae0183b660':
First cut at a skeleton for the TinyPlanets filter.

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Oct 2012 21:50:09 +0000 (14:50 -0700)]

am 2576a29c: First cut at a skeleton for the TinyPlanets filter.

* commit '2576a29cccf1d96edeef071914e8b775c230e8e8':
First cut at a skeleton for the TinyPlanets filter.

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 21:44:22 +0000 (14:44 -0700)]

am ad9f380f: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev

* commit 'ad9f380f94e91fa1df8d6e628d26b9747925da4a':
remove old fashioned Dream, no longer supported

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 21:41:41 +0000 (14:41 -0700)]

am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev

* commit 'aae561e748ec9d87c7724f4acd390736eedb782c':
remove old fashioned Dream, no longer supported

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 21:39:59 +0000 (14:39 -0700)]

Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Oct 2012 07:36:02 +0000 (00:36 -0700)]

First cut at a skeleton for the TinyPlanets filter.

Bug: 7344426

This is not hooking up the real algorithm yet, but unblocks Doris so she
can add the button while we rewrite the algorithm.

Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 20:34:58 +0000 (13:34 -0700)]

am 6b370a9d: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

* commit '6b370a9d4f7ab98ade985b7d81944dd3e45da941':
Fix for initial edited picture is gray

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 20:33:09 +0000 (13:33 -0700)]

am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

* commit '7b474a2ab38789e1f80ce60a62b4752c2a3cfe0b':
Fix for initial edited picture is gray

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 20:30:34 +0000 (13:30 -0700)]

am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

* commit '08e6b8650dfb11e282cca22da71750bcb2e5e478':
Fix for initial edited picture is gray

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 20:28:17 +0000 (13:28 -0700)]

Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 20:22:40 +0000 (13:22 -0700)]

Fix for initial edited picture is gray

Bug: 7373880
Change-Id: I0aa18ba850608437ae6327b3f3d676b218bcc75e

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 20:09:50 +0000 (13:09 -0700)]

am 1901df72: am bc1091bf: am eb4a9359: Fixed initial aspect button text.

* commit '1901df726282fe0bf773b6e486c3d494d4f57356':
Fixed initial aspect button text.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 20:07:59 +0000 (13:07 -0700)]

am bc1091bf: am eb4a9359: Fixed initial aspect button text.

* commit 'bc1091bffc812117d360746fae240032bcbad531':
Fixed initial aspect button text.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 20:06:19 +0000 (13:06 -0700)]

am eb4a9359: Fixed initial aspect button text.

* commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423':
Fixed initial aspect button text.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 19:46:28 +0000 (12:46 -0700)]

Fixed initial aspect button text.

Bug: 7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 18:59:47 +0000 (11:59 -0700)]

remove old fashioned Dream, no longer supported

Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8

commit | commitdiff | tree

Jason Noguchi [Thu, 18 Oct 2012 18:16:27 +0000 (11:16 -0700)]

am 81db4a76: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

* commit '81db4a76babdd51c13977683c28194d6d538fe5e':
Adding accessor methods for camera latency vars.

commit | commitdiff | tree

Jason Noguchi [Thu, 18 Oct 2012 18:14:22 +0000 (11:14 -0700)]

am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

* commit '7ad1b755720eb9f699b0074397841c32a6148790':
Adding accessor methods for camera latency vars.

commit | commitdiff | tree

Jason Noguchi [Thu, 18 Oct 2012 18:12:35 +0000 (11:12 -0700)]

am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

* commit 'ed22e4362ace6b031d826493cf9caea3a2c16a96':
Adding accessor methods for camera latency vars.

commit | commitdiff | tree

Jason Noguchi [Thu, 18 Oct 2012 18:10:35 +0000 (11:10 -0700)]

Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:20:51 +0000 (23:20 -0700)]

am 48f9547b: am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '48f9547b001586234a783a5d4bf67681d1fc78be':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:18:56 +0000 (23:18 -0700)]

am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:17:20 +0000 (23:17 -0700)]

am 5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '5463d3795077c4554e6af5bf6a32393710dd3061':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:16:50 +0000 (23:16 -0700)]

am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '12a6e773a9d35e425ddfaeaa29d68221b6c9d14e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:16:01 +0000 (23:16 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:15:29 +0000 (23:15 -0700)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:13:52 +0000 (23:13 -0700)]

am 1c43f09d: am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '1c43f09d73b2e9311b7704e43c11df7dea39e2fd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:12:20 +0000 (23:12 -0700)]

am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6e64dcffd9729fdde86f693b647b0a7235330923':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 06:10:10 +0000 (23:10 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 04:27:47 +0000 (21:27 -0700)]

am 1169a23b: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

* commit '1169a23b315f8b8fa9aed424b5cb46cda5afe4a8':
Big refactor, additions to state transition animations

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 04:24:47 +0000 (21:24 -0700)]

am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

* commit 'cc70347d279eb55bb941fa5669ee2eae1b220702':
Big refactor, additions to state transition animations

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 04:22:32 +0000 (21:22 -0700)]

am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

* commit '737552d7925366c58067d622e1b8df06786c51cc':
Big refactor, additions to state transition animations

commit | commitdiff | tree

Bobby Georgescu [Thu, 18 Oct 2012 04:19:57 +0000 (21:19 -0700)]

Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 02:03:43 +0000 (19:03 -0700)]

am 0530eb05: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '0530eb05cb6782ad1234b02cecf2926d7972b240':
Save edited picasa to "Edited Online Photos" album

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 02:02:00 +0000 (19:02 -0700)]

am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '637a7f1bba2c1096eab7f178c8b29c399b318f91':
Save edited picasa to "Edited Online Photos" album

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 01:59:44 +0000 (18:59 -0700)]

am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '0addfc7f6342184a67cdd8b5cc3872c6a5c87e55':
Save edited picasa to "Edited Online Photos" album

commit | commitdiff | tree

Doris Liu [Wed, 17 Oct 2012 23:15:51 +0000 (16:15 -0700)]

Save edited picasa to "Edited Online Photos" album

Bug: 7346157

This CL includes the following changes:
1) Save the new image to a new folder named "Edited Online Photos"
2) After the picture is saved, the user will be in the "Edited Online Photos" folder
3) Change the toast during saving to "Saving to" + new folder name

Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 01:41:07 +0000 (18:41 -0700)]

am d94f3ca8: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.

* commit 'd94f3ca82b673c44c4633df543963e8de93dbe7d':
Fixed disappearing aspect ratio button.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 01:39:07 +0000 (18:39 -0700)]

am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.

* commit '5d596558ce319f5207991b25d38ca3470005f933':
Fixed disappearing aspect ratio button.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 01:36:27 +0000 (18:36 -0700)]

am ef8597fe: Fixed disappearing aspect ratio button.

* commit 'ef8597fe38f9808096cc2f68921a54a6fc01e3f0':
Fixed disappearing aspect ratio button.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 00:54:19 +0000 (17:54 -0700)]

Fixed disappearing aspect ratio button.

Bug: 7369518
Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526

commit | commitdiff | tree

Bobby Georgescu [Wed, 17 Oct 2012 21:50:47 +0000 (14:50 -0700)]

Big refactor, additions to state transition animations

Bug: 7362944
Refactored a lot of the state transitions code, adding
support for definable transition animations and defining
distinct outgoing and incoming animations.
Change-Id: I31a69057ea1b72dd3185cec656e59b11fdb528c1

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 00:02:13 +0000 (17:02 -0700)]

am 52bf0c42: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

* commit '52bf0c422e5b4a4103368c28e6a1e6c066ebf91a':
Update video editor actionbar background assets

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 00:02:12 +0000 (17:02 -0700)]

am 0c30c6f5: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches

* commit '0c30c6f5cfc166e57f2e51c14dc9d7a79fe53d9d':
Added support for crop actions. Changed overflow menu to use new editor.

commit | commitdiff | tree

Doris Liu [Thu, 18 Oct 2012 00:00:46 +0000 (17:00 -0700)]

am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

* commit '0411476253111699a9861ec9130bcb90b15464b3':
Update video editor actionbar background assets

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Oct 2012 00:00:45 +0000 (17:00 -0700)]

am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches

* commit '193c3f0cbac09b69926217ac8c227860eeccd737':
Added support for crop actions. Changed overflow menu to use new editor.

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 23:59:31 +0000 (16:59 -0700)]

am b6686673: am e12e6962: am da974d84: fix crash from configurable slider ranges

* commit 'b6686673c3ca1a3711269cd391137087910c4d5b':
fix crash from configurable slider ranges

commit | commitdiff | tree

Doris Liu [Wed, 17 Oct 2012 23:59:10 +0000 (16:59 -0700)]

am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

* commit '6df6841fa79d77153e0f20c73ec0bfb8c142df23':
Update video editor actionbar background assets

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 23:59:09 +0000 (16:59 -0700)]

am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches

* commit '3518ff575247a5ce923a0cd65fc82e046f8eaeae':
Added support for crop actions. Changed overflow menu to use new editor.

commit | commitdiff | tree

Doris Liu [Wed, 17 Oct 2012 23:58:48 +0000 (16:58 -0700)]

Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 23:58:13 +0000 (16:58 -0700)]

Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 23:57:06 +0000 (16:57 -0700)]

am e12e6962: am da974d84: fix crash from configurable slider ranges

* commit 'e12e6962fb1151799f0737238212fd5856d1b7ea':
fix crash from configurable slider ranges

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 23:55:00 +0000 (16:55 -0700)]

am da974d84: fix crash from configurable slider ranges

* commit 'da974d84c8aa0758afe2dc7382657ff5efc80157':
fix crash from configurable slider ranges

commit | commitdiff | tree

Doris Liu [Wed, 17 Oct 2012 23:44:41 +0000 (16:44 -0700)]

Update video editor actionbar background assets

Bug: 7354155
Change-Id: Ia2336623c0777a7f6eca105f6b4af14faa25a006

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 07:40:35 +0000 (00:40 -0700)]

Added support for crop actions. Changed overflow menu to use new editor.

Bug: 7281479
Bug: 7337191
Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 22:53:14 +0000 (15:53 -0700)]

fix crash from configurable slider ranges

bug:7293391
Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 23:25:28 +0000 (16:25 -0700)]

am cee0db25: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

* commit 'cee0db255fc0af9f8f705001309cf5444e48a647':
Moved many strings to xml. Changed UI filter order. Renamed things.

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 23:23:06 +0000 (16:23 -0700)]

am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

* commit '1056ce1a7df84defcbff470a40d68d5e3e7759eb':
Moved many strings to xml. Changed UI filter order. Renamed things.

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 23:20:37 +0000 (16:20 -0700)]

am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

* commit '43b906d81caa4379eae1a1643194c8b3d34b1ad5':
Moved many strings to xml. Changed UI filter order. Renamed things.

commit | commitdiff | tree

Baligh Uddin [Wed, 17 Oct 2012 23:17:39 +0000 (16:17 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 17 Oct 2012 23:17:13 +0000 (16:17 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 17 Oct 2012 23:16:16 +0000 (16:16 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Oct 2012 10:29:08 +0000 (03:29 -0700)]

Moved many strings to xml. Changed UI filter order. Renamed things.

Bug: 7344749
Bug: 7322949
Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 23:03:07 +0000 (16:03 -0700)]

am 53dddeb1: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit '53dddeb1c9fd5a5b68e1cbde411aab98cfaba459':
fix rotating normal images

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 23:00:34 +0000 (16:00 -0700)]

am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit 'abe96287075b529d4c557b22c208ca5c7e6d318f':
fix rotating normal images

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 22:56:15 +0000 (15:56 -0700)]

am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit 'de8dbdff27e4b5c1626024e20fae9fb535238453':
fix rotating normal images

commit | commitdiff | tree

nicolasroard [Wed, 17 Oct 2012 22:55:54 +0000 (15:55 -0700)]

am c913a357: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit 'c913a35769e20a63e68ae23262e116d2c6c2a772':
Fix back button behaviour

commit | commitdiff | tree

John Hoford [Wed, 17 Oct 2012 22:54:58 +0000 (15:54 -0700)]

Merge "fix rotating normal images" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Wed, 17 Oct 2012 22:53:23 +0000 (15:53 -0700)]

am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit '21c91bfbb1bce4c1b2a0da85cb42d489f11b1e07':
Fix back button behaviour

commit | commitdiff | tree

nicolasroard [Wed, 17 Oct 2012 22:51:02 +0000 (15:51 -0700)]

am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7':
Fix back button behaviour

commit | commitdiff | tree

nicolasroard [Wed, 17 Oct 2012 22:49:43 +0000 (15:49 -0700)]

Merge "Fix back button behaviour" into gb-ub-photos-arches

commit | commitdiff | tree

John Reck [Wed, 17 Oct 2012 22:46:13 +0000 (15:46 -0700)]

am 7b6f2c6d: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded

* commit '7b6f2c6d378a8b932053c036af452368d712592c':
Only fade out if texture creation succeeded

commit | commitdiff | tree

John Reck [Wed, 17 Oct 2012 22:44:45 +0000 (15:44 -0700)]

am d07026bf: am 57731ee2: Only fade out if texture creation succeeded

* commit 'd07026bf48a457bc082516b0e93625a57b90da89':
Only fade out if texture creation succeeded

commit | commitdiff | tree

nicolasroard [Wed, 17 Oct 2012 22:11:53 +0000 (15:11 -0700)]

Fix back button behaviour

bug:7290000
bug:7256201
Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57

commit | commitdiff | tree

John Reck [Wed, 17 Oct 2012 22:43:38 +0000 (15:43 -0700)]

am 57731ee2: Only fade out if texture creation succeeded

* commit '57731ee210c22382d33f6f562f9e7e66fce651de':
Only fade out if texture creation succeeded