OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 8bcd1a2f: am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub...
Jason Noguchi [Thu, 21 Mar 2013 05:12:32 +0000 (05:12 +0000)]
am 8bcd1a2f: am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce

* commit '8bcd1a2fb42403690299ec186e38aae4d0cd3ad2':
  Removing obsolete test.

11 years agoam 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce
Jason Noguchi [Thu, 21 Mar 2013 05:10:33 +0000 (05:10 +0000)]
am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce

* commit '346995f05112e8fc8a37ecfcc6f4fa8bbe8f441f':
  Removing obsolete test.

11 years agoam 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce
Jason Noguchi [Thu, 21 Mar 2013 05:08:52 +0000 (22:08 -0700)]
am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce

* commit '8b65a2a7a415f80e54f993973661b4060e6384f5':
  Removing obsolete test.

11 years agoMerge "Removing obsolete test." into gb-ub-photos-bryce
Jason Noguchi [Thu, 21 Mar 2013 05:07:14 +0000 (05:07 +0000)]
Merge "Removing obsolete test." into gb-ub-photos-bryce

11 years agoam 7be9492b: am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding...
Doris Liu [Thu, 21 Mar 2013 03:26:51 +0000 (03:26 +0000)]
am 7be9492b: am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce

* commit '7be9492b4d4d7df58e17c6df189985805264e468':
  Fix for record button not responding

11 years agoam 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub...
Doris Liu [Thu, 21 Mar 2013 03:24:15 +0000 (03:24 +0000)]
am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce

* commit '4fee4e4cc97b7706a6c3bb9ee74034e9f249c5c4':
  Fix for record button not responding

11 years agoam a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Mar 2013 03:22:55 +0000 (20:22 -0700)]
am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce

* commit 'a088f92a1e18c64231da6b693bb541ace8d8f952':
  Fix for record button not responding

11 years agoMerge "Fix for record button not responding" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Mar 2013 03:21:18 +0000 (03:21 +0000)]
Merge "Fix for record button not responding" into gb-ub-photos-bryce

11 years agoam e83c044d: am ec16059f: am 3024aa22: Don\'t show the original image in the Curves...
nicolasroard [Thu, 21 Mar 2013 03:02:52 +0000 (03:02 +0000)]
am e83c044d: am ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor

* commit 'e83c044dfe84035ebbfd60b96a71dc094cbf2616':
  Don't show the original image in the Curves editor

11 years agoam ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 03:01:26 +0000 (03:01 +0000)]
am ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor

* commit 'ec16059f822d5701da5f716d0bdda5ee3fdfc43e':
  Don't show the original image in the Curves editor

11 years agoam 3024aa22: Don\'t show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 02:58:40 +0000 (19:58 -0700)]
am 3024aa22: Don\'t show the original image in the Curves editor

* commit '3024aa22d372c0d6608b143a0c46b86c2104f9b1':
  Don't show the original image in the Curves editor

11 years agoam 980e0303: am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb...
nicolasroard [Thu, 21 Mar 2013 02:53:00 +0000 (02:53 +0000)]
am 980e0303: am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

* commit '980e030307e4640fa069efa738a9a86c75f16737':
  Fix crashes with RS filters

11 years agoDon't show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 02:48:49 +0000 (19:48 -0700)]
Don't show the original image in the Curves editor

Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e

11 years agoam 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:51:24 +0000 (02:51 +0000)]
am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

* commit '6e3b080abd80a88c9dff8fd5d2904b3d7c5b7e31':
  Fix crashes with RS filters

11 years agoam d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:48:30 +0000 (19:48 -0700)]
am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

* commit 'd37039a9222b740b7c3f10626af91d2a351c89f3':
  Fix crashes with RS filters

11 years agoMerge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:46:52 +0000 (02:46 +0000)]
Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

11 years agoFix crashes with RS filters
nicolasroard [Wed, 20 Mar 2013 21:55:48 +0000 (14:55 -0700)]
Fix crashes with RS filters

bug:8418537

Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365

11 years agoFix for record button not responding
Doris Liu [Thu, 21 Mar 2013 02:25:47 +0000 (19:25 -0700)]
Fix for record button not responding

Bug: 8437944
Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4

11 years agoam ddf9a74d: am 7cf8eb3b: am 5455ac56: Added accessability description for filter...
Ruben Brunk [Thu, 21 Mar 2013 01:50:47 +0000 (01:50 +0000)]
am ddf9a74d: am 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons.

