OSDN Git Service

android-x86/frameworks-native.git
13 years agoAdd support for timestamps into SurfaceTexture.
Eino-Ville Talvala [Fri, 18 Feb 2011 19:02:42 +0000 (11:02 -0800)]
Add support for timestamps into SurfaceTexture.

API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp().  For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7

13 years agoam d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations...
Eric Fischer [Wed, 16 Mar 2011 18:00:33 +0000 (11:00 -0700)]
am d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'd40e0efb024ad2e276dbbd2eb81047dd2a1319f7':
  Import revised translations.  DO NOT MERGE

13 years agoam d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into...
Eric Fischer [Wed, 16 Mar 2011 17:54:33 +0000 (10:54 -0700)]
am d5eb3bbb: am cc571e96: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'd5eb3bbbf2959553005df173165b6b65231798a2':
  Import revised translations.  DO NOT MERGE

13 years agoam cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 16 Mar 2011 17:51:56 +0000 (10:51 -0700)]
am cc571e96: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 16 Mar 2011 17:23:02 +0000 (10:23 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

13 years agoMerge "Update WakeLock-related docs to mention permissions"
Kenny Root [Wed, 16 Mar 2011 17:05:23 +0000 (10:05 -0700)]
Merge "Update WakeLock-related docs to mention permissions"

13 years agoMerge "Add the field date_sent to keep track of the date a message was sent."
Wei Huang [Wed, 16 Mar 2011 15:36:14 +0000 (08:36 -0700)]
Merge "Add the field date_sent to keep track of the date a message was sent."

13 years agoam c132f45c: am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization...
Mike Lockwood [Wed, 16 Mar 2011 11:37:05 +0000 (04:37 -0700)]
am c132f45c: am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1

* commit 'c132f45c5b47874746aad01156d7fb57b144e07f':
  USB System UI: Fix string localization problems

13 years agoam 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems...
Mike Lockwood [Wed, 16 Mar 2011 11:35:23 +0000 (04:35 -0700)]
am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1

* commit '2b2aaf2be9fb77e445574ae6c761e10cca1310b0':
  USB System UI: Fix string localization problems

13 years agoam ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
Mike Lockwood [Wed, 16 Mar 2011 11:33:29 +0000 (04:33 -0700)]
am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1

* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
  USB System UI: Fix string localization problems

13 years agoMerge "USB System UI: Fix string localization problems" into honeycomb-mr1
Mike Lockwood [Wed, 16 Mar 2011 11:31:15 +0000 (04:31 -0700)]
Merge "USB System UI: Fix string localization problems" into honeycomb-mr1

13 years agoMerge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc."
Wu-cheng Li [Wed, 16 Mar 2011 10:08:34 +0000 (03:08 -0700)]
Merge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc."

13 years agoam 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO...
Eric Laurent [Wed, 16 Mar 2011 06:50:45 +0000 (23:50 -0700)]
am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1

* commit '9bb250bfe735deb16e15dfdd6a35693558a2171e':
  Improvement for issue 3489986: BT SCO volume

13 years agoam f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug...
Romain Guy [Wed, 16 Mar 2011 06:50:43 +0000 (23:50 -0700)]
am f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1

* commit 'f8c4c12802b15da068d164fd44c9b9f12e7ed916':
  Fix performance issue in Launcher Bug #3515248

13 years agoam 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset...
Justin Ho [Wed, 16 Mar 2011 06:50:40 +0000 (23:50 -0700)]
am 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1

* commit '30d7eb02b5e9533efc41e1fc98eac5c5a6891903':
  Integrating new ADB USB debugging asset Bug: #6699FF

13 years agoam 201bc41e: am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug...
Justin Ho [Wed, 16 Mar 2011 06:50:37 +0000 (23:50 -0700)]
am 201bc41e: am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1

* commit '201bc41e0cbb07dba5365f33ba9885c02977ed6a':
  Fix expander list group indicator Bug: #6699FF

13 years agoam 89254a11: am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements....
Stephen Hines [Wed, 16 Mar 2011 06:50:34 +0000 (23:50 -0700)]
am 89254a11: am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1

* commit '89254a114bac016bbc9974c392d40804da0eb174':
  2X2 matrix needs 4 float elements.

13 years agoam a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into...
Eric Laurent [Wed, 16 Mar 2011 06:47:26 +0000 (23:47 -0700)]
am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1

* commit 'a6c3ace3274e49075284c25750485af9a72203ba':
  Improvement for issue 3489986: BT SCO volume

13 years agoam 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248"...
Romain Guy [Wed, 16 Mar 2011 06:47:23 +0000 (23:47 -0700)]
am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1

* commit '0f7d2ec37fc514c08dde977d55489af16355efa0':
  Fix performance issue in Launcher Bug #3515248

13 years agoam 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF...
Justin Ho [Wed, 16 Mar 2011 06:47:20 +0000 (23:47 -0700)]
am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1

* commit '6ad9cc9afd1229db0ee68a889979feffbbcba557':
  Integrating new ADB USB debugging asset Bug: #6699FF

13 years agoam 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF"...
Justin Ho [Wed, 16 Mar 2011 06:47:17 +0000 (23:47 -0700)]
am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1

* commit '750a4a2623f8bb5167c87b1f5d3bcce12695a13d':
  Fix expander list group indicator Bug: #6699FF

13 years agoam e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
Stephen Hines [Wed, 16 Mar 2011 06:47:14 +0000 (23:47 -0700)]
am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1

* commit 'e01675cdbe083331607a01e38fa71caed2d48f71':
  2X2 matrix needs 4 float elements.

13 years agoam 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
Eric Laurent [Wed, 16 Mar 2011 06:44:43 +0000 (23:44 -0700)]
am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1

* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
  Improvement for issue 3489986: BT SCO volume

13 years agoam 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1
Romain Guy [Wed, 16 Mar 2011 06:44:30 +0000 (23:44 -0700)]
am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1

* commit '46fc25171af8bbaf4594946ce406a667ce2ec27a':
  Fix performance issue in Launcher Bug #3515248

13 years agoam 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeyc...
Justin Ho [Wed, 16 Mar 2011 06:44:12 +0000 (23:44 -0700)]
am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1

* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
  Integrating new ADB USB debugging asset Bug: #6699FF

13 years agoam 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
Justin Ho [Wed, 16 Mar 2011 06:44:08 +0000 (23:44 -0700)]
am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1

* commit '141505a9769099ac38eacb62409a75ff891860a1':
  Fix expander list group indicator Bug: #6699FF

13 years agoam 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
Stephen Hines [Wed, 16 Mar 2011 06:43:55 +0000 (23:43 -0700)]
am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1

* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
  2X2 matrix needs 4 float elements.

13 years agoam 0dd0a805: (-s ours) am a78327da: am acca1600: Merge "Import revised translations...
Eric Fischer [Wed, 16 Mar 2011 06:34:05 +0000 (23:34 -0700)]
am 0dd0a805: (-s ours) am a78327da: am acca1600: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '0dd0a80503f6f4d80eda1f0a964ddb29bd50b9dd':
  Import revised translations.  DO NOT MERGE

13 years agoam a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into...
Eric Fischer [Wed, 16 Mar 2011 06:31:55 +0000 (23:31 -0700)]
am a78327da: am acca1600: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'a78327da4588c60b44163d169f9f973edbdde69f':
  Import revised translations.  DO NOT MERGE

13 years agoam acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 16 Mar 2011 06:29:10 +0000 (23:29 -0700)]
am acca1600: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
  Import revised translations.  DO NOT MERGE

