Commit Graph

16884 Commits

Author SHA1 Message Date
Danica Chang
4978e7814f Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 2010-07-19 13:47:50 -07:00
The Android Open Source Project
29bff32cc0 merge from open-source master
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
2010-07-19 12:49:39 -07:00
The Android Open Source Project
d5ffb200b6 merge from open-source master
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
2010-07-19 12:17:53 -07:00
Romain Guy
499bcdb41c Merge "Replaced deprecated calls to setButton and setButton2" 2010-07-19 10:30:16 -07:00
Romain Guy
7b2e5b69d9 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Xavier Ducrohet
32afe04a54 am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp

* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.
2010-07-19 10:22:59 -07:00
Eric Laurent
07b9d4c5de am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp

* commit '7203272f35e40bf9d4b76f1b2f9b0077738df118':
  Fixed problems in audio effect volume control.
2010-07-19 10:19:49 -07:00
Eric Laurent
b04f72e609 Merge "Fixed problems in audio effect volume control." into gingerbread 2010-07-19 10:13:27 -07:00
The Android Open Source Project
cc0820bfcd merge from open-source master
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
2010-07-19 09:04:02 -07:00
Adam Bliss
1045ed607e am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
2010-07-19 08:36:26 -07:00
Adam Bliss
39a9bd6d49 Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 2010-07-19 08:09:19 -07:00
James Dong
0fa9b27cfa am faf775e7: Fix simulator build (1st attempt)
Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp

* commit 'faf775e772e329e821d81ba735474df097b1e1e9':
  Fix simulator build (1st attempt)
2010-07-18 15:03:15 -07:00
Vasu Nori
c9c6101935 am 94dab9b1: fix broken api/current.xml
Merge commit '94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp

* commit '94dab9b13590b714a7400d513f1e4655c62ddfaf':
  fix broken api/current.xml
2010-07-17 18:35:21 -07:00
Vasu Nori
f6164eded5 am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp

* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
  add video/audio chat-compatibility modes to ContactsContract
2010-07-17 18:25:20 -07:00
Eric Laurent
c9c41edd92 am 2c87e9c9: First submission of audio effect library from NXP software.
Merge commit '2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp

* commit '2c87e9c923b0362fabf8c97ff63997542394c428':
  First submission of audio effect library from NXP software.
2010-07-17 06:46:03 -07:00
Jeff Brown
86b92e3654 am d3616592: Fix trackball down and movement bugs.
Merge commit 'd3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp

* commit 'd3616592fe1b315b589766c4b74ce728fc4968f5':
  Fix trackball down and movement bugs.
2010-07-16 17:53:48 -07:00
Jeff Brown
f26db0d6c5 Fix trackball down and movement bugs.
Bug: 2823788
Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
2010-07-16 17:46:03 -07:00
Jeff Brown
0f63ddb175 am ace999b0: Ignore attempts to finish events on unregistered channels.
Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp

* commit 'ace999b096739d376d4845c0ba94599197ff8477':
  Ignore attempts to finish events on unregistered channels.
2010-07-16 16:03:07 -07:00
Hung Dang
e5b63e4acd am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp

* commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 15:18:03 -07:00
Jamie Gennis
4760482810 am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp

* commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82':
  Re-use existing Surface objects when reading them from parcels.
2010-07-16 15:17:59 -07:00
Hung Dang
9b242faf8b am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread

* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 15:15:44 -07:00
Jamie Gennis
874da6e438 Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 2010-07-16 15:14:44 -07:00
Jeff Brown
cd423c4239 am 00ba8844: Fix individual pointer id up/down reporting.
Merge commit '00ba884436dc8b222ad850c73c936d87bf4e84de' into gingerbread-plus-aosp

* commit '00ba884436dc8b222ad850c73c936d87bf4e84de':
  Fix individual pointer id up/down reporting.
2010-07-16 15:14:35 -07:00
Hung Dang
fb9b2483c9 Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 2010-07-16 15:13:12 -07:00
Jeff Brown
3cf1c9b844 Fix individual pointer id up/down reporting.
Fix a minor threading bug in InputManager dump.

Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
2010-07-16 15:11:24 -07:00
Scott Main
99762e5168 am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit 'e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp

* commit 'e068b46408f3ff390b47dc78ccf10fab76883051':
  docs: editorial revisions to Search guide
2010-07-16 15:02:30 -07:00
Scott Main
127c21f74a am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread

* commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1':
  docs: editorial revisions to Search guide
2010-07-16 14:59:48 -07:00
Scott Main
f044328d09 Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
The Android Open Source Project
7fd8fbb0c1 merge from open-source master
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
2010-07-16 14:01:37 -07:00
The Android Open Source Project
3923714fcb merge from open-source master
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
2010-07-16 13:58:43 -07:00
The Android Open Source Project
3fa4e58341 merge from open-source master
Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b
2010-07-16 13:50:12 -07:00
The Android Open Source Project
d92e54be2d merge from open-source master
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
2010-07-16 13:48:39 -07:00
The Android Open Source Project
189f3d790d merge from open-source master
Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb
2010-07-16 13:47:19 -07:00
The Android Open Source Project
ea0f37b52c merge from open-source master
Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
2010-07-16 13:42:31 -07:00
Jamie Gennis
aca4e22879 Re-use existing Surface objects when reading them from parcels.
This change adds a process-global cache of previously deserialized Surface
objects so that if a Surface object wrapping the same ISurface gets received
again the same Surface can be used.  This is important because the 'tail'
pointer in the SharedBufferClient is stored only on the client side, and needs
to be the same for all the Surface objects wrapping an ISurface instance.  This
solves the problem by making there only be one Surface object wrapping an
ISurface per process.

Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
2010-07-16 13:03:15 -07:00
Jeff Brown
e2cefe54f4 am eec69d29: Merge "Fix bug with phantom input windows." into gingerbread
Merge commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736' into gingerbread-plus-aosp

* commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736':
  Fix bug with phantom input windows.
2010-07-16 00:16:09 -07:00
Jeff Brown
9e2d6e976b Merge "Fix bug with phantom input windows." into gingerbread 2010-07-16 00:14:38 -07:00
Eric Laurent
1716d82d50 am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384' into gingerbread-plus-aosp

* commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384':
  Several improvements in audio effects volume control.
2010-07-16 00:12:02 -07:00
Eric Laurent
8849c6f648 Merge "Several improvements in audio effects volume control." into gingerbread 2010-07-16 00:08:50 -07:00
Jeff Brown
0a128e3cbe Fix bug with phantom input windows.
Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.

Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
2010-07-16 00:02:48 -07:00
Kenny Root
26b3d0bb33 am bd623daf: Undo IMediaContainerService changes
Merge commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp

* commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a':
  Undo IMediaContainerService changes
2010-07-15 22:37:06 -07:00
Dianne Hackborn
960259f456 am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp

* commit '75a91389f1938214397aaee262f4136e6bb6b094':
  Implement native key pre-dispatching to IMEs.
2010-07-15 22:24:53 -07:00
Dianne Hackborn
9c48c34ebe Merge "Implement native key pre-dispatching to IMEs." into gingerbread 2010-07-15 22:22:42 -07:00
Dianne Hackborn
0e8852766d Implement native key pre-dispatching to IMEs.
This significantly re-works the native key dispatching code to
allow events to be pre-dispatched to the current IME before
being processed by native code.  It introduces one new public
API, which must be called after retrieving an event if the app
wishes for it to be pre-dispatched.

Currently the native code will only do pre-dispatching of
system keys, to avoid significant overhead for gaming input.
This should be improved to be smarted, filtering for only
keys that the IME is interested in.  Unfortunately IMEs don't
currently provide this information. :p

Change-Id: Ic1c7aeec8b348164957f2cd88119eb5bd85c2a9f
2010-07-15 22:05:33 -07:00
Kenny Root
36930c2234 am 02c8730c: Add API to call to vold for mounting OBBs
Merge commit '02c8730c1bf19daf48bec8c6995df676a00a73b1' into gingerbread-plus-aosp

* commit '02c8730c1bf19daf48bec8c6995df676a00a73b1':
  Add API to call to vold for mounting OBBs
2010-07-15 21:35:53 -07:00
Jeff Brown
5197d17bf6 am c5ed5910: Add support for new input sources.
Merge commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637' into gingerbread-plus-aosp

* commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637':
  Add support for new input sources.
2010-07-15 18:47:24 -07:00
Jeff Brown
5c1ed84a2d Add support for new input sources.
Added several new coordinate values to MotionEvents to capture
touch major/minor area, tool major/minor area and orientation.

Renamed NDK input constants per convention.

Added InputDevice class in Java which will eventually provide
useful information about available input devices.

Added APIs for manufacturing new MotionEvent objects with multiple
pointers and all necessary coordinate data.

Fixed a bug in the input dispatcher where it could get stuck with
a pointer down forever.

Fixed a bug in the WindowManager where the input window list could
end up containing stale removed windows.

Fixed a bug in the WindowManager where the input channel was being
removed only after the final animation transition had taken place
which caused spurious WINDOW DIED log messages to be printed.

Change-Id: Ie55084da319b20aad29b28a0499b8dd98bb5da68
2010-07-15 18:32:33 -07:00
Romain Guy
beca03b99c Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value." 2010-07-15 18:24:02 -07:00
Christopher Tate
e2798f272c am d9452ecd: Merge "Fix jni registration typo" into gingerbread
Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp

* commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405':
  Fix jni registration typo
2010-07-15 18:21:33 -07:00
Scott Main
a1989140b9 am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp

* commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:19:27 -07:00