Commit Graph

8846 Commits

Author SHA1 Message Date
Dianne Hackborn
5b71c33969 am 50bb2643: am d62b063f: am b6a6791f: Merge change I60413727 into eclair
Merge commit '50bb2643a5cb28c4e013eceb15c23288c85e0350'

* commit '50bb2643a5cb28c4e013eceb15c23288c85e0350':
  Fix issue #2226370: Resource versions match with equality
2009-11-02 11:13:43 -08:00
Eric Laurent
e4ddf24134 am 80164966: am a86861a8: am 31f62008: Merge change I29bc113c into eclair
Merge commit '80164966d087388ac0192caf7270158dea22444e'

* commit '80164966d087388ac0192caf7270158dea22444e':
  Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
2009-11-02 11:13:34 -08:00
Mike Lockwood
2e63c1604a am db61b03c: am b2346324: am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'db61b03c23267d2687c18a4dfec1448ab5325764'

* commit 'db61b03c23267d2687c18a4dfec1448ab5325764':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 11:13:24 -08:00
Dianne Hackborn
9a620de95a am d62b063f: am b6a6791f: Merge change I60413727 into eclair
Merge commit 'd62b063fd4ac0ae1419348ac62c55527cb398fd9' into eclair-mr2-plus-aosp

* commit 'd62b063fd4ac0ae1419348ac62c55527cb398fd9':
  Fix issue #2226370: Resource versions match with equality
2009-11-02 11:04:56 -08:00
Eric Laurent
149ac3f4b4 am a86861a8: am 31f62008: Merge change I29bc113c into eclair
Merge commit 'a86861a8684809bf3e3b877a20852483bc889742' into eclair-mr2-plus-aosp

* commit 'a86861a8684809bf3e3b877a20852483bc889742':
  Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
2009-11-02 11:04:49 -08:00
Mike Lockwood
7baea45429 am b2346324: am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp

* commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 11:04:41 -08:00
Dianne Hackborn
f8b1cf31a9 am b6a6791f: Merge change I60413727 into eclair
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-mr2

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
2009-11-02 10:52:22 -08:00
Android (Google) Code Review
e6be7cea30 Merge change I60413727 into eclair
* changes:
  Fix issue #2226370: Resource versions match with equality
2009-11-02 13:43:52 -05:00
Eric Laurent
46d7963a6e am 31f62008: Merge change I29bc113c into eclair
Merge commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3' into eclair-mr2

* commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3':
  Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
2009-11-02 10:11:25 -08:00
Mike Lockwood
1e571f4bff am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 10:11:17 -08:00
Android (Google) Code Review
04afbd2388 Merge change I29bc113c into eclair
* changes:
  Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
2009-11-02 13:05:08 -05:00
Eric Laurent
134aa9c942 Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Reduce sleep time in AudioFlinger mixer thread when no data has been written to output to speed up startup time when  exiting standby.

The rest of the modifications for this issues is in kernel driver:
 commit 0dbb0ee136ed8de757df1ae26d84556c1751deae for buffer size modification from 8192 to 4800 bytes.
Another kernel improvement that is not submitted yes will reduce delay when audio output is exiting standby.
2009-11-02 00:13:56 -08:00
Daisuke Miyakawa
5332bf5da3 am 648feb77: am 3f16be20: Enable vCard tests connect both importer/exporter tests.
Merge commit '648feb772445eeaf31fcee6a020e43645411c534'

* commit '648feb772445eeaf31fcee6a020e43645411c534':
  Enable vCard tests connect both importer/exporter tests.
2009-11-01 22:45:52 -08:00
Mike Lockwood
3fddc44d19 am 69cbd296: am f2055570: am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '69cbd296820d21fac1f866fe8d3b03d3007bb241'

* commit '69cbd296820d21fac1f866fe8d3b03d3007bb241':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 22:45:42 -08:00
Mike Lockwood
0af0e7d844 am 0fe19fb8: am f6fc4131: am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '0fe19fb891d65f94bdab46b2dd3ecfdabd2876ee'

* commit '0fe19fb891d65f94bdab46b2dd3ecfdabd2876ee':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 22:45:30 -08:00
Daisuke Miyakawa
2d15eb40c1 am 3f16be20: Enable vCard tests connect both importer/exporter tests.
Merge commit '3f16be2061ddf8daeed959c6e06db9cf561ae304' into eclair-mr2-plus-aosp