13 years agoam d57440c1: (-s ours) am 29d30cdc: Merge "Add byte limit in addition to ratio for...
Kenny Root [Wed, 16 Mar 2011 06:26:50 +0000 (23:26 -0700)]
am d57440c1: (-s ours) am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

* commit 'd57440c18ef8d5ae9c04f4a03737e2d6ec8a29e8':
  Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

13 years agoam 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE...
Kenny Root [Wed, 16 Mar 2011 06:23:52 +0000 (23:23 -0700)]
am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

* commit '29d30cdc641fd4ee55434aa487c07b2d4434a7ac':
  Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

13 years agoMerge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView"
satok [Wed, 16 Mar 2011 06:13:56 +0000 (23:13 -0700)]
Merge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView"

13 years agoam cb2d1be9: am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND...
Justin Ho [Wed, 16 Mar 2011 04:44:17 +0000 (21:44 -0700)]
am cb2d1be9: am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1

* commit 'cb2d1be93d51c90152eaa453028c7be97a3d58e5':
  Updated notification asset for DND mode

13 years agoam a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeyc...
Justin Ho [Wed, 16 Mar 2011 04:42:10 +0000 (21:42 -0700)]
am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1

* commit 'a1e4b659ebeb44e21de7c7cd8f772d218e7553ec':
  Updated notification asset for DND mode

