63863 Commits

Author SHA1 Message Date
Chet Haase
42d4fea25c am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
2011-11-10 22:48:54 +00:00
Kenny Root
a6a3a6f949 am bc853c03: Merge "Close file on exception as well" into ics-mr1
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
2011-11-10 22:48:50 +00:00
Jason Simmons
f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
2011-11-10 14:29:46 -08:00
Chet Haase
41ffab86d9 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Kenny Root
bc853c0344 Merge "Close file on exception as well" into ics-mr1 2011-11-10 13:18:24 -08:00
Tom Taylor
faa81c8210 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00
Eino-Ville Talvala
8d9c011eeb am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1
* commit 'c1c5d4faa22a7d22b8225b2bbf83206698b83763':
  Add a sound-playing method to Camera API.
2011-11-10 20:08:32 +00:00
Eino-Ville Talvala
c1c5d4faa2 Merge "Add a sound-playing method to Camera API." into ics-mr1 2011-11-10 12:07:05 -08:00
Tom Taylor
994da2ad32 Revert "Add new secure setting for controlling Messaging notifications"
This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.

 Committer: Tom Taylor <tomtaylor@google.com>

 On branch revertsetting
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   api/current.txt
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/android/provider/Telephony.java
	modified:   packages/SettingsProvider/res/values/defaults.xml
	modified:   packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.

Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
2011-11-10 11:17:38 -08:00
Mathias Agopian
39da861f9c am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1
* commit '785fd3685a69e5b3ef9c0958dcf4ae85f818e78d':
  handle EINTR when calling sensor HAL's poll function
2011-11-10 18:35:47 +00:00
Mathias Agopian
785fd3685a Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1 2011-11-10 10:33:55 -08:00
Eino-Ville Talvala
e0cc55ac72 Add a sound-playing method to Camera API.
To allow applications with non-standard Camera use cases to use the
platform sound files and routing, add a method to play any of the
standard Camera sounds (shutter, autofocus, record start/stop) using a
background thread.

Bug: 5447107
Change-Id: I2524853a626e3ce334a7aad2f7de061d5c04abd0
2011-11-10 10:23:49 -08:00
Kenny Root
62539e9efa Close file on exception as well
Bug: 5458045
Change-Id: I4c79b9c273ff69dda292e5cc7b2b60f8db2edbd9
2011-11-10 09:40:53 -08:00
John Reck
f0d1965134 am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1
* commit '843e04d977fd348ed474da1d3c6a62e7dc837444':
  Pause drawing when not visible
2011-11-10 17:22:03 +00:00
John Reck
843e04d977 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
Andreas Huber
4af012a790 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
  Send RTSP control connection keep-alive requests
2011-11-10 16:52:19 +00:00
Andreas Huber
ed894a5860 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
  Don't believe the PV decoder's lies...
2011-11-10 16:52:17 +00:00
Andreas Huber
bb2194c898 am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
  There's no point in trying to continue to decode after an error was signalled.
2011-11-10 16:49:12 +00:00
Andreas Huber
2375d16378 Merge "Send RTSP control connection keep-alive requests" into ics-mr1 2011-11-10 08:48:44 -08:00
Andreas Huber
b42aea5b4c Merge "Don't believe the PV decoder's lies..." into ics-mr1 2011-11-10 08:48:34 -08:00
Andreas Huber
7c063cf967 Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1 2011-11-10 08:47:25 -08:00
George Mount
047945013e am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1
* commit 'c60baec7a737d3c3cd596c5c4378a6e12450da3d':
  DO NOT MERGE Set the initial scroll position for RTL.
2011-11-10 16:33:23 +00:00
George Mount
c60baec7a7 Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 2011-11-10 08:32:18 -08:00
Eric Laurent
43f7bbdfbb am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1
* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
  Fix problems in tablet silent mode.
2011-11-10 16:30:51 +00:00
Eric Laurent
7c61fa70a5 Merge "Fix problems in tablet silent mode." into ics-mr1 2011-11-10 08:28:58 -08:00
Chet Haase
532147b308 increase the rate at which we dispatch events.
Previously, the input dispatch rate was capped by default to 55.
This worked fine for systems with a refresh rate of 55 or lower. But on
devices with a higher frame rate (such as stingray at 60 fps), we do not
receive events as fast as the rendering system wants to redraw the frames, so
we would occasionally miss events between frames, resulting in a visual
stutter during drag operations where the dragged object would essentially
stay still for a frame.