* commit 'ddf9a74df65894ccea17a816ba8b2548d620ed30':
  Added accessability description for filter buttons.

11 years agoam 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons.
Ruben Brunk [Thu, 21 Mar 2013 01:48:39 +0000 (01:48 +0000)]
am 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons.

* commit '7cf8eb3bb27f1e7bafcb3828c76a6bc3b8341ae5':
  Added accessability description for filter buttons.

11 years agoam 5455ac56: Added accessability description for filter buttons.
Ruben Brunk [Thu, 21 Mar 2013 01:46:10 +0000 (18:46 -0700)]
am 5455ac56: Added accessability description for filter buttons.

* commit '5455ac56cbde7505687cd885b62f7a9d03d826b2':
  Added accessability description for filter buttons.

11 years agoRemoving obsolete test.
Jason Noguchi [Thu, 21 Mar 2013 01:33:20 +0000 (18:33 -0700)]
Removing obsolete test.

Change-Id: I061846d42d7cbe0a115724060a9600cef6e7433c

11 years agoAdded accessability description for filter buttons.
Ruben Brunk [Thu, 21 Mar 2013 00:12:43 +0000 (17:12 -0700)]
Added accessability description for filter buttons.

Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae

11 years agoam f3b784ab: am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling...
Bobby Georgescu [Wed, 20 Mar 2013 21:17:16 +0000 (21:17 +0000)]
am f3b784ab: am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit 'f3b784ab9f9465504b764a5cd8faedc5cb602b22':
  Refactor fragment/activity coupling in new Gallery

11 years agoam 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery...
Bobby Georgescu [Wed, 20 Mar 2013 21:14:41 +0000 (21:14 +0000)]
am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit '5fac07357ce9a97000b4bb636445112aa1fa6171':
  Refactor fragment/activity coupling in new Gallery

11 years agoam 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub...
Bobby Georgescu [Wed, 20 Mar 2013 21:11:40 +0000 (14:11 -0700)]
am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit '7e3756f133965651434f581255646da497b90a51':
  Refactor fragment/activity coupling in new Gallery

11 years agoMerge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 20 Mar 2013 21:10:23 +0000 (21:10 +0000)]
Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

11 years agoRefactor fragment/activity coupling in new Gallery
Bobby Georgescu [Wed, 20 Mar 2013 19:03:17 +0000 (12:03 -0700)]
Refactor fragment/activity coupling in new Gallery

Change-Id: I7cc54b352197e1975cff286f4add7d0f42637841

11 years agoam 1f56bab5: (-s ours) am aec00599: am 89afc6b9: (-s ours) Merge "Import translations...
Baligh Uddin [Wed, 20 Mar 2013 19:59:15 +0000 (19:59 +0000)]
am 1f56bab5: (-s ours) am aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 14461dfc: (-s ours) am aa30f02c: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 20 Mar 2013 19:59:14 +0000 (19:59 +0000)]
am 14461dfc: (-s ours) am aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '14461dfcb0719e9e299f6078fd9eebec9defbc0e':
  Import translations. DO NOT MERGE

11 years agoam aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 20 Mar 2013 19:56:59 +0000 (19:56 +0000)]
am aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 20 Mar 2013 19:56:57 +0000 (19:56 +0000)]
am aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 20 Mar 2013 19:55:10 +0000 (12:55 -0700)]
am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '89afc6b96d924499e44417ddae197372915b6465':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 20 Mar 2013 19:54:10 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 20 Mar 2013 19:53:55 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 20 Mar 2013 19:53:34 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Mar 2013 18:31:34 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Mar 2013 18:30:57 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Mar 2013 18:30:10 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 165b3b59: am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPi...
nicolasroard [Wed, 20 Mar 2013 17:48:27 +0000 (17:48 +0000)]
am 165b3b59: am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

* commit '165b3b599680e8897cb6ea8f843563bcda9f6adb':
  Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability

11 years agoam def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class...
nicolasroard [Wed, 20 Mar 2013 17:35:49 +0000 (17:35 +0000)]
am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

* commit 'def1e4aebf67193e0187fb591a2c0458f72b60c9':
  Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability

11 years agoam 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPi...
nicolasroard [Wed, 20 Mar 2013 17:26:34 +0000 (10:26 -0700)]
am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

* commit '2ddedb8630e6c2324c41d12509d893c4ec3744f2':
  Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability

