Jeff Brown
b9fab20297
am 86c471db: Merge "Fix tap gesture on touch pads."
...
* commit '86c471db06e35f0cd96e5505f8eae56294d0272f':
Fix tap gesture on touch pads.
2011-08-19 17:39:52 -07:00
Jeff Brown
86c471db06
Merge "Fix tap gesture on touch pads."
2011-08-19 17:38:09 -07:00
Wei Hua
8e7a732b26
am 7526a6d9: Merge "Added additional Face attributes."
...
* commit '7526a6d9235a73f93ae5064e8b82440b61c53929':
Added additional Face attributes.
2011-08-19 17:22:37 -07:00
Wei Hua
7526a6d923
Merge "Added additional Face attributes."
2011-08-19 17:20:54 -07:00
Romain Guy
06639521e9
am bb41daad: Merge "Minor fixes to SurfaceTexture transform matrix."
...
* commit 'bb41daadf9dc3e28fd96f1da515c43dbdeedfc0f':
Minor fixes to SurfaceTexture transform matrix.
2011-08-19 16:59:40 -07:00
Romain Guy
bb41daadf9
Merge "Minor fixes to SurfaceTexture transform matrix."
2011-08-19 16:57:32 -07:00
Alexandre Elias
c01391fb4e
Minor fixes to SurfaceTexture transform matrix.
...
- Sometimes, the applyUpdate was applied through draw() and the
underlying matrix was not updated in time, causing "jitter". Add a
matrix update call in draw().
- Switch to invalidateParentIfNeeded() in setTransform().
Change-Id: I1cf9cdfe78f9d989821cdc9600984fc826430211
2011-08-19 16:53:42 -07:00
Jim Miller
091fa8d529
am 6d978428: Merge "Fix 5021968: Add input method switcher button to lock screen."
...
* commit '6d97842849bed82affbd45251529f85f0958a6b8':
Fix 5021968: Add input method switcher button to lock screen.
2011-08-19 16:32:35 -07:00
Jim Miller
6d97842849
Merge "Fix 5021968: Add input method switcher button to lock screen."
2011-08-19 16:30:13 -07:00
Fabrice Di Meglio
a646145c33
Improve TextDirection resolution
...
- remove unuseful heuristics
- tune Javadoc
Change-Id: Id72a158b3a17a528423d278b1cbfd95b8c2951b5
2011-08-19 16:19:37 -07:00
repo sync
174d2b5054
am 53ec3ff7: Merge "Fix device address and interface address usage"
...
* commit '53ec3ff77bae68f4bc9d9f3c0e8ffd7fdd9aa5d4':
Fix device address and interface address usage
2011-08-19 16:11:12 -07:00
repo sync
53ec3ff77b
Merge "Fix device address and interface address usage"
2011-08-19 16:08:50 -07:00
Jeff Brown
a66cee134e
Fix tap gesture on touch pads.
...
Change-Id: I92b23e5971d4b98b173aacd64fe03ce9f0755c88
2011-08-19 16:04:30 -07:00
Mathias Agopian
5b54b3adf9
am e74f83a5: Merge "Fix occasional fusion divergence by detecting it and resetting the fusion."
...
* commit 'e74f83a5f865e8a4477127c5a029cbbbd42ea24e':
Fix occasional fusion divergence by detecting it and resetting the fusion.
2011-08-19 15:55:20 -07:00
Mathias Agopian
e74f83a5f8
Merge "Fix occasional fusion divergence by detecting it and resetting the fusion."
2011-08-19 15:54:09 -07:00
Jim Miller
858f8eaac7
Fix 5021968: Add input method switcher button to lock screen.
...
This adds an IME switcher button to lock screen. It is only
shown if the user has more than one applicable and enabled IME installed.
Change-Id: I5f9503a205c2edb27170825539ba4a6ef25418ed
2011-08-19 15:46:03 -07:00
Jeff Brown
b9a2801287
am 30867d8b: Merge "Input system bug fixes, particularly for stylus. Bug: 5049148"
...
* commit '30867d8bdf9c6a719f3ae129d7e271b55592e163':
Input system bug fixes, particularly for stylus. Bug: 5049148
2011-08-19 15:28:05 -07:00
Jeff Brown
30867d8bdf
Merge "Input system bug fixes, particularly for stylus. Bug: 5049148"
2011-08-19 15:26:13 -07:00
Christopher Tate
1c536f13cc
am d6a2be3e: Merge "Allow Instrumentation to kill even persistent processes"
...
* commit 'd6a2be3ef75892d223bddc82db8a4b4f22d0ec20':
Allow Instrumentation to kill even persistent processes
2011-08-19 15:23:13 -07:00
Christopher Tate
d6a2be3ef7
Merge "Allow Instrumentation to kill even persistent processes"
2011-08-19 15:21:43 -07:00
Jeff Brown
65fd251c39
Input system bug fixes, particularly for stylus.
...
Bug: 5049148
Finished stylus support, including support for indirect stylus
and mouse tools.
Added TILT axis. When stylus tilt X/Y is available, it is transformed
into an orientation and tilt inclination which is a more convenient
representation and a simpler extension to the exiting API.
Touch devices now only report touch data using a single input
source. Previously touch devices in pointer mode would report
both absolute touch pad data and cooked pointer gestures.
Now we just pick one. The touch device switches modes as needed
when the focused application enables/disables pointer gestures.
This change greatly simplifies the code and reduces the load
on the input dispatcher.
Fixed an incorrect assumption that the value of ABS_(MT_)DISTANCE
would be zero whenever the stylus was in direct contact. It appears
that the correct way to determine whether the stylus is in direct
contact (rather than hovering) is by checking for a non-zero
reported pressure.
Added code to read the initial state of tool buttons and axis values
when the input devices are initialized or reset. This fixes
problems where the input mapper state might have the wrong initial
state.
Moved responsibility for cancelling pending inputs (keys down,
touches, etc.) to the InputDispatcher by sending it a device reset
notification. This frees the InputReader from having to synthesize
events during reset, which was cumbersome and somewhat brittle
to begin with.
Consolidated more of the common accumulator logic from
SingleTouchInputMapper and MultiTouchInputMapper into
TouchInputMapper.
Improved the PointerLocation output.
Change-Id: I595d3647f7fd7cb1e3eff8b3c76b85043b5fe2f0
2011-08-19 15:02:26 -07:00
Rajneesh Chowdury
990bb11f7a
am c0a22225: Merge "Fix for 4142219 Don\'t hard code platform-specific limitations (Jni/ Java)"
...
* commit 'c0a2222552f48a2543a64a4cbe913d0b9ffc3cbf':
Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)
2011-08-19 15:02:14 -07:00
Rajneesh Chowdury
c0a2222552
Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)"
2011-08-19 15:01:11 -07:00
Christopher Tate
3dacd8470a
Allow Instrumentation to kill even persistent processes
...
Fixes bug 5117630
Change-Id: Iff40145fbbdc1d81a60cf2ecc5b24321162f7897
2011-08-19 14:57:57 -07:00
Dianne Hackborn
ae070921fd
am ace0be25: Merge "Fix issue #5187844 : Query is misrouted to wrong content provider"
...
* commit 'ace0be25d8b1043c8f3d74f8daf20c485b7496ef':
Fix issue #5187844 : Query is misrouted to wrong content provider
2011-08-19 14:52:21 -07:00
Dianne Hackborn
4479d04328
am cd94303e: Merge "Fix issue #5186318 : Can\'t take multiple screenshots"
...
* commit 'cd94303e8ad39497c52e31e6ce9a78aac047ff7f':
Fix issue #5186318 : Can't take multiple screenshots
2011-08-19 14:50:11 -07:00
Dianne Hackborn
ace0be25d8
Merge "Fix issue #5187844 : Query is misrouted to wrong content provider"
2011-08-19 14:49:39 -07:00
Dianne Hackborn
cd94303e8a
Merge "Fix issue #5186318 : Can't take multiple screenshots"
2011-08-19 14:48:40 -07:00
Fabrice Di Meglio
64e63631fb
am 067bb3b4: Merge "Update TextLayout logging"
...
* commit '067bb3b44357e09628ae63a8e7cf27f93b811b84':
Update TextLayout logging
2011-08-19 14:43:09 -07:00
repo sync
8c57bcdbc6
Fix device address and interface address usage
...
After a p2p group is formed, STA connect and disconnects come over
interface address. Figure out device address from interface address
and fix the device comparison
Bug: 5002384
Change-Id: I7d3aa4f0616e000550cd2b057adbac71cfd2adb4
2011-08-19 14:41:03 -07:00
Jamie Gennis
6331a3cca4
am c0ce6077: Merge "Stagefright: fix a compiler warning"
...
* commit 'c0ce60774cd9ec654d30d1ce6d670c69fa7bb9c5':
Stagefright: fix a compiler warning
2011-08-19 14:40:19 -07:00
Fabrice Di Meglio
067bb3b443
Merge "Update TextLayout logging"
2011-08-19 14:39:15 -07:00
Jamie Gennis
c0ce60774c
Merge "Stagefright: fix a compiler warning"
2011-08-19 14:36:10 -07:00
Rajneesh Chowdury
3ced044154
Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)
...
Also fixes 5118207 add other video codec support for video editor export.
Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
2011-08-19 14:34:47 -07:00
Amith Yamasani
b5f9b9f535
am 16296180: Merge "Fix an unintentional change in method signature and avoid an API change."
...
* commit '16296180984756e631611005179f42865af35621':
Fix an unintentional change in method signature and avoid an API change.
2011-08-19 14:31:23 -07:00
Amith Yamasani
1629618098
Merge "Fix an unintentional change in method signature and avoid an API change."
2011-08-19 14:29:34 -07:00
Stephen Hines
ebd8215105
am c3ccfb8e: Merge "Issue proper parameters to root() calls for RS."
...
* commit 'c3ccfb8eec47cdc0911c35b387d17659af25fbe9':
Issue proper parameters to root() calls for RS.
2011-08-19 14:21:26 -07:00
Dianne Hackborn
c0e3f2453c
Fix issue #5186318 : Can't take multiple screenshots
...
Locking good. Races bad.
Change-Id: I59dd0ec2de47973c38fd646c2f441dd174eba444
2011-08-19 14:19:10 -07:00
Stephen Hines
c3ccfb8eec
Merge "Issue proper parameters to root() calls for RS."
2011-08-19 14:17:47 -07:00
Dianne Hackborn
1c9b260cf5
Fix issue #5187844 : Query is misrouted to wrong content provider
...
Change-Id: I56834f41844990d67edc8af83273036b3d755e37
2011-08-19 14:08:43 -07:00
Wei Hua
d52b308916
Added additional Face attributes.
...
bug: 5186701
Change-Id: Id08df922b9a79192a81e6e8bd7c0dccad4664b3b
2011-08-19 13:01:51 -07:00
Amith Yamasani
a465b2d4c3
Fix an unintentional change in method signature and avoid an API change.
...
Change onDetachedFromWindow() override to a protected method, like superclass.
Change-Id: If626c5187290516d525cab5a76f5c5cabe2d87f0
2011-08-19 13:01:22 -07:00
Guang Zhu
c79b6b0e70
am 4a6f0447: Merge "Use port 18000 instead of 8000 for layout tests"
...
* commit '4a6f0447866ffcd2a4455cfd54ba3456128bf9e4':
Use port 18000 instead of 8000 for layout tests
2011-08-19 12:46:41 -07:00
Guang Zhu
4a6f044786
Merge "Use port 18000 instead of 8000 for layout tests"
2011-08-19 12:44:28 -07:00
Eino-Ville Talvala
f4d58e5bdc
am d06fa51b: Merge "Make changing white-balance mode always disable AWB lock."
...
* commit 'd06fa51b3ef8bf28c0c7ebdd82ef47f786e10fb8':
Make changing white-balance mode always disable AWB lock.
2011-08-19 12:43:34 -07:00
Eino-Ville Talvala
d06fa51b3e
Merge "Make changing white-balance mode always disable AWB lock."
2011-08-19 12:42:06 -07:00
Adam Powell
dda20678c3
am b7d34e71: Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items"
...
* commit 'b7d34e71726603514b2e405f9e3dcdf437e989c7':
Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items
2011-08-19 12:36:26 -07:00
Adam Powell
b7d34e7172
Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items"
2011-08-19 12:34:28 -07:00
Stephen Hines
1222393e35
Issue proper parameters to root() calls for RS.
...
BUG=5076887
Change-Id: Ic0ce9d45ee20a99add4c780233c0804d05a55e96
2011-08-19 12:27:07 -07:00
Justin Ho
97873c946e
am d4f60257: Merge "Remove old spinner_ assets from zygote Bug: 5076695"
...
* commit 'd4f602570226108c6a1623469383673df10c9f21':
Remove old spinner_ assets from zygote Bug: 5076695
2011-08-19 12:26:14 -07:00