This fix increases the default rate to 90, or 1.5 times the highest typical
refresh rate of our devices.

Change-Id: Id8622185b3da93f9f6505157d2e6f3f33e36bd04
2011-11-10 07:55:47 -08:00
Wink Saville
bfc53a235d am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
* commit 'a092ba5667e9c055f4d5c83296c8c81471695747':
  [maguro] Update COMPREHENSION-TLV parser in CAT
2011-11-10 15:24:36 +00:00
Wink Saville
a092ba5667 am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
* commit 'e562287c85662457864255028cd4bc3b04f13750':
  [maguro] Update COMPREHENSION-TLV parser in CAT
2011-11-10 15:22:35 +00:00
Wink Saville
e562287c85 Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 2011-11-10 07:20:55 -08:00
Gilles Debunne
5a3327d75b am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1
* commit 'e5504ba1a279fc58eac74bda8d9c5c29cae235a9':
  Visual glitches when starting extracted text
2011-11-10 08:50:01 +00:00
Gilles Debunne
e5504ba1a2 Merge "Visual glitches when starting extracted text" into ics-mr1 2011-11-10 00:48:10 -08:00
Dave Burke
6981321779 am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit 'b5dbf66c7538838eda29b75309234f20720170d1':
  Actually 59 fps DO NOT MERGE
2011-11-10 08:01:52 +00:00
Dave Burke
b5dbf66c75 am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit 'b96194308dc8678e99564f038872061e4881e65a':
  Actually 59 fps DO NOT MERGE
2011-11-10 07:59:32 +00:00
Dave Burke
b96194308d Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 2011-11-09 23:58:09 -08:00
Dave Burke
5ca88ee679 Actually 59 fps DO NOT MERGE
Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
2011-11-09 23:53:51 -08:00
Dave Burke
ced77f2388 am ab22f862: Merge "Back to 59fps" into ics-mr1
* commit 'ab22f862a912035ba83591db448806fd81ed74f4':
  Back to 59fps
2011-11-10 07:50:19 +00:00
Dave Burke
ab22f862a9 Merge "Back to 59fps" into ics-mr1 2011-11-09 23:49:09 -08:00
satok
b199d4fada am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
  Introduce an API to cancel pending/running spell check tasks
2011-11-10 05:28:09 +00:00
satok
114c4d3843 Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 2011-11-09 21:26:46 -08:00
Daniel Sandler
922e70f4db am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1
* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
  Use platform assets for brightness scrubber.
2011-11-10 04:43:01 +00:00
Daniel Sandler
bca520a170 Merge "Use platform assets for brightness scrubber." into ics-mr1 2011-11-09 20:41:03 -08:00
Wink Saville
23a96d6496 am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit '08b3ffe61182b60ded3bfa599778b6f5495e87db':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 03:44:44 +00:00
Wink Saville
08b3ffe611 am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 03:42:09 +00:00
Wink Saville
16ee60a5ae Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 2011-11-09 19:39:39 -08:00
Wink Saville
6fc3ca7e19 Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
Initially set to 3 minutes this raised the standby current
by 12.5% so changing to 6 minutes.

Bug: 5534004
Change-Id: I602f5fe4de35d0db2dbacf0c615c300c57dd2d0d
2011-11-09 18:53:08 -08:00
satok
b4aff97c85 Introduce an API to cancel pending/running spell check tasks
Bug: 5554629

Change-Id: Ifd840ea13976813639a2ee259124a21d9bb56893
2011-11-10 11:50:45 +09:00
satok
acf8357f30 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
2011-11-10 02:44:03 +00:00
satok
34bd596935 Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 2011-11-09 18:42:48 -08:00
Eric Laurent
96a33d1caa Fix problems in tablet silent mode.
Do not enter silent mode when ALARM stream volume is changed
to 0 by volume down key: Only RING, NOTIFICATION and MUSIC
streams control silent mode.

Report correct volume (0) for NOTIFICATION stream when silent mode
is entered by changing NOTIFICATION stream volume to 0 with
volume down key.

Change-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4
2011-11-09 18:06:37 -08:00
Dave Burke
b9655847bc Back to 59fps
Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6
2011-11-09 17:54:37 -08:00