13 years agoam 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
Justin Ho [Wed, 16 Mar 2011 04:37:27 +0000 (21:37 -0700)]
am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1

* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
  Updated notification asset for DND mode

13 years agoMerge "Improve VelocityTracker numerical stability."
Jeff Brown [Wed, 16 Mar 2011 03:01:16 +0000 (20:01 -0700)]
Merge "Improve VelocityTracker numerical stability."

13 years agoImprove VelocityTracker numerical stability.
Jeff Brown [Tue, 15 Mar 2011 02:39:54 +0000 (19:39 -0700)]
Improve VelocityTracker numerical stability.

Replaced VelocityTracker with a faster and more accurate
native implementation.  This avoids the duplicate maintenance
overhead of having two implementations.

The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation.  This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.

The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.

The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces.  The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.

Bug: 4086785
Change-Id: I2632321232c64d6b8faacdb929e33f60e64dcdd3

13 years agoMerge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
Eric Laurent [Wed, 16 Mar 2011 02:17:53 +0000 (19:17 -0700)]
Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1

13 years agoMerge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1
Romain Guy [Wed, 16 Mar 2011 01:23:48 +0000 (18:23 -0700)]
Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1

13 years agoMerge "Add new PreferenceActivity API for settings."
Dianne Hackborn [Tue, 15 Mar 2011 23:52:40 +0000 (16:52 -0700)]
Merge "Add new PreferenceActivity API for settings."

13 years agoMerge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
Justin Ho [Tue, 15 Mar 2011 23:52:07 +0000 (16:52 -0700)]
Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1

13 years agoMerge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
Justin Ho [Tue, 15 Mar 2011 23:47:27 +0000 (16:47 -0700)]
Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1

13 years agoMerge "2X2 matrix needs 4 float elements." into honeycomb-mr1
Stephen Hines [Tue, 15 Mar 2011 23:22:19 +0000 (16:22 -0700)]
Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1

13 years agoam 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue ...
Dianne Hackborn [Tue, 15 Mar 2011 22:47:32 +0000 (15:47 -0700)]
am 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread

* commit '9b7c1274ddba8db2842431649d46c4cef510131f':
  Improve error reporting for issue #3183612

13 years agoam a32b5978: (-s ours) am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backp...
Mike Lockwood [Tue, 15 Mar 2011 22:47:29 +0000 (15:47 -0700)]
am a32b5978: (-s ours) am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

* commit 'a32b5978b700abf02e9fe6ae4eb95dfd4c158e4f':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb

13 years agoam e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into...
Dianne Hackborn [Tue, 15 Mar 2011 22:44:18 +0000 (15:44 -0700)]
am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread

* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612

13 years agoam 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory...
Mike Lockwood [Tue, 15 Mar 2011 22:44:13 +0000 (15:44 -0700)]
am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

* commit '3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 15 Mar 2011 21:59:33 +0000 (14:59 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

13 years agoam 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
Dianne Hackborn [Tue, 15 Mar 2011 21:49:45 +0000 (14:49 -0700)]
am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread

* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612

13 years agoam b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb...
Mike Lockwood [Tue, 15 Mar 2011 21:49:37 +0000 (14:49 -0700)]
am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

* commit 'b09763209980ff9210cc353f2410598220ec0480':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb

13 years agoMerge "Revise free space checks for package installs"
Kenny Root [Tue, 15 Mar 2011 21:48:56 +0000 (14:48 -0700)]
Merge "Revise free space checks for package installs"

