Mike Lockwood
3c85a4e639
Merge "KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()"
2011-02-22 13:11:11 -08:00
James Dong
117549fc78
Merge "Check file descriptor before passing it through binder calls"
2011-02-22 13:10:15 -08:00
Dianne Hackborn
a9c40ef176
Merge "Add missing header comment."
2011-02-22 13:05:01 -08:00
Daniel Sandler
16d691f8fc
Merge "Fix the flipping orientation lock."
2011-02-22 13:04:49 -08:00
Dianne Hackborn
f56e1021aa
Add missing header comment.
...
Change-Id: Iec0c0c90153560d256b95212b7dcf969edf22143
2011-02-22 13:00:15 -08:00
James Dong
bafa7eaccb
Check file descriptor before passing it through binder calls
...
bug - 3476613
Change-Id: I858933fd2fe4c095c0bd58bf50344c47fc104be9
2011-02-22 12:34:02 -08:00
Daniel Sandler
2ed6ad6aec
Fix the flipping orientation lock.
...
We were setting ACCELEROMETER_ROTATION to 0 before putting
in the proper USER_ROTATION value, and PhoneWindowManager's
content observer would eagerly rotate the screen to the last
locked orientation before re-rotating to the updated locked
rotation.
Now we set USER_ROTATION first. Additionally, the
content observer is now the only place we set
mUserRotation{,Mode} (previously we would race with it in
setUserRotationMode()).
Bug: 3425657
Change-Id: I04ba1a3631c6d985c2e406c4d148c39fb5c36216
2011-02-22 15:24:55 -05:00
Romain Guy
795e42e91a
Merge "Add more info to View.getLayoutParams()"
2011-02-22 11:50:32 -08:00
Romain Guy
01c174bce3
Add more info to View.getLayoutParams()
...
Change-Id: I9abc64c9bbf726a02256a9ab692d9c555a6e3525
2011-02-22 11:51:06 -08:00
Romain Guy
d379d53a5e
Add missing docs to AttributeSet.
...
Change-Id: Ieabc9e63104d274e59c3bd9a4e7ec475c5e32c6b
2011-02-22 11:32:29 -08:00
Romain Guy
f4f9c937b6
Merge "Add missing docs to AttributeSet."
2011-02-22 11:30:09 -08:00
Romain Guy
ffa337483a
Fix incorrect id name in ListActivity's documentation.
...
Change-Id: I83ce45d313f31b15b84abf64294eff19accc30b6
2011-02-22 11:24:15 -08:00
Romain Guy
2569137929
Merge "Fix incorrect id name in ListActivity's documentation."
2011-02-22 11:22:23 -08:00
Romain Guy
84c6b95a77
Add documentation to GridView.
...
Change-Id: Ic81e498ad05f0c9c33580ecd6ce895ff1b6e00c4
2011-02-22 11:15:42 -08:00
Romain Guy
2b9f895b02
Merge "Add documentation to GridView."
2011-02-22 11:13:29 -08:00
Patrick Scott
e835fd7212
Merge "Scroll layers on touch events."
2011-02-22 11:06:02 -08:00
Cary Clark
16ed2ab09f
Merge "don't scale nav slop when zooming"
2011-02-22 11:04:44 -08:00
Jaikumar Ganesh
b7508df1f6
Merge "Fix compiler errors when compiled with debug option."
2011-02-22 10:57:48 -08:00
Basavapatna Dattaguru
3ed54d03ee
Merge "VideoEditor:IssueID:3396697: Added Performance test code"
2011-02-22 10:56:29 -08:00
Basavapatna Dattaguru
b2c3c3e011
Merge "VideoEditor:IssueID:3396697: Updated Preview Test code"
2011-02-22 10:56:19 -08:00
Jaikumar Ganesh
2653a1e7ca
Fix compiler errors when compiled with debug option.
...
The Logv statement was missing the format specifier.
Change-Id: Ibf986d28dabfdbb3fbfd75381cb349448c6e57e7
2011-02-22 10:53:29 -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
Cary Clark
e9290826db
don't scale nav slop when zooming
...
Map the nav slop from device dimensions to content dimensions
so that the nav slop is not scaled when the screen is zoomed.
bug:3465598
Change-Id: I764e7d0ef59107f3f8b3781744df532dd45005b6
2011-02-22 13:20:56 -05: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
Patrick Scott
cfa734a359
Scroll layers on touch events.
...
Send the LayerAndroid unique id and the current scroll rect during motion up
events and all touch events.
Bug: 3442108
Change-Id: I09a18ded7b7ce15984f61a329b2666f7cfadd0dc
2011-02-22 11:19:02 -05: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
Basavapatna Dattaguru
f1f9ff28c3
VideoEditor:IssueID:3396697: Added Performance test code
...
Updated with review comments: MediaFrameworkStressTestRunner.java deleted
Updated with growing heap report in Stress test case
Change-Id: I847f8810e2b844015c47b7d24e488a611d85287c
2011-02-18 18:42:56 -08:00