OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam aba4eaf1: am 81db4a76: am 7ad1b755: am ed22e436: Merge "Adding accessor methods...
Jason Noguchi [Thu, 18 Oct 2012 18:18:29 +0000 (11:18 -0700)]
am aba4eaf1: am 81db4a76: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

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

11 years agoam 81db4a76: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera...
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.

11 years agoam 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars...
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.

11 years agoam ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub...
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.

11 years agoMerge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
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

11 years agoam 2fd5b635: (-s ours) am 48f9547b: am ab81203d: am 12a6e773: (-s ours) Merge "Import...
Baligh Uddin [Thu, 18 Oct 2012 06:22:47 +0000 (23:22 -0700)]
am 2fd5b635: (-s ours) am 48f9547b: am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '2fd5b635586cf31515345aece977e7082b488bf0':
  Import translations. DO NOT MERGE

11 years agoam 48f9547b: am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT...
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

11 years agoam 47888156: (-s ours) am 5463d379: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 18 Oct 2012 06:20:14 +0000 (23:20 -0700)]
am 47888156: (-s ours) am 5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '478881563d3c4573dd450d5b56617dab06515fe6':
  Import translations. DO NOT MERGE

11 years agoam ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into...
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

11 years agoam 5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
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

11 years agoam 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
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

11 years agoam 2ac309ad: (-s ours) am 1c43f09d: am 6e64dcff: Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 18 Oct 2012 06:16:47 +0000 (23:16 -0700)]
am 2ac309ad: (-s ours) am 1c43f09d: am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2ac309ade479a22aaaad0f7319850357dc85a603':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 18 Oct 2012 06:16:15 +0000 (23:16 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 18 Oct 2012 06:16:01 +0000 (23:16 -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 [Thu, 18 Oct 2012 06:15:29 +0000 (23:15 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 1c43f09d: am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
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