13 years agoMerge "Updated notification asset for DND mode" into honeycomb-mr1
Justin Ho [Tue, 15 Mar 2011 21:41:30 +0000 (14:41 -0700)]
Merge "Updated notification asset for DND mode" into honeycomb-mr1

13 years agoMerge "Improve error reporting for issue #3183612" into gingerbread
Dianne Hackborn [Tue, 15 Mar 2011 21:40:56 +0000 (14:40 -0700)]
Merge "Improve error reporting for issue #3183612" into gingerbread

13 years agoMerge "Bug fixes of DRM framework."
Gloria Wang [Tue, 15 Mar 2011 21:10:30 +0000 (14:10 -0700)]
Merge "Bug fixes of DRM framework."

13 years agoam b3150784: (-s ours) am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to...
Kenny Root [Tue, 15 Mar 2011 21:09:54 +0000 (14:09 -0700)]
am b3150784: (-s ours) am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

* commit 'b3150784487e7578a004c14da5c00d9bc6eb2fc9':
  Add byte limit in addition to ratio for installs DO NOT MERGE

13 years agoMerge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
Mike Lockwood [Tue, 15 Mar 2011 21:04:54 +0000 (14:04 -0700)]
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

13 years agoam 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO...
Kenny Root [Tue, 15 Mar 2011 21:03:50 +0000 (14:03 -0700)]
am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
  Add byte limit in addition to ratio for installs DO NOT MERGE

13 years agoMerge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
Kenny Root [Tue, 15 Mar 2011 21:01:39 +0000 (14:01 -0700)]
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1

13 years agoam 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeyco...
Glenn Kasten [Tue, 15 Mar 2011 20:51:17 +0000 (13:51 -0700)]
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1

* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
  Bug 4016329 do full string comparisons

13 years agoam c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
Mike Lockwood [Tue, 15 Mar 2011 20:49:14 +0000 (13:49 -0700)]
am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1

* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
  USB Manager string clean up:

13 years agoam 3b901c4b: am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events...
Svetoslav Ganov [Tue, 15 Mar 2011 20:49:12 +0000 (13:49 -0700)]
am 3b901c4b: am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1

* commit '3b901c4b89b2f42c4a212d3f176272f911386e64':
  CheckBoxPreferences do not fire accessibility events

13 years agoam 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_f...
Mike Lockwood [Tue, 15 Mar 2011 20:49:09 +0000 (13:49 -0700)]
am 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

* commit '6a20784e461b0c0b24ccd04acf9509565aec3e70':
  SqliteDatabase: Fix local reference leak in custom_function_callback()

13 years agoam 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
Glenn Kasten [Tue, 15 Mar 2011 20:46:27 +0000 (13:46 -0700)]
am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1

* commit '4528a7db389b4da73207d00ca15b306a111650cc':
  Bug 4016329 do full string comparisons

13 years agoMerge "Bug 4016329 do full string comparisons" into honeycomb-mr1
Glenn Kasten [Tue, 15 Mar 2011 20:44:58 +0000 (13:44 -0700)]
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1

13 years agoam 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
Mike Lockwood [Tue, 15 Mar 2011 20:42:44 +0000 (13:42 -0700)]
am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1

* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
  USB Manager string clean up:

13 years agoam bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeyc...
Svetoslav Ganov [Tue, 15 Mar 2011 20:42:38 +0000 (13:42 -0700)]
am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1

* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
  CheckBoxPreferences do not fire accessibility events

13 years agoam afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callb...
Mike Lockwood [Tue, 15 Mar 2011 20:42:35 +0000 (13:42 -0700)]
am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
  SqliteDatabase: Fix local reference leak in custom_function_callback()

13 years agoMerge "USB Manager string clean up:" into honeycomb-mr1
Mike Lockwood [Tue, 15 Mar 2011 20:34:06 +0000 (13:34 -0700)]
Merge "USB Manager string clean up:" into honeycomb-mr1

13 years agoMerge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
Svetoslav Ganov [Tue, 15 Mar 2011 20:23:17 +0000 (13:23 -0700)]
Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1

13 years agoMerge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into...
Mike Lockwood [Tue, 15 Mar 2011 20:20:58 +0000 (13:20 -0700)]
Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

