Basavapatna Dattaguru
96cf5f0e08
Merge "VideoEditor:IssueID:3396697: Updated Preview Test code"
2011-02-22 10:56:19 -08:00
Rajneesh Chowdury
c37dc738c4
Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash"
2011-02-22 10:50:21 -08:00
Jaikumar Ganesh
92ba2d8b6e
Merge "Make BluetoothInputDevice inherit from BluetoothProfile."
2011-02-22 10:43:53 -08:00
Alon Albert
61d36d7cc4
Merge "Support quoted parameters" into gingerbread
2011-02-22 10:31:26 -08:00
Mike Lockwood
a4e068a599
Merge "UsbService: Re-enable previously enabled functions when exiting accessory mode"
2011-02-22 10:11:46 -08:00
Nick Pelly
f8f4b975f9
Merge "DO NOT MERGE." into honeycomb
2011-02-22 09:10:32 -08:00
Jesse Wilson
db4d996f08
Merge "Adopt LruCache in SettingsProvider."
2011-02-22 08:46:14 -08:00
Chung-yih Wang
791917bc0a
Merge "Add rport argument for a reinvite request."
2011-02-22 01:05:36 -08:00
Irfan Sheriff
c51a552543
Merge "Do not backup wifi country code settings"
2011-02-21 13:46:56 -08:00
Robert Greenwalt
7dc7de5ce1
Merge "Remove some unused code."
2011-02-21 13:25:14 -08:00
Dirk Dougherty
36ddd02d46
am 4aede1af: am 301431d9: Doc change: Final diff report for API 11.
...
* commit '4aede1af7158a24e38b3809dcd194f375066fdde':
Doc change: Final diff report for API 11.
2011-02-19 18:13:08 -08:00
Dirk Dougherty
2c0e9e93dc
am 301431d9: Doc change: Final diff report for API 11.
...
* commit '301431d96e85e37d1dc2dd0df88f894dda0f5404':
Doc change: Final diff report for API 11.
2011-02-19 18:07:20 -08:00
Jeff Brown
25943a83f2
Add new hover move action and scroll wheel plumbing.
...
Added support for tracking the mouse position even when the mouse button
is not pressed. To avoid confusing existing applications, mouse movements
are reported using the new ACTION_HOVER_MOVE action when the mouse button
is not pressed.
Added some more plumbing for the scroll wheel axes. The values are
reported to Views but they are not yet handled by the framework.
Change-Id: I1706be850d25cf34e5adf880bbed5cc3265cf4b1
2011-02-19 06:14:21 -08:00
Jeff Brown
3ea4de826d
Add new axes for joysticks and mouse wheels.
...
Added API on InputDevice to query the set of axes available.
Added API on KeyEvent and MotionEvent to convert keycodes and axes
to symbolic name strings for diagnostic purposes.
Added API on KeyEvent to query if a given key code is a gamepad button.
Added a new "axis" element to key layout files to specify the
mapping between raw absolute axis values and motion axis ids.
Expanded the axis bitfield to 64bits to allow for future growth.
Modified the Makefile for keyboard prebuilts to run the keymap
validation tool during the build.
Added layouts for two game controllers.
Added default actions for game pad button keys.
Added more tests.
Fixed a bunch of bugs.
Change-Id: I73f9166c3b3c5bcf4970845b58088ad467525525
2011-02-19 05:23:10 -08:00
Gloria Wang
d647fdcb9c
Merge "Move all Widevine code which have dependency on vendor modules to vendor/widevine"
2011-02-19 01:09:53 -08:00
Scott Main
8f427883ac
am b5d35088: resolved conflicts for merge of b842629c to honeycomb-plus-aosp
...
* commit 'b5d35088cbbbac53b052ec52f199de4ad8b061e7':
docs: update sizes and sums for tools and ndk
2011-02-18 19:49:10 -08:00
Scott Main
de80fa0a1c
resolved conflicts for merge of b842629c to honeycomb-plus-aosp
...
Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6
2011-02-18 19:42:29 -08:00
Xavier Ducrohet
d7a20cc3d9
Merge "LayoutLib: support defStyleRes in obtainStyledAttributes."
2011-02-18 18:14:13 -08:00
Xavier Ducrohet
8b08703d89
Merge "LayoutLib: properly handle @null references in more places."
2011-02-18 17:46:03 -08:00
Gloria Wang
d21d9de75b
Merge "- Update from Widevine - Bug fixes"
2011-02-18 16:39:40 -08:00
Shimeng (Simon) Wang
e9cae7f87b
Merge "A method refactoring and a simple rounding fix."
2011-02-18 15:37:30 -08:00
Maarten Hooft
b36b9f3446
am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
Import revised translations. DO NOT MERGE
2011-02-18 15:22:48 -08:00
Adam Powell
254fbc1b73
Merge "Add an API to listen for window attach/detach events on a View."
2011-02-18 15:17:16 -08:00
Scott Main
ea3b135109
am 483f7130: am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
...
* commit '483f7130b593bb79f8ad0740356963aab42ccf54':
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
2011-02-18 15:14:44 -08:00
Scott Main
286971d865
am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
...
* commit 'e4da39345209c47b2736f266adfc22a0fdb4c716':
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
2011-02-18 15:11:14 -08:00
Scott Main
b5e284f670
Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
2011-02-18 15:08:26 -08:00
Wink Saville
81280b070b
Merge "Changes for ril.h version 6."
2011-02-18 14:05:34 -08:00
Adam Powell
765debb1ca
Merge "Fix styling for legacy light themed lists"
2011-02-18 12:16:17 -08:00
Scott Main
bf625946d8
am 55d3fc1b: am 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
...
* commit '55d3fc1bd571360dbecd76e9913666ed668e974a':
docs: update getting started doc for 3.0; move out of preview docs
2011-02-18 10:55:07 -08:00
Daniel Sandler
44997b027b
Merge "Visual indication of do-not-disturb mode in system bar."
2011-02-18 10:52:37 -08:00
Eric Laurent
b97f7a77b5
Merge "Added bluetooth SCO stream to VolumePanel"
2011-02-18 10:44:49 -08:00
Scott Main
677eab052d
am 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
...
* commit '163413f4360af8a8b010fa69a131fb0177df96a7':
docs: update getting started doc for 3.0; move out of preview docs
2011-02-18 10:40:59 -08:00
Scott Main
689b5b8b9c
Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
2011-02-18 10:26:41 -08:00
Shimeng (Simon) Wang
e144674a39
Merge "Make sure zoom width is changed before fit-to-screen."
2011-02-18 09:50:11 -08:00
Alex Sakhartchouk
823676cbb1
Merge "Fixing font renderer attribute slot locations."
2011-02-18 09:17:15 -08:00
Alex Sakhartchouk
f40dfdc687
Merge "Fix UI in image processing."
2011-02-18 09:12:30 -08:00
Romain Guy
8ca2b0d566
am a2090bea: am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit 'a2090bea4824cf153c4d9c735ee779613cf2e3d7':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-18 08:06:01 -08:00
Romain Guy
d4cd30cbcf
am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit '7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-18 07:53:50 -08:00
Romain Guy
2151cef42c
Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
2011-02-17 22:40:33 -08:00
Robert Ly
fff8b38258
am d2acfd6d: am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
...
* commit 'd2acfd6d04545562fcacd266e175461f26b25da9':
Doc change: fixing renderscript samples
2011-02-17 20:23:49 -08:00
Scott Main
86c255451f
am aa680857: (-s ours) am 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
...
* commit 'aa680857e6ba107dfc9c76c5a342f6f907120c22':
DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
2011-02-17 20:23:45 -08:00
Robert Ly
d2e169c471
am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
...
* commit 'a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
Doc change: fixing renderscript samples
2011-02-17 20:21:35 -08:00
Scott Main
12a71bdc18
am 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
...
* commit '0ddd2d1ea7cda544efc4d25601e1cdc0236e44d8':
DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
2011-02-17 20:21:24 -08:00
Santosh Madhava
b34fadeb34
Merge "Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames"
2011-02-17 19:10:02 -08:00
Robert Ly
f54cc8c011
Merge "Doc change: fixing renderscript samples" into honeycomb
2011-02-17 18:53:36 -08:00
Xia Wang
d8052f5b6f
Merge "Add ping test to verify data connection."
2011-02-17 18:53:16 -08:00
Dianne Hackborn
396cd80fff
Merge "Explode WindowManagerService."
2011-02-17 18:30:11 -08:00
Chung-yih Wang
90fef6beca
Merge "Make SIP AuthName APIs public."
2011-02-17 18:29:38 -08:00
Shimeng (Simon) Wang
9d8b78512a
Merge "Reset initial zoom overview state when user takes zoom action."
2011-02-17 17:47:15 -08:00
Maarten Hooft
1db90719b3
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-02-17 17:17:40 -08:00