11 years agoam 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 18 Oct 2012 06:10:10 +0000 (23:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam bc171b64: am 1169a23b: am cc70347d: am 737552d7: Merge "Big refactor, additions...
Bobby Georgescu [Thu, 18 Oct 2012 04:29:45 +0000 (21:29 -0700)]
am bc171b64: am 1169a23b: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

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

11 years agoam 1169a23b: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transi...
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

11 years agoam cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animatio...
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

11 years agoam 737552d7: Merge "Big refactor, additions to state transition animations" into...
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

11 years agoMerge "Big refactor, additions to state transition animations" into gb-ub-photos...
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

11 years agoam 803631e4: am 0530eb05: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited...
Doris Liu [Thu, 18 Oct 2012 02:06:11 +0000 (19:06 -0700)]
am 803631e4: am 0530eb05: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '803631e48d9c576c871b863c57cba7f7ab2344e9':
  Save edited picasa to "Edited Online Photos" album

11 years agoam 0530eb05: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos...
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

11 years agoam 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album
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

11 years agoam 0addfc7f: Save edited picasa to "Edited Online Photos" album
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

11 years agoSave edited picasa to "Edited Online Photos" album
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

11 years agoam 8f25a00f: am d94f3ca8: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio...
Ruben Brunk [Thu, 18 Oct 2012 01:42:58 +0000 (18:42 -0700)]
am 8f25a00f: am d94f3ca8: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.

* commit '8f25a00fb7daa5185c86ec76f687c18f59bd005c':
  Fixed disappearing aspect ratio button.

11 years agoam d94f3ca8: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.
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.

11 years agoam 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.
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.

11 years agoam ef8597fe: Fixed disappearing aspect ratio button.
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.

11 years agoFixed disappearing aspect ratio button.
Ruben Brunk [Thu, 18 Oct 2012 00:54:19 +0000 (17:54 -0700)]
Fixed disappearing aspect ratio button.

Bug: 7369518
Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526

11 years agoBig refactor, additions to state transition animations
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

11 years agoam 6feb1a1b: am 52bf0c42: am 04114762: am 6df6841f: Merge "Update video editor action...
Doris Liu [Thu, 18 Oct 2012 00:04:44 +0000 (17:04 -0700)]
am 6feb1a1b: am 52bf0c42: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

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

11 years agoam 48bc53c8: am 0c30c6f5: am 193c3f0c: am 3518ff57: Merge "Added support for crop...
Ruben Brunk [Thu, 18 Oct 2012 00:04:43 +0000 (17:04 -0700)]
am 48bc53c8: 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 '48bc53c81d34e79c0759bf26176a37ce7fe9a13f':
  Added support for crop actions.  Changed overflow menu to use new editor.

11 years agoam 62c75cb8: am b6686673: am e12e6962: am da974d84: fix crash from configurable slide...
John Hoford [Thu, 18 Oct 2012 00:03:13 +0000 (17:03 -0700)]
am 62c75cb8: am b6686673: am e12e6962: am da974d84: fix crash from configurable slider ranges

* commit '62c75cb85545d091f5a0378a401593a11667126e':
  fix crash from configurable slider ranges

11 years agoam 52bf0c42: am 04114762: am 6df6841f: Merge "Update video editor actionbar backgroun...
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

11 years agoam 0c30c6f5: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Change...
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.

11 years agoam 04114762: am 6df6841f: Merge "Update video editor actionbar background assets...
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

11 years agoam 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow...
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.

11 years agoam b6686673: am e12e6962: am da974d84: fix crash from configurable slider ranges
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

11 years agoam 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photo...
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

11 years agoam 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use...
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.

11 years agoMerge "Update video editor actionbar background assets" into gb-ub-photos-arches
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

11 years agoMerge "Added support for crop actions. Changed overflow menu to use new editor....
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

11 years agoam e12e6962: am da974d84: fix crash from configurable slider ranges
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

11 years agoam da974d84: fix crash from configurable slider ranges
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

11 years agoUpdate video editor actionbar background assets
Doris Liu [Wed, 17 Oct 2012 23:44:41 +0000 (16:44 -0700)]
Update video editor actionbar background assets

Bug: 7354155
Change-Id: Ia2336623c0777a7f6eca105f6b4af14faa25a006

11 years agoAdded support for crop actions. Changed overflow menu to use new editor.
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

11 years agoam bbbf3506: am cee0db25: am 1056ce1a: am 43b906d8: Moved many strings to xml. Change...
Ruben Brunk [Wed, 17 Oct 2012 23:27:54 +0000 (16:27 -0700)]
am bbbf3506: am cee0db25: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

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

11 years agofix crash from configurable slider ranges
John Hoford [Wed, 17 Oct 2012 22:53:14 +0000 (15:53 -0700)]
fix crash from configurable slider ranges

bug:7293391
Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34

11 years agoam cee0db25: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter...
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.

11 years agoam 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed...
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.

11 years agoam 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
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.

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Oct 2012 23:18:04 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoMoved many strings to xml. Changed UI filter order. Renamed things.
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

11 years agoam a975ede4: am 53dddeb1: am abe96287: am de8dbdff: Merge "fix rotating normal images...
John Hoford [Wed, 17 Oct 2012 23:06:10 +0000 (16:06 -0700)]
am a975ede4: am 53dddeb1: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit 'a975ede4049f8c5f0de19b3cb92dc75b033c367c':
  fix rotating normal images

11 years agoam 53dddeb1: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb...
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

11 years agoam abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
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

11 years agoam 52e7f0f2: am c913a357: am 21c91bfb: am ef877094: Merge "Fix back button behaviour...
nicolasroard [Wed, 17 Oct 2012 22:57:38 +0000 (15:57 -0700)]
am 52e7f0f2: am c913a357: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit '52e7f0f26fef055289be92f8d6af2ae3ab8021ff':
  Fix back button behaviour

11 years agoam de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
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

11 years agoam c913a357: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb...
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

11 years agoMerge "fix rotating normal images" into gb-ub-photos-arches
John Hoford [Wed, 17 Oct 2012 22:54:58 +0000 (15:54 -0700)]
Merge "fix rotating normal images" into gb-ub-photos-arches

11 years agoam 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
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

11 years agoam ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
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

11 years agoMerge "Fix back button behaviour" into gb-ub-photos-arches
nicolasroard [Wed, 17 Oct 2012 22:49:43 +0000 (15:49 -0700)]
Merge "Fix back button behaviour" into gb-ub-photos-arches

11 years agoam 70c18a80: am 7b6f2c6d: am d07026bf: am 57731ee2: Only fade out if texture creation...
John Reck [Wed, 17 Oct 2012 22:49:08 +0000 (15:49 -0700)]
am 70c18a80: am 7b6f2c6d: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded

* commit '70c18a807a5bda72501d81332fa4cbad0a732ba7':
  Only fade out if texture creation succeeded

11 years agoam 7b6f2c6d: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded
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

11 years agoam d07026bf: am 57731ee2: Only fade out if texture creation succeeded
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

11 years agoFix back button behaviour
nicolasroard [Wed, 17 Oct 2012 22:11:53 +0000 (15:11 -0700)]
Fix back button behaviour

bug:7290000
bug:7256201
Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57

11 years agoam 57731ee2: Only fade out if texture creation succeeded
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

11 years agoam 62433f51: am f2f9b21f: am 07c2c448: am 4104415e: Merge "Add read URI permission...
Mangesh Ghiware [Wed, 17 Oct 2012 22:09:17 +0000 (15:09 -0700)]
am 62433f51: am f2f9b21f: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit '62433f51796a85c1cafd0ae63d776ea2a84ae404':
  Add read URI permission to intent returned for GET_CONTENT

11 years agoam c6ec194e: (-s ours) am 02d6f5dd: am 72b0fbef: am 77a8da71: (-s ours) Merge "Import...
Baligh Uddin [Wed, 17 Oct 2012 22:09:16 +0000 (15:09 -0700)]
am c6ec194e: (-s ours) am 02d6f5dd: am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoam a06e8fae: (-s ours) am 629562b5: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 17 Oct 2012 22:09:14 +0000 (15:09 -0700)]
am a06e8fae: (-s ours) am 629562b5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoam 10b3add6: (-s ours) am 1d286a59: am 55ec71e7: Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 17 Oct 2012 22:09:05 +0000 (15:09 -0700)]
am 10b3add6: (-s ours) am 1d286a59: am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '10b3add6514b3018b3bda5a5741ad71b4b165b67':
  Import translations. DO NOT MERGE