11 years agoMerge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only...
nicolasroard [Wed, 20 Mar 2013 17:25:25 +0000 (17:25 +0000)]
Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

11 years agoRefactor the pipeline
nicolasroard [Wed, 20 Mar 2013 15:41:34 +0000 (08:41 -0700)]
Refactor the pipeline
- add a CachingPipeline class
- FilteringPipeline only deals with communication
- fix large critical sections performance issues
- improves stability

bug:8418537

Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724

11 years agoam bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 20 Mar 2013 16:46:47 +0000 (16:46 +0000)]
am bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'bbe63c7c84d92f7f59be207af2bfdb5662a6dc8f':
  am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
  am 3ccb0e3e: Add a cleanstep for the build server...
  am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
  am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce
  am 978f4aae: Fix for crash upon saving image
  am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
  am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 20 Mar 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam d571b703: am 26bf2194: am 00551024: Method added to load scaled resource (with...
Victor Doba [Wed, 20 Mar 2013 10:33:16 +0000 (10:33 +0000)]
am d571b703: am 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel).

* commit 'd571b703f939e1663bf6c7ab12ffad0c025897df':
  Method added to load scaled resource (with only alpha channel).

11 years agoam 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:30:38 +0000 (10:30 +0000)]
am 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel).

* commit '26bf21943edfa94dd9d0d7f6c0dbcc1ed05b5289':
  Method added to load scaled resource (with only alpha channel).

11 years agoam 00551024: Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:28:14 +0000 (03:28 -0700)]
am 00551024: Method added to load scaled resource (with only alpha channel).

* commit '0055102404c767af2cd5fabf70acbc8317e33fe3':
  Method added to load scaled resource (with only alpha channel).

11 years agoMethod added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:24:21 +0000 (11:24 +0100)]
Method added to load scaled resource (with only alpha channel).

Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c

11 years agoam 0731870b: am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005...
Bart Sears [Wed, 20 Mar 2013 04:01:58 +0000 (04:01 +0000)]
am 0731870b: am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

* commit '0731870b624f4c888ad041268ebcc3b516ae3014':
  Bump up the version number to 1.1.40005

11 years agoam 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb...
Bart Sears [Wed, 20 Mar 2013 03:59:17 +0000 (03:59 +0000)]
am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

* commit '91adfa42485f6724a2dc60db0ba09fd2739b8cc6':
  Bump up the version number to 1.1.40005

11 years agoam 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
Bart Sears [Wed, 20 Mar 2013 03:56:04 +0000 (20:56 -0700)]
am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

* commit '39c14cee9cc748a932d78fb9d430effa12027f7b':
  Bump up the version number to 1.1.40005

11 years agoam 55b0b5e8: am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap...
nicolasroard [Wed, 20 Mar 2013 03:55:22 +0000 (03:55 +0000)]
am 55b0b5e8: am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to apply()

* commit '55b0b5e8e4804d28a3d5a166b656195dab427593':
  Add accessor for filters to the source bitmap passed to apply()

11 years agoMerge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
Bart Sears [Wed, 20 Mar 2013 03:55:02 +0000 (03:55 +0000)]
Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

11 years agoam e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to...
nicolasroard [Wed, 20 Mar 2013 03:52:41 +0000 (03:52 +0000)]
am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to apply()

* commit 'e9fce93e9db512be5da55731dec51c3d7154890f':
  Add accessor for filters to the source bitmap passed to apply()

11 years agoam 269d2c86: Add accessor for filters to the source bitmap passed to apply()
nicolasroard [Wed, 20 Mar 2013 03:50:54 +0000 (20:50 -0700)]
am 269d2c86: Add accessor for filters to the source bitmap passed to apply()

* commit '269d2c8602e8893b0bf399324b2072783ba0f37c':
  Add accessor for filters to the source bitmap passed to apply()

11 years agoAdd accessor for filters to the source bitmap passed to apply()
nicolasroard [Wed, 20 Mar 2013 03:13:33 +0000 (20:13 -0700)]
Add accessor for filters to the source bitmap passed to apply()

Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6

11 years agoam 9d2e6c78: am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:54:35 +0000 (00:54 +0000)]
am 9d2e6c78: am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context.

* commit '9d2e6c78497a615ff195a71bfa98cba7caf5ff18':
  Fixed onDestroy ordering for RS context.

11 years agoam c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:13:00 +0000 (00:13 +0000)]
am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context.