13 years agoam fbe9ca72: am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t...
Adam Powell [Tue, 15 Mar 2011 20:01:32 +0000 (13:01 -0700)]
am fbe9ca72: am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1

* commit 'fbe9ca72625e9789f334e96b731a6ce0e4153ada':
  Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge

13 years agoam ae2f3b3a: am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
Stephen Hines [Tue, 15 Mar 2011 20:01:30 +0000 (13:01 -0700)]
am ae2f3b3a: am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1

* commit 'ae2f3b3a4629629914e6ad5d410594c7dbc856ee':
  Make RS Matrix functions threadable.

13 years agoam 0ea44ac0: am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into...
Jamie Gennis [Tue, 15 Mar 2011 20:01:27 +0000 (13:01 -0700)]
am 0ea44ac0: am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1

* commit '0ea44ac0deb5cc95d60dd512c3a8f6a1bb69f5d1':
  SurfaceTexture: disallow unsupported uses.

13 years agoam 5c84a134: am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc...
Romain Guy [Tue, 15 Mar 2011 20:01:24 +0000 (13:01 -0700)]
am 5c84a134: am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871" into honeycomb-mr1

* commit '5c84a1341b05e96f2c76da7252ed823ec3121102':
  Fix disappearing edges in lists/scrollviews/etc. Bug #4093871

13 years agoam d0217844: am 197d7752: am e8f95e7f: docs: update device dashboard
Scott Main [Tue, 15 Mar 2011 20:01:20 +0000 (13:01 -0700)]
am d0217844: am 197d7752: am e8f95e7f: docs: update device dashboard

* commit 'd0217844320aa5ce620d7fa9e994d78d378006ae':
  docs: update device dashboard

13 years agoam 4a04f11b: am 7e978441: Merge "Use more padding on the sides for SearchView" into...
Amith Yamasani [Tue, 15 Mar 2011 20:01:17 +0000 (13:01 -0700)]
am 4a04f11b: am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1

* commit '4a04f11b437d7d92d580c7c8b0b4b54876b6a934':
  Use more padding on the sides for SearchView

13 years agoam 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have...
Adam Powell [Tue, 15 Mar 2011 19:51:07 +0000 (12:51 -0700)]
am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1

* commit '1d233d9708e39f5b57b231746df658567b153484':
  Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge

13 years agoam c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
Stephen Hines [Tue, 15 Mar 2011 19:50:57 +0000 (12:50 -0700)]
am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1

* commit 'c2db0d405b7d4b7654dbd3740cc065802e4c294e':
  Make RS Matrix functions threadable.

13 years agoam 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
Jamie Gennis [Tue, 15 Mar 2011 19:50:55 +0000 (12:50 -0700)]
am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1

* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
  SurfaceTexture: disallow unsupported uses.

13 years agoam a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871...
Romain Guy [Tue, 15 Mar 2011 19:50:50 +0000 (12:50 -0700)]
am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871" into honeycomb-mr1

* commit 'a1bd5a5fd7107483290627d942ae2dd1910b57ca':
  Fix disappearing edges in lists/scrollviews/etc. Bug #4093871

13 years agoam 197d7752: am e8f95e7f: docs: update device dashboard
Scott Main [Tue, 15 Mar 2011 19:50:47 +0000 (12:50 -0700)]
am 197d7752: am e8f95e7f: docs: update device dashboard

* commit '197d77528648b7ec3d44ca6ab63e3036669c1bc8':
  docs: update device dashboard

13 years agoam 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
Amith Yamasani [Tue, 15 Mar 2011 19:50:35 +0000 (12:50 -0700)]
am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1

* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
  Use more padding on the sides for SearchView

13 years agoam 9b50c1fc: (-s ours) am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeyc...
Xavier Ducrohet [Tue, 15 Mar 2011 19:07:43 +0000 (12:07 -0700)]
am 9b50c1fc: (-s ours) am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.

* commit '9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12':
  Merge 9d76581f from honeycomb. do not merge.

13 years agoam 20ad9553: (-s ours) am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeyc...
Xavier Ducrohet [Tue, 15 Mar 2011 19:07:41 +0000 (12:07 -0700)]
am 20ad9553: (-s ours) am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.