* commit '3f16be2061ddf8daeed959c6e06db9cf561ae304':
  Enable vCard tests connect both importer/exporter tests.
2009-11-01 22:36:02 -08:00
Mike Lockwood
9574072cb0 am f2055570: am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c' into eclair-mr2-plus-aosp

* commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 22:35:55 -08:00
Mike Lockwood
8f2ad4f08b am f6fc4131: am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit 'f6fc41314d253962720b2c75f3a64025037acf0e' into eclair-mr2-plus-aosp

* commit 'f6fc41314d253962720b2c75f3a64025037acf0e':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 22:35:47 -08:00
Mike Lockwood
2dfd254adb am 47fd5cd1: am 7dc642d0: am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '47fd5cd1fae6cfaac1b9d5c492be013663c0c9fc'

* commit '47fd5cd1fae6cfaac1b9d5c492be013663c0c9fc':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 21:58:13 -08:00
Mike Lockwood
6b8bfa30f1 am 301eff06: am 148f666b: am aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit '301eff069cbf086450af7a6e546acda20ca0055f'

* commit '301eff069cbf086450af7a6e546acda20ca0055f':
  Use separate flags for enabling hardware and software auto-brightness.
2009-11-01 21:58:05 -08:00
Iliyan Malchev
5593cdc2a9 am cb80b4f1: am 8385baea: am 05cb5610: Merge change I8c0eb9a6 into eclair
Merge commit 'cb80b4f18e63cd8ef065bd375c28d90c8356ae42'

* commit 'cb80b4f18e63cd8ef065bd375c28d90c8356ae42':
  libagl: silence a LOGD
2009-11-01 21:56:52 -08:00
Mike LeBeau
759fc6cdf6 am 0d8aa05d: am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'

* commit '0d8aa05d306205850e3014550bce34735ac78660':
  Add a privateImeOption to represent that the IME should not show
2009-11-01 21:56:43 -08:00
Jack Wang
511038f7e9 am af93c05c: am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair
Merge commit 'af93c05c9a25018daf375094c8e697b83795b2d4'

* commit 'af93c05c9a25018daf375094c8e697b83795b2d4':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-11-01 21:56:33 -08:00
Mathias Agopian
f90c83b3f1 am 78383abf: am cbf583d7: am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e'

* commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e':
  Turns out the SGX driver is correct and the bug was in this test.
2009-11-01 21:56:22 -08:00
Mathias Agopian
807ac61daa am 739dcc56: am b199d114: am 9baef73c: Merge change Id8b28e4f into eclair
Merge commit '739dcc562af9bc4506d8cc6ccf837f072ed90d2d'

* commit '739dcc562af9bc4506d8cc6ccf837f072ed90d2d':
  fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
2009-11-01 21:55:06 -08:00
Mathias Agopian
f024252c15 am c64e9346: am d85545d0: am d01767f8: Merge change I56779290 into eclair
Merge commit 'c64e9346785a1a4fc95ec6cf27da8a5193a2dfbc'

* commit 'c64e9346785a1a4fc95ec6cf27da8a5193a2dfbc':
  fix[2222341] Soft reset while going back from camcorder settings
2009-11-01 21:54:55 -08:00
Mathias Agopian
bc55586e88 am 5acbf81a: am 74d4640c: am f989c114: Merge change If007a2fa into eclair
Merge commit '5acbf81a20f5cd121c1eee81de5f9350b1a8c16e'

* commit '5acbf81a20f5cd121c1eee81de5f9350b1a8c16e':
  return proper error code from eglCreateImageKHR
2009-11-01 21:54:44 -08:00
Mike Reed
25baccb443 am 2cacabae: am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair
Merge commit '2cacabaea9beabb0019b38a4734c1297ffeff607'

* commit '2cacabaea9beabb0019b38a4734c1297ffeff607':
  add table maskfilter
2009-11-01 21:54:17 -08:00
Andy McFadden
4cfda538a5 am 3275b80f: (-s ours) am a8235340: am 4d0bf120: (-s ours) Merge change I08c19bee into eclair
Merge commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05'

* commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05':
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-11-01 21:54:03 -08:00
Jaikumar Ganesh
296d0af76f am e0d30d67: am bf2efbc0: am 3cf254d2: Merge change I4b3db907 into eclair
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'

* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
  Revert the channge where channels were not selected randomly.
2009-11-01 21:50:19 -08:00
Dianne Hackborn
c2a04c3f2d Fix issue #2226370: Resource versions match with equality
Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
2009-11-01 21:16:59 -08:00
Mike Lockwood
771189763a am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-mr2

* commit '9efd523c4611c0cf10e712453a699c083a01064c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 07:15:27 -08:00
Mike Lockwood
10cfc5ba35 am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-mr2

* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 07:15:20 -08:00
Mike Lockwood
bdb4ca6b71 am 7dc642d0: am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '7dc642d0b9f9395221818978d2cd9143cd3cad36' into eclair-mr2-plus-aosp

* commit '7dc642d0b9f9395221818978d2cd9143cd3cad36':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 05:41:20 -08:00
Mike Lockwood
5c2c90b337 am 148f666b: am aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit '148f666b0a10183afc987809482f18d8199d747c' into eclair-mr2-plus-aosp

* commit '148f666b0a10183afc987809482f18d8199d747c':
  Use separate flags for enabling hardware and software auto-brightness.
2009-11-01 05:41:12 -08:00
Mike Lockwood
47458276b8 am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-mr2

* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 05:31:44 -08:00
Mike Lockwood
4ad91a2da2 am aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2

* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
  Use separate flags for enabling hardware and software auto-brightness.
2009-11-01 05:31:36 -08:00
Iliyan Malchev
f542201579 am 8385baea: am 05cb5610: Merge change I8c0eb9a6 into eclair
Merge commit '8385baea4742734dd23843b6dcf89fd2e0490dd6' into eclair-mr2-plus-aosp

* commit '8385baea4742734dd23843b6dcf89fd2e0490dd6':
  libagl: silence a LOGD
2009-10-30 18:41:22 -07:00
Mike LeBeau
fdb63f4979 am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp

* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
  Add a privateImeOption to represent that the IME should not show
2009-10-30 18:41:16 -07:00
Jack Wang
fd9f699a40 am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair
Merge commit '227ba2072df1474a0b3abaae7c415f152d32bcc2' into eclair-mr2-plus-aosp

* commit '227ba2072df1474a0b3abaae7c415f152d32bcc2':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 18:41:08 -07:00
Mathias Agopian
e31ed95dd9 am cbf583d7: am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit 'cbf583d7229aaff65734b4234e81db8ead864761' into eclair-mr2-plus-aosp

* commit 'cbf583d7229aaff65734b4234e81db8ead864761':
  Turns out the SGX driver is correct and the bug was in this test.
2009-10-30 18:41:00 -07:00
Iliyan Malchev
e0c077d915 am 05cb5610: Merge change I8c0eb9a6 into eclair
Merge commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219' into eclair-mr2

* commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219':
  libagl: silence a LOGD
2009-10-30 18:35:51 -07:00
Android (Google) Code Review
db95a9e824 Merge change I8c0eb9a6 into eclair
* changes:
  libagl: silence a LOGD
2009-10-30 21:29:56 -04:00
Iliyan Malchev
d95c322af3 libagl: silence a LOGD
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-10-30 18:29:08 -07:00
Mike LeBeau
839f9c4a33 am d3e4dab9: Merge change I7df84618 into eclair
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
2009-10-30 18:22:00 -07:00
Android (Google) Code Review
eefdae5122 Merge change I7df84618 into eclair
* changes:
  Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
2009-10-30 21:12:00 -04:00
Jack Wang
73007efe8f am e8228afb: Merge change I92cdc5ed into eclair
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 17:07:56 -07:00
Mathias Agopian
39e0df0355 am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2

* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
  Turns out the SGX driver is correct and the bug was in this test.
2009-10-30 17:07:49 -07:00
Android (Google) Code Review
fa2d144b7b Merge change I92cdc5ed into eclair
* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 20:02:13 -04:00
Android (Google) Code Review
964d94306b Merge change Ie3e80456 into eclair
* changes:
  Turns out the SGX driver is correct and the bug was in this test.
2009-10-30 19:40:09 -04:00