* commit 'c8e5be6690e11fde21f288d22653a46bef56d013':
  Fixed onDestroy ordering for RS context.

11 years agoam 8898eaab: Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:11:46 +0000 (17:11 -0700)]
am 8898eaab: Fixed onDestroy ordering for RS context.

* commit '8898eaabfa0cdf70e00078d2dea810f9aab4dfd1':
  Fixed onDestroy ordering for RS context.

11 years agoFixed onDestroy ordering for RS context.
Ruben Brunk [Tue, 19 Mar 2013 23:39:24 +0000 (16:39 -0700)]
Fixed onDestroy ordering for RS context.

Bug: 8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8

11 years agoam 0de08996: am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues...
nicolasroard [Tue, 19 Mar 2013 22:15:37 +0000 (22:15 +0000)]
am 0de08996: am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS

* commit '0de089969e1f59a83e9c316390400f3badef1da9':
  Fix some startup issues, performance issues on ICS

11 years agoam f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:13:29 +0000 (22:13 +0000)]
am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS

* commit 'f0e726c539b4f9193a7764a881809c00433a26c4':
  Fix some startup issues, performance issues on ICS

11 years agoam 33fca9ef: Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:11:48 +0000 (15:11 -0700)]
am 33fca9ef: Fix some startup issues, performance issues on ICS

* commit '33fca9ef7f89b60e3b1a361fdf5fc597b3994e74':
  Fix some startup issues, performance issues on ICS

11 years agoFix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 21:46:17 +0000 (14:46 -0700)]
Fix some startup issues, performance issues on ICS

Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf

11 years agoam d8a14e78: am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into...
Bobby Georgescu [Tue, 19 Mar 2013 18:45:24 +0000 (18:45 +0000)]
am d8a14e78: am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

* commit 'd8a14e78aca0c7645c1f949fca1493a9859df340':
  Add album viewing to new Gallery

11 years agoam bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos...
Bobby Georgescu [Tue, 19 Mar 2013 18:42:53 +0000 (18:42 +0000)]
am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

* commit 'bb547e5efc0aaca5c2035a20639980a376b9a1a4':
  Add album viewing to new Gallery

11 years agoam 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Mar 2013 18:40:49 +0000 (11:40 -0700)]
am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

* commit '94660ff80259917e207fa15a971db1cd619dad5b':
  Add album viewing to new Gallery

11 years agoMerge "Add album viewing to new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Mar 2013 18:39:02 +0000 (18:39 +0000)]
Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

11 years agoAdd album viewing to new Gallery
Bobby Georgescu [Mon, 18 Mar 2013 21:56:40 +0000 (14:56 -0700)]
Add album viewing to new Gallery

Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4

11 years agoam 47dcc9c5: am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:13:31 +0000 (17:13 +0000)]
am 47dcc9c5: am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism

* commit '47dcc9c526aa001bce53c7ec00680ec052dc0806':
  Improves double-tap and comparison mechanism

11 years agoam ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:11:22 +0000 (17:11 +0000)]
am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism

* commit 'ff24fbbe8d8a57bff85c48009faba567ce361808':
  Improves double-tap and comparison mechanism

11 years agoam 94202ecf: Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:08:22 +0000 (10:08 -0700)]
am 94202ecf: Improves double-tap and comparison mechanism

* commit '94202ecf77d68ca7ed1b0adfe3b37daf6851e39d':
  Improves double-tap and comparison mechanism

11 years agoImproves double-tap and comparison mechanism
nicolasroard [Sat, 16 Mar 2013 21:27:22 +0000 (14:27 -0700)]
Improves double-tap and comparison mechanism

Change-Id: I1fda50d7d179703db9e0e525550018c259233e89

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 19 Mar 2013 12:55:46 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 387c7cee: am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly. FilterP...
Ruben Brunk [Tue, 19 Mar 2013 07:09:17 +0000 (07:09 +0000)]
am 387c7cee: am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

* commit '387c7cee5f185d9a5372af04f80710a15a10c540':
  ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

11 years agoam c3b08ad7: am f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay...
Ruben Brunk [Tue, 19 Mar 2013 07:08:00 +0000 (07:08 +0000)]
am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

* commit 'c3b08ad78799de49294ae1a5f52e3cd90fb917d5':
  ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

11 years agoam f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after...
Ruben Brunk [Tue, 19 Mar 2013 07:06:21 +0000 (00:06 -0700)]
am f79f954f: ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