* commit '20ad95532476bad17bbef8d406814b06f3d7fcf1':
  Merge adaa12cd from honeycomb. do not merge.

13 years agoam aaae0573: am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is...
Brad Fitzpatrick [Tue, 15 Mar 2011 19:07:36 +0000 (12:07 -0700)]
am aaae0573: am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."

* commit 'aaae0573bb537b9de89c0410b9386e8f96c3568b':
  Releasing lock even if exception is thrown.

13 years agoam b8c5fe00: am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronize...
Brad Fitzpatrick [Tue, 15 Mar 2011 19:07:33 +0000 (12:07 -0700)]
am b8c5fe00: am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."

* commit 'b8c5fe004dce258eeca5fbba1925b9b1f513d650':
  Lazy initialization must be synchronized to avoid parallel instances cretation.

13 years agoam 36ca1d3a: am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."
Brad Fitzpatrick [Tue, 15 Mar 2011 19:07:30 +0000 (12:07 -0700)]
am 36ca1d3a: am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."

* commit '36ca1d3a693f0a416e758bb52801a3381a34a605':
  Removing self-assignment statement.

13 years agoam b41c37ee: am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in...
Brad Fitzpatrick [Tue, 15 Mar 2011 19:07:27 +0000 (12:07 -0700)]
am b41c37ee: am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code."

* commit 'b41c37eec16d030563829108d8c77a9c14931991':
  Fixing self-assignment in copying code.

13 years agoMerge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge...
Adam Powell [Tue, 15 Mar 2011 19:06:45 +0000 (12:06 -0700)]
Merge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge" into honeycomb-mr1

13 years agoam b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
Xavier Ducrohet [Tue, 15 Mar 2011 19:05:46 +0000 (12:05 -0700)]
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.

* commit 'b7b877a45f469336703844a928482e6438442567':
  Merge 9d76581f from honeycomb. do not merge.

13 years agoam a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.
Xavier Ducrohet [Tue, 15 Mar 2011 19:05:43 +0000 (12:05 -0700)]
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.

* commit 'a82a219a7aaee82d790810f6660924604b7a7e81':
  Merge adaa12cd from honeycomb. do not merge.

13 years agoam 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."
Brad Fitzpatrick [Tue, 15 Mar 2011 19:05:40 +0000 (12:05 -0700)]
am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."

* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
  Releasing lock even if exception is thrown.

13 years agoam a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid...
Brad Fitzpatrick [Tue, 15 Mar 2011 19:05:37 +0000 (12:05 -0700)]
am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."

* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
  Lazy initialization must be synchronized to avoid parallel instances cretation.

13 years agoam 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."
Brad Fitzpatrick [Tue, 15 Mar 2011 19:05:33 +0000 (12:05 -0700)]
am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."

* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
  Removing self-assignment statement.

13 years agoam b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code."
Brad Fitzpatrick [Tue, 15 Mar 2011 19:05:29 +0000 (12:05 -0700)]
am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code."

* commit 'b01fc9fb450df941ae7c072247b67c9be32cd8b8':
  Fixing self-assignment in copying code.

13 years agoam e8a00ad2: (-s ours) am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570...
Xavier Ducrohet [Tue, 15 Mar 2011 19:01:26 +0000 (12:01 -0700)]
am e8a00ad2: (-s ours) am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread

* commit 'e8a00ad288e36204cab2ba2407b42525fe2e44e0':
  Merge 6f2fb570 from honeycomb. do not merge.

13 years agoam 9cb1acda: (-s ours) am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093...
Xavier Ducrohet [Tue, 15 Mar 2011 19:01:24 +0000 (12:01 -0700)]
am 9cb1acda: (-s ours) am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread

* commit '9cb1acda89919a46583444f788f4808fecd5d78d':
  Merge c12b4093 from honeycomb. do not merge.

13 years agoMerge "Import revised translations."
Eric Fischer [Tue, 15 Mar 2011 19:00:49 +0000 (12:00 -0700)]
Merge "Import revised translations."

13 years agoam b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
Brad Fitzpatrick [Tue, 15 Mar 2011 18:57:44 +0000 (11:57 -0700)]
am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp

* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
  Fixing self-assignment in cloning code.