Jason Sams
a4a6172985
am 7d71556b: Merge "Document the basic RS math functions."
...
* commit '7d71556b18f7a4131aeb01f3e78f8fe390c163e4':
Document the basic RS math functions.
2011-08-31 15:23:17 -07:00
Jeff Brown
ab52cfe9e0
am 3cdfc4d9: Merge "Support composite touch / joystick devices better."
...
* commit '3cdfc4d94f6af82953f0e722ade882197c72da58':
Support composite touch / joystick devices better.
2011-08-31 15:21:09 -07:00
Jason Sams
7d71556b18
Merge "Document the basic RS math functions."
2011-08-31 15:20:43 -07:00
Jeff Brown
3cdfc4d94f
Merge "Support composite touch / joystick devices better."
2011-08-31 15:18:59 -07:00
Pannag Sanketi
34abe00ae2
am d318b73e: Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
...
* commit 'd318b73e8e7832f257797ce08b3eea02780b7909':
Update SurfaceMediaSource_test to not use pbuffer configs
2011-08-31 15:10:54 -07:00
Pannag Sanketi
d318b73e8e
Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
2011-08-31 15:09:26 -07:00
Jason Sams
e79f7687dc
Document the basic RS math functions.
...
Change-Id: If7a1b82eab4c4c82443cf8e57b444865f1e3f6b8
2011-08-31 14:52:08 -07:00
Peter Ng
9ae703b546
am 9c1b694d: Merge "Switches now have checked state"
...
* commit '9c1b694df422bf7204628fe44ddc4988a607015d':
Switches now have checked state
2011-08-31 14:30:06 -07:00
Peter Ng
9c1b694df4
Merge "Switches now have checked state"
2011-08-31 14:28:23 -07:00
Dianne Hackborn
8aab8b5759
am 1434ab98: Merge "Use floating point window positions."
...
* commit '1434ab98e690cbcfcdcd2296b491a44bff14cc55':
Use floating point window positions.
2011-08-31 14:22:37 -07:00
James Dong
2c0000d7ad
am e3fb1cb1: Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
...
* commit 'e3fb1cb1b1f333aadc780c85de0735143ad864b4':
Fix a crash where the EOS was signalled but some output buffer were still pending.
2011-08-31 14:20:39 -07:00
Dianne Hackborn
1434ab98e6
Merge "Use floating point window positions."
2011-08-31 14:19:22 -07:00
Dianne Hackborn
d040edbae9
Use floating point window positions.
...
Gets rid of gapps between windows during animations.
Change-Id: I17d2ef0af214008f0eabd7eb19268f145fe83b39
2011-08-31 14:18:32 -07:00
James Dong
e3fb1cb1b1
Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
2011-08-31 14:17:18 -07:00
Fabrice Di Meglio
616359fc8e
am be566b48: Merge "Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it"
...
* commit 'be566b488a78e9e5ba0971ebe888d41511a11fa8':
Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it
2011-08-31 14:16:32 -07:00
Romain Guy
e5fd23f885
am dcc882ed: Merge "Make ViewServer more quiet Bug #5231539 "
...
* commit 'dcc882edfe530e1bbd61e776a7d2c8b874768e1d':
Make ViewServer more quiet Bug #5231539
2011-08-31 14:14:34 -07:00
Fabrice Di Meglio
be566b488a
Merge "Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it"
2011-08-31 14:14:11 -07:00
Romain Guy
dcc882edfe
Merge "Make ViewServer more quiet Bug #5231539 "
2011-08-31 14:12:18 -07:00
Romain Guy
cbe67d5b33
Make ViewServer more quiet
...
Bug #5231539
Change-Id: Ib1f3e0d7592b4af802efe4e9630a220c23450521
2011-08-31 14:11:07 -07:00
Fabrice Di Meglio
3716601573
Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it
...
- make the selection green highlight work
Change-Id: I4e3b88e3720288f973b1b9e68afa8f800ad13779
2011-08-31 13:56:37 -07:00
Eino-Ville Talvala
235ea3b0a3
am b2c4f0bf: Merge "Fix SurfaceMediaSource timestamp handling."
...
* commit 'b2c4f0bf11f38fd31d80f1256c89b9db043a2929':
Fix SurfaceMediaSource timestamp handling.
2011-08-31 13:43:05 -07:00
Eino-Ville Talvala
b2c4f0bf11
Merge "Fix SurfaceMediaSource timestamp handling."
2011-08-31 13:41:06 -07:00
Russell Brenner
acbee07a33
am 6752d482: Merge "Add DroidSansGeorgian font file"
...
* commit '6752d4827dee6bf5fb52cae61c00690e23d0b779':
Add DroidSansGeorgian font file
2011-08-31 13:34:43 -07:00
Russell Brenner
080fee806f
am ac8ee3b9: Merge "Add DroidSansArmenian font file"
...
* commit 'ac8ee3b9d420b44dccebb099a73fb4cda8a926eb':
Add DroidSansArmenian font file
2011-08-31 13:34:39 -07:00
Russell Brenner
6752d4827d
Merge "Add DroidSansGeorgian font file"
2011-08-31 13:33:04 -07:00
Russell Brenner
ac8ee3b9d4
Merge "Add DroidSansArmenian font file"
2011-08-31 13:32:41 -07:00
Nick Pelly
666fa84e66
am 46848574: Merge "NFC API updates."
...
* commit '468485747970d9842d94e1d292fe4cced701cad2':
NFC API updates.
2011-08-31 13:26:23 -07:00
Nick Pelly
4684857479
Merge "NFC API updates."
2011-08-31 13:24:14 -07:00
Jeff Brown
79753f387a
am 9d4bc852: Merge "Fix input channel leak. Bug: 5156144"
...
* commit '9d4bc852ea459c2a4347a87ce0357b3328a25db8':
Fix input channel leak. Bug: 5156144
2011-08-31 13:03:26 -07:00
Eric Laurent
29227e71ec
am 16b241a5: Merge "Change condition to enter silent mode."
...
* commit '16b241a58f1ec4b317647b6fd0ad9b5cc3f7ba3d':
Change condition to enter silent mode.
2011-08-31 13:01:19 -07:00
Jeff Brown
9d4bc852ea
Merge "Fix input channel leak. Bug: 5156144"
2011-08-31 13:01:16 -07:00
Eric Laurent
16b241a58f
Merge "Change condition to enter silent mode."
2011-08-31 12:59:28 -07:00
Jeff Brown
9ee285afe7
Support composite touch / joystick devices better.
...
This change enables the joystick input mapper to handle any axes
that are not claimed by the touch input mapper, which makes
auxiliary controls such as wheels / knobs accessible.
Change-Id: I01ee7f342ac91acfcb4ccb6676fd52b3d5bf31a0
2011-08-31 12:56:34 -07:00
Jean-Michel Trivi
1d2bca9ccd
am 528e382f: Merge "Fix 5242200 only update RemoteControlDisplay when a client is present"
...
* commit '528e382f48681a2175a24e7403f63a4493d7c44b':
Fix 5242200 only update RemoteControlDisplay when a client is present
2011-08-31 12:05:22 -07:00
Jean-Michel Trivi
528e382f48
Merge "Fix 5242200 only update RemoteControlDisplay when a client is present"
2011-08-31 12:03:50 -07:00
Jean-Michel Trivi
3387945766
Fix 5242200 only update RemoteControlDisplay when a client is present
...
A precondition for updateRemoteControlDisplay_syncRcs() is that
mRCStack is not null. This condition was not verified when
registering a RemoteControlDisplay.
Change-Id: I0b152410e57c590114b387e9ab83f0c4d15d060d
2011-08-31 11:52:16 -07:00
Mike Lockwood
157468dfe9
Merge "ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless" into ics-aah
2011-08-31 11:49:31 -07:00
Mike Lockwood
056d76183e
ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
...
Change-Id: I7419d14e1f2ac1e045bb95d16f5658a0217a9d81
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-31 14:48:35 -04:00
Adam Powell
d077bbc993
am ac73e4bb: Merge "Fix bug 5220390 - action bar title metrics"
...
* commit 'ac73e4bb420dbda31a866f3b86b207c71ecfa2f6':
Fix bug 5220390 - action bar title metrics
2011-08-31 11:43:28 -07:00
Adam Powell
ac73e4bb42
Merge "Fix bug 5220390 - action bar title metrics"
2011-08-31 11:42:02 -07:00
Irfan Sheriff
a5d37ea2b4
am 2a62b43e: Merge "Remove persistent behavior"
...
* commit '2a62b43e671ef893e606292e82bc9fb9a09a3bf5':
Remove persistent behavior
2011-08-31 11:38:31 -07:00
Irfan Sheriff
eacb82cfac
am 329b7971: Merge "Reload STA firmware on start"
...
* commit '329b79713c06944c02a431081e75ef5e1862d32f':
Reload STA firmware on start
2011-08-31 11:38:24 -07:00
Adam Powell
07a047fdd6
Fix bug 5220390 - action bar title metrics
...
Adjust action bar title layout metrics to match UX specs.
Refresh new metrics properly after a config change.
Change-Id: If19fad837ca2919193d4a3a8eb01c1caff68ca67
2011-08-31 11:36:02 -07:00
Irfan Sheriff
2a62b43e67
Merge "Remove persistent behavior"
2011-08-31 11:35:45 -07:00
Irfan Sheriff
329b79713c
Merge "Reload STA firmware on start"
2011-08-31 11:35:26 -07:00
Jeff Sharkey
797da18e45
am 1123de96: Merge "More robust check around TelephonyManager init."
...
* commit '1123de96b15b0ef8d4e9f50d8c3206ef91557e80':
More robust check around TelephonyManager init.
2011-08-31 11:33:36 -07:00
Jeff Sharkey
1123de96b1
Merge "More robust check around TelephonyManager init."
2011-08-31 11:32:22 -07:00
Tsu Chiang Chuang
4a6736d514
am 09702a0e: Merge "make sure the test apk gets added to the test zip"
...
* commit '09702a0ef7f47874f91dccba84054be6700a9c54':
make sure the test apk gets added to the test zip
2011-08-31 11:31:34 -07:00
Tsu Chiang Chuang
09702a0ef7
Merge "make sure the test apk gets added to the test zip"
2011-08-31 11:29:17 -07:00
Jeff Sharkey
52d0f9882f
More robust check around TelephonyManager init.
...
Only complain when Context radically changed.
Bug: 4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
2011-08-31 11:15:34 -07:00