31919 Commits

Author SHA1 Message Date
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 13:10:22 -07:00
Dirk Dougherty
bc05d73a36 am 1c75552d: am 5ee00e22: am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update.
Merge commit '1c75552d5b22573da15726b1309283bee85c3c2f'

* commit '1c75552d5b22573da15726b1309283bee85c3c2f':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 13:10:11 -07:00
Mathias Agopian
c8be9b212f Merge "add a way to toggle the h/w composer at runtime" 2010-09-23 13:09:00 -07:00
Eric Laurent
bb7684bafa resolved conflicts for merge of ac4a284a to master
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
2010-09-23 12:22:44 -07:00
Amith Yamasani
085002c5ef am 847810f0: am 6e98c280: Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread
Merge commit '847810f0cdccd10e6e233281d4eb984b7ce8d680'

* commit '847810f0cdccd10e6e233281d4eb984b7ce8d680':
  Fix for IndexOutOfBounds in setComposingRegion.
2010-09-23 11:56:40 -07:00
Scott Main
a24277977d am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:46:10 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:41:48 -07:00
Dirk Dougherty
1c75552d5b am 5ee00e22: am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update.
Merge commit '5ee00e22b95ae4ea0d2cae5d781e39b8d962686a' into gingerbread-plus-aosp

* commit '5ee00e22b95ae4ea0d2cae5d781e39b8d962686a':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 11:41:11 -07:00
Dirk Dougherty
5ee00e22b9 am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update.
Merge commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866' into gingerbread

* commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 11:37:33 -07:00
Eric Laurent
ac4a284ab4 am 7864c72b: Merge "Fix issue 3022800." into gingerbread
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
  Fix issue 3022800.
2010-09-23 11:34:40 -07:00
Amith Yamasani
847810f0cd am 6e98c280: Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread
Merge commit '6e98c280f792932d60bf9374c8979d9eadce2d9c' into gingerbread-plus-aosp

* commit '6e98c280f792932d60bf9374c8979d9eadce2d9c':
  Fix for IndexOutOfBounds in setComposingRegion.
2010-09-23 11:34:11 -07:00
Irfan Sheriff
c6c9a7df58 Merge "Add Wifi Protected Setup support" 2010-09-23 11:33:49 -07:00
Scott Main
5b7328f257 Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 2010-09-23 11:23:48 -07:00
Eric Laurent
7864c72b91 Merge "Fix issue 3022800." into gingerbread 2010-09-23 11:07:06 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800.
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
2010-09-23 11:04:03 -07:00
Amith Yamasani
6e98c280f7 Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread 2010-09-23 11:03:49 -07:00
Steve Block
9b7ff13bfb Merge changes I4ad02ee1,I1bafc79b,I2c4df95e
* changes:
  Remove deprecated WebRuntime code
  Fix DumpRenderTree2 to clear AppCache between tests
  Fix DumpRenderTree2 to wait for the WebCore thread to become ready
2010-09-23 11:03:00 -07:00
Joe Onorato
7461c9e344 am 999d483b: am 49a8bbf4: Don\'t crash if we\'ve never gotten a signal strength update.
Merge commit '999d483bf8fc4271c42484aaf253f12e4eb8ff29'

* commit '999d483bf8fc4271c42484aaf253f12e4eb8ff29':
  Don't crash if we've never gotten a signal strength update.
2010-09-23 10:50:54 -07:00
Joe Onorato
999d483bf8 am 49a8bbf4: Don\'t crash if we\'ve never gotten a signal strength update.
Merge commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c' into gingerbread-plus-aosp

* commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c':
  Don't crash if we've never gotten a signal strength update.
2010-09-23 10:45:40 -07:00
Joe Onorato
49a8bbf4ea Don't crash if we've never gotten a signal strength update.
It looks like this timing bug has been there forever, and we're just starting to hit it now.

Bug: 3027952
Change-Id: I5c14ccd7f74205dc6930f4282cec0e23eeb54cab
2010-09-23 10:31:00 -07:00
James Dong
3611a0ef06 am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'

* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
  Ignore errors from correction parameter query and config for M4v and H263 encoders
2010-09-23 10:28:21 -07:00
Dirk Dougherty
27de3a240f Doc change: ADT 0.9.9 version notes, size/sum update.
Change-Id: I08ebfa95b0735964a888a89931a1f4c3bdf1862c
2010-09-23 10:25:24 -07:00
James Dong
a03f8fb7d0 am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'

* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:24:37 -07:00
James Dong
693a430cff am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '903fc221068d02bdb53ba2a48f86339caf405259' into gingerbread-plus-aosp

* commit '903fc221068d02bdb53ba2a48f86339caf405259':
  Ignore errors from correction parameter query and config for M4v and H263 encoders
2010-09-23 10:21:26 -07:00
James Dong
30c7e13217 am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:17:30 -07:00
James Dong
903fc22106 Ignore errors from correction parameter query and config for M4v and H263 encoders
This feature is not essential for camcorder application

Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
2010-09-23 10:12:45 -07:00
James Dong
697bd76e42 Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread 2010-09-23 10:11:04 -07:00
Ben Murdoch
f39b2cfadb Make autofill a webview preference
Change-Id: I2bed0612ad6381dd4c6aedf4af8740fac33748c7
2010-09-23 18:02:15 +01:00
Robert Greenwalt
35dcaece11 am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105'

* commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105':
  Cleanup Netd to prevent getting hung.
2010-09-23 09:40:20 -07:00
Irfan Sheriff
5ee89800be Add Wifi Protected Setup support
Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
2010-09-23 09:13:34 -07:00
Kristian Monsen
27a835f8d8 Merge "Fix deadlock in HTTP authentication within synchronous request." 2010-09-23 09:08:32 -07:00
Ben Murdoch
62275a461e Make WebTextView display an "AutoFill this form" option
When the user clicks to AutoFill the form, we propogate a message
to WebCore through WebViewCore to actually perform the action.

Corresponding change in external/webkit needed to implement the
native method that gets called to execute

Change-Id: I6c75ab9b2c5404580de549b69102ab9374493c34
2010-09-23 17:03:51 +01:00
Iain Merrick
4f0e56b7af Fix deadlock in HTTP authentication within synchronous request.
When HTTP authentication results in the user being prompted for a username
and password, this is handled asynchronously in the UI thread. However, we
can't post the result back to the WebKit thread in the normal way because
WebKit does not pump its message queue during synchronous requests.

Instead, we call WebKit directly from the UI thread and let it handle the
threading. This is safe to do because we're using thread-safe STL and
Chrome objects, not WebCore objects.

Change-Id: I79c21510186c2352f842c4ff4311687ec40ba45f
2010-09-23 16:59:18 +01:00
Robert Greenwalt
9c38a6dc13 am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp

* commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97':
  Cleanup Netd to prevent getting hung.
2010-09-23 08:48:14 -07:00
Robert Greenwalt
e87ebb08fb Merge "Cleanup Netd to prevent getting hung." into gingerbread 2010-09-23 08:41:21 -07:00
satok
1115d0da1a Merge "Add methods for managing subtypes" 2010-09-23 00:28:25 -07:00
satok
ab751aa085 Add methods for managing subtypes
- added showInputMethodSubtypePicker to public API
-- show the selector dialog for subtypes
- added getter, setter and event handler to InputMethodManagerService
- extract InputMethodSubtype to the top level class for using it in aidl
- TODO: make an enabler for input method subtypes
- TODO: handle the event of changing an input method subtype in LatinIME

Change-Id: I49f8c6675ac4b06511635d14a37bd398738eff33
2010-09-23 16:25:07 +09:00
repo sync
09225a4c8f am c0f2d952: am 0b7d6de1: Fix the build.
Merge commit 'c0f2d9522ea5891352e219c4ca8f85ac59287604'

* commit 'c0f2d9522ea5891352e219c4ca8f85ac59287604':
  Fix the build.
2010-09-23 00:11:07 -07:00
Chia-chi Yeh
6b762aaa8d resolved conflicts for merge of 2b652855 to master
Change-Id: I3604c95530823605d66cb56be7a37c55399a9271
2010-09-23 14:59:58 +08:00
repo sync
c0f2d9522e am 0b7d6de1: Fix the build.
Merge commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9' into gingerbread-plus-aosp

* commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9':
  Fix the build.
2010-09-22 23:56:42 -07:00
repo sync
0b7d6de155 Fix the build.
Change-Id: I82210cb2d41f532583f83ea17e6f2d8d49280a30
2010-09-23 14:52:24 +08:00
repo sync
2b6528554e am 75c3853e: Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
Merge commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92' into gingerbread-plus-aosp

* commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92':
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:17:24 -07:00
repo sync
75c3853ec5 Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
* changes:
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:14:15 -07:00
repo sync
84f7f6ba39 SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
Change-Id: I7efff4f29ca84c3e7c17ef066b7186b514a777b2
2010-09-23 14:07:45 +08:00
Wei-Ta Chen
a23cdda0a5 am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'

* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
  Unhide BitmapRegionDecoder.
2010-09-22 23:06:55 -07:00
Wei-Ta Chen
ac487f708f am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
  Unhide BitmapRegionDecoder.
2010-09-22 23:03:30 -07:00
Wei-Ta Chen
6b849e2123 Unhide BitmapRegionDecoder.
1. Rename LargeBitmap to BitmapRegionDecoder
2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.
3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build.
4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .
However, that change broke the master build due to (3) and was reverted eventually.
So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.

Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
2010-09-23 13:56:52 +08:00
Romain Guy
8e2b203c38 Merge "Correctly initialize/refresh layers." 2010-09-22 22:52:40 -07:00
Romain Guy
38c85b907a Correctly initialize/refresh layers.
Change-Id: Id8cdcf587b13098460f7d4aa1bd17708784d89bb
2010-09-22 22:51:12 -07:00
Chia-chi Yeh
e6c0c10958 SDP: Add a simple class to help manipulate session descriptions.
Change-Id: I1631ee20e8b4a9ad8e2184356b5d13de66e03db1
2010-09-23 13:31:01 +08:00