11 years agoOnly fade out if texture creation succeeded
John Reck [Wed, 17 Oct 2012 22:05:24 +0000 (15:05 -0700)]
Only fade out if texture creation succeeded

 Bug: 7366597

Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3

11 years agoam f2f9b21f: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent retur...
Mangesh Ghiware [Wed, 17 Oct 2012 22:00:02 +0000 (15:00 -0700)]
am f2f9b21f: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit 'f2f9b21f6bb28a6f7368f8f1f41194436025296e':
  Add read URI permission to intent returned for GET_CONTENT

11 years agoam 02d6f5dd: am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 17 Oct 2012 22:00:01 +0000 (15:00 -0700)]
am 02d6f5dd: am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '02d6f5ddd69393128e77185cfd3d581fc122bd59':
  Import translations. DO NOT MERGE

11 years agoam 629562b5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 17 Oct 2012 22:00:00 +0000 (15:00 -0700)]
am 629562b5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '629562b594d3680947235f8a075f24460e8354a1':
  Import translations. DO NOT MERGE

11 years agoam 1d286a59: am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 17 Oct 2012 21:58:18 +0000 (14:58 -0700)]
am 1d286a59: am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 17 Oct 2012 21:57:50 +0000 (14:57 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoam 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_C...
Mangesh Ghiware [Wed, 17 Oct 2012 21:57:37 +0000 (14:57 -0700)]
am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit '07c2c448bd5b043e6aeebfd9ed3a347851bb14fe':
  Add read URI permission to intent returned for GET_CONTENT

11 years agoam 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 17 Oct 2012 21:57:37 +0000 (14:57 -0700)]
am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '72b0fbef391ee2fda15f951ca19912292844827e':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 17 Oct 2012 21:57:32 +0000 (14:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoam 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 17 Oct 2012 21:55:47 +0000 (14:55 -0700)]
am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '55ec71e7ed9297135b09114ed198240954106a0e':
  Import translations. DO NOT MERGE

11 years agoam 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into...
Mangesh Ghiware [Wed, 17 Oct 2012 21:55:05 +0000 (14:55 -0700)]
am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711':
  Add read URI permission to intent returned for GET_CONTENT

11 years agoam 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 17 Oct 2012 21:55:04 +0000 (14:55 -0700)]
am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '77a8da71dc3a2e12266e229d2687069f68d9fe59':
  Import translations. DO NOT MERGE

11 years agofix rotating normal images
John Hoford [Wed, 17 Oct 2012 21:54:54 +0000 (14:54 -0700)]
fix rotating normal images

bug:7353416
Change-Id: I86875286ea81982bdb55e9df22e44827b521d257

11 years agoMerge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos...
Mangesh Ghiware [Wed, 17 Oct 2012 21:54:06 +0000 (14:54 -0700)]
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 17 Oct 2012 21:52:53 +0000 (14:52 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 17 Oct 2012 21:52:34 +0000 (14:52 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam 37530da7: am 740dd9d9: am 3ad462d0: am 24958c5d: Change double tap scale from...
John Reck [Wed, 17 Oct 2012 21:46:39 +0000 (14:46 -0700)]
am 37530da7: am 740dd9d9: am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0

* commit '37530da7205ce0304c54d2b8c7c3297c84f363ba':
  Change double tap scale from 1.5 to 1.0

11 years agoam 740dd9d9: am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0
John Reck [Wed, 17 Oct 2012 21:43:41 +0000 (14:43 -0700)]
am 740dd9d9: am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0

* commit '740dd9d90f62c6a660fc25676e47c24eaf61bc69':
  Change double tap scale from 1.5 to 1.0

11 years agoam 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0
John Reck [Wed, 17 Oct 2012 21:41:25 +0000 (14:41 -0700)]
am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0

* commit '3ad462d015baee9ca7b436ec7b688ebff1f92d04':
  Change double tap scale from 1.5 to 1.0

11 years agoam 24958c5d: Change double tap scale from 1.5 to 1.0
John Reck [Wed, 17 Oct 2012 21:38:50 +0000 (14:38 -0700)]
am 24958c5d: Change double tap scale from 1.5 to 1.0

* commit '24958c5d4a63e1d7c49d9e7007ee10958ad23e8f':
  Change double tap scale from 1.5 to 1.0

11 years agoAdding accessor methods for camera latency vars.
Jason Noguchi [Wed, 17 Oct 2012 21:35:00 +0000 (14:35 -0700)]
Adding accessor methods for camera latency vars.

Change-Id: I21cb401aa12f116abd384efee021d2738b28793c