* commit 'f79f954f4eb23bce55061c683a07fc7b3a965451':
  ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

11 years agoImageFilterRS filters reset properly. FilterPipeline delay till after load.
Ruben Brunk [Tue, 19 Mar 2013 05:23:43 +0000 (22:23 -0700)]
ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

Bug: 8293404
Bug: 8417804

Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d

11 years agoam 762d8ab4: am d2773420: am b8270a94: Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:51:30 +0000 (03:51 +0000)]
am 762d8ab4: am d2773420: am b8270a94: Fix disappearing panels and animations on ICS

* commit '762d8ab4259e1f13f44c1cb542d2e275224266ad':
  Fix disappearing panels and animations on ICS

11 years agoam d2773420: am b8270a94: Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:48:48 +0000 (03:48 +0000)]
am d2773420: am b8270a94: Fix disappearing panels and animations on ICS

* commit 'd277342034a998e7f70fe07f655f55ef9fb38e4d':
  Fix disappearing panels and animations on ICS

11 years agoam b8270a94: Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:46:07 +0000 (20:46 -0700)]
am b8270a94: Fix disappearing panels and animations on ICS

* commit 'b8270a94e539fc1944ae350c73b00b9df45832d5':
  Fix disappearing panels and animations on ICS

11 years agoFix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 00:27:55 +0000 (17:27 -0700)]
Fix disappearing panels and animations on ICS

bug:8405402

Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964

11 years agoBump up the version number to 1.1.40005
Bart Sears [Tue, 19 Mar 2013 03:02:47 +0000 (20:02 -0700)]
Bump up the version number to 1.1.40005

Change-Id: Ic01aa447fdae6628a84cd9d9561134c32c521df8

11 years agoam 83ee6b69: am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources...
nicolasroard [Tue, 19 Mar 2013 01:56:24 +0000 (01:56 +0000)]
am 83ee6b69: am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit '83ee6b69fdb8cd7f9ff2b53e1bc12e61b4e946b9':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoam 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb...
nicolasroard [Tue, 19 Mar 2013 00:43:13 +0000 (17:43 -0700)]
am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit '783a72dae8376fd73ea0c9972d8976909731321b':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoam 3ccb0e3e: Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:15:06 +0000 (15:15 -0700)]
am 3ccb0e3e: Add a cleanstep for the build server...

* commit '3ccb0e3ef144ad54cc918779cc3ee10e7a182c28':
  Add a cleanstep for the build server...

11 years agoam 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 18:35:51 +0000 (11:35 -0700)]
am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce

* commit '42559630d746e79fb139c65b2b12a35742eb0354':
  Fix "drop table" problem.

11 years agoam ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:46:18 +0000 (00:46 +0000)]
am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit 'ac08be9e23c795ebe820650c528a3b10395f302c':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoam 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb...
nicolasroard [Tue, 19 Mar 2013 00:43:13 +0000 (17:43 -0700)]
am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit '783a72dae8376fd73ea0c9972d8976909731321b':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoMerge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
nicolasroard [Tue, 19 Mar 2013 00:42:00 +0000 (00:42 +0000)]
Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

11 years agoAdd nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:36:41 +0000 (17:36 -0700)]
Add nakasi resources. xhdpi resources are stripped...

bug:8410820
Change-Id: I8a5624e1285bfd0608890ea186859706fb9c241f

11 years agoam 93dd3b7d: (-s ours) am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations...
Baligh Uddin [Mon, 18 Mar 2013 23:14:17 +0000 (23:14 +0000)]
am 93dd3b7d: (-s ours) am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '93dd3b7dab10c4b81e8745a18255ecae1e7ecc10':
  Import translations. DO NOT MERGE

11 years agoam 539ac3a2: (-s ours) am fa248e48: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 18 Mar 2013 23:10:57 +0000 (23:10 +0000)]
am 539ac3a2: (-s ours) am fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '539ac3a2f0602c40d0c016914ef66e91eec186b0':
  Import translations. DO NOT MERGE

11 years agoam 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 18 Mar 2013 23:09:43 +0000 (23:09 +0000)]
am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '91bbb6e057c8cc7149f4554d3981386f83f99e54':
  Import translations. DO NOT MERGE

11 years agoam fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 23:06:22 +0000 (23:06 +0000)]
am fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 18 Mar 2013 23:05:30 +0000 (16:05 -0700)]
am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 18 Mar 2013 23:04:15 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE"