Basavapatna Dattaguru
b2c3c3e011
Merge "VideoEditor:IssueID:3396697: Updated Preview Test code"
2011-02-22 10:56:19 -08:00
Rajneesh Chowdury
dab9689491
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
d0269f708b
Merge "Make BluetoothInputDevice inherit from BluetoothProfile."
2011-02-22 10:43:53 -08:00
Jaikumar Ganesh
4ab0e7746f
Make BluetoothInputDevice inherit from BluetoothProfile.
...
This makes it in sync with BluetoothHeadset and BluetoothA2dp profiles.
Change-Id: I3ddb1d18b04aacb173b7bc376bca21c277a6afe4
2011-02-22 10:42:26 -08:00
Mike Lockwood
586d94ac15
Merge "UsbService: Re-enable previously enabled functions when exiting accessory mode"
2011-02-22 10:11:46 -08:00
Mike Lockwood
ddc6cade00
UsbService: Re-enable previously enabled functions when exiting accessory mode
...
Also added comments and cleaned up synchronization
Change-Id: I92ce1f84f6eeac8d640687506083b96a59fc71b5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-22 09:23:28 -08:00
Jesse Wilson
0390191392
Merge "Adopt LruCache in SettingsProvider."
2011-02-22 08:46:14 -08:00
Jesse Wilson
0c7faeee47
Adopt LruCache in SettingsProvider.
...
Change-Id: I223ed2a4bd90234ea7e3447f19e18c68beae2763
http://b/3184897
2011-02-22 08:42:11 -08:00
Chung-yih Wang
2fad616237
Merge "Add rport argument for a reinvite request."
2011-02-22 01:05:36 -08:00
Rajneesh Chowdury
06a087a52b
Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash
...
Change-Id: Ib257484ff8646b8e6a0a6a4bb9b937d5338c060c
2011-02-21 17:46:41 -08:00
Irfan Sheriff
ebd4e91618
Merge "Do not backup wifi country code settings"
2011-02-21 13:46:56 -08:00
Robert Greenwalt
e5a3e97901
Merge "Remove some unused code."
2011-02-21 13:25:14 -08:00
Irfan Sheriff
32fc71d93d
Do not backup wifi country code settings
...
Country code settings are device specific and
should not be linked to an account
Change-Id: Iead6230bfe7751a9478c45e5dca6b4ba619587b3
2011-02-21 13:15:14 -08:00
Robert Greenwalt
645b83f3ec
Remove some unused code.
...
Change-Id: Id29bf7d2118065e2e772b22d910bda1c6de2a475
2011-02-21 11:22:35 -08:00
Kristian Monsen
8842b5cc10
Turning on debug logs temporary for bug 3424424
...
Change-Id: Ic911a244e48312b566e6bcad2f635cc85075d897
2011-02-21 15:19:54 +00:00
Kristian Monsen
3e826c99b9
Part of fix for bug 3424424 Browser hanging
...
Not calling redundant android stack cookie code when the chrome
stack is enabled.
Change-Id: I6faea89295e0cae02f5aa19a6ddeec43a4b73a44
2011-02-21 15:19:54 +00:00
Chung-yih Wang
fcd0e50da5
Add rport argument for a reinvite request.
...
bug:3461707
Change-Id: I69a4f84dde3929c754c838fd12e624b774f44826
2011-02-21 11:53:58 +08:00
Dirk Dougherty
25474a2230
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
4aede1af71
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
Dirk Dougherty
301431d96e
Doc change: Final diff report for API 11.
...
Change-Id: Id7a6907a4f765fe753c2b134bfbd29a5792cc9ed
2011-02-19 17:55:57 -08:00
Jeff Brown
cc0c159e9b
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
6f2fba428c
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
b1bdb64d64
Merge "Move all Widevine code which have dependency on vendor modules to vendor/widevine"
2011-02-19 01:09:53 -08:00
Gloria Wang
e8c89a3199
Move all Widevine code which have dependency on vendor modules to vendor/widevine
...
Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
2011-02-18 22:42:26 -08:00
Scott Main
d2d034f154
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
b5d35088cb
resolved conflicts for merge of b842629c to honeycomb-plus-aosp
...
Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6
2011-02-18 19:42:29 -08:00
Xavier Ducrohet
1ca584a2bb
LayoutLib: remove assert in resource resolution.
...
These code paths were valid in case there's a mismatch
between the style/theme/version of Android
Change-Id: I8cb3b2a3f3a1ef5c37ccec0c8ddbb7add69bfbe0
2011-02-18 18:48:08 -08:00
Xavier Ducrohet
82314c013f
Merge "LayoutLib: support defStyleRes in obtainStyledAttributes."
2011-02-18 18:14:13 -08:00
Xavier Ducrohet
3e87bfa191
LayoutLib: support defStyleRes in obtainStyledAttributes.
...
This fix the Spinner rendering.
Change-Id: I20a71d9e07f6c86652a74fba3fc05a027a057ff8
2011-02-18 17:50:38 -08:00
Xavier Ducrohet
250da4bb91
Merge "LayoutLib: properly handle @null references in more places."
2011-02-18 17:46:03 -08:00
Xavier Ducrohet
f20999965b
LayoutLib: properly handle @null references in more places.
...
Change-Id: I240298ab79c19ab0e49cb6da19d6b0187493d3b5
2011-02-18 17:19:08 -08:00
Scott Main
b842629c02
docs: update sizes and sums for tools and ndk
...
Change-Id: Id7c72a89dc50461a7883b599dcd7a08738049dee
2011-02-18 17:02:10 -08:00
Gloria Wang
9509451743
Merge "- Update from Widevine - Bug fixes"
2011-02-18 16:39:40 -08:00
Gloria Wang
6681984cf6
- Update from Widevine
...
- Bug fixes
Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
2011-02-18 16:10:53 -08:00
Shimeng (Simon) Wang
a54fa6a931
Merge "A method refactoring and a simple rounding fix."
2011-02-18 15:37:30 -08:00
Shimeng (Simon) Wang
f7107d7e78
A method refactoring and a simple rounding fix.
...
issue: 3382398
Change-Id: I3b43c6e4954b5040a266da60c9a97314f1a5b91f
2011-02-18 15:30:34 -08:00
Adam Powell
e7c943926d
Merge "Add an API to listen for window attach/detach events on a View."
2011-02-18 15:17:16 -08:00
Scott Main
375adc69ae
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
483f7130b5
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
e4da393452
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
Adam Powell
4afd62b18c
Add an API to listen for window attach/detach events on a View.
...
Fix bug 3312949 - inconsistent state in MenuPopupHelper
Change-Id: Ie802ada3f8de4cf71c92fcc7c6abce9ba85e7b75
2011-02-18 15:03:20 -08:00
Wink Saville
a4738cf78f
Merge "Changes for ril.h version 6."
2011-02-18 14:05:34 -08:00
Wink Saville
5284090631
Changes for ril.h version 6.
...
Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
2011-02-18 12:40:47 -08:00
Adam Powell
c9bcc5618c
Merge "Fix styling for legacy light themed lists"
2011-02-18 12:16:17 -08:00
Adam Powell
8107f9552b
Fix styling for legacy light themed lists
...
Change-Id: I1ec470f967376dd97b69cdf42face1386180a484
2011-02-18 12:14:32 -08:00
Scott Main
4b6c6249a3
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
43bee0fef9
Merge "Visual indication of do-not-disturb mode in system bar."
2011-02-18 10:52:37 -08:00
Eric Laurent
c5075c0add
Merge "Added bluetooth SCO stream to VolumePanel"
2011-02-18 10:44:49 -08:00
Scott Main
55d3fc1bd5
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
Daniel Sandler
ce6ff64034
Visual indication of do-not-disturb mode in system bar.
...
Bug: 3408005
Change-Id: I934a6684bb3e90e2ada848872b5670f6b6e3e055
2011-02-18 13:32:14 -05:00