Ken Wakasa
ed19b88fe2
am 6ddec8be: am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb
...
* commit '6ddec8be1cc23f4b7e8793503420072024884072':
Update class doc for InputMethodSubtype
2011-01-21 11:00:46 -08:00
Brad Fitzpatrick
6700447200
am ca87f0e8: am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb
...
* commit 'ca87f0e832f71226839004c8e854e1389c037234':
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
2011-01-21 11:00:20 -08:00
satok
6a32272af5
am d57c1fcf: am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
...
* commit 'd57c1fcf5a4f8fd9451e4a09aa50ed14c7f94ff2':
Show ime switch icon when there is a hard keyboard
2011-01-21 10:59:32 -08:00
Adam Cohen
047106d436
am f95a963e: am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
...
* commit 'f95a963e7313b209ab3da5eeac1bde385bca4355':
Cleaning up some StackView bad behavior
2011-01-21 10:59:20 -08:00
Romain Guy
d0417fa04e
am 8e2d489a: am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb
...
* commit '8e2d489a868d52a979eed91a13a7605630ac997c':
Add support for drawBitmapMesh().
2011-01-21 10:59:07 -08:00
Jim Miller
252d95086a
am be71a923: am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb
...
* commit 'be71a923b084accde4c2b3ff74b2454bc6894eb6':
Fix 3374446: Allow multiple shift keys in Keyboard.
2011-01-21 10:58:58 -08:00
Adam Powell
57cb1b8f4f
am b6b47116: am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
...
* commit 'b6b4711648d83cccebe52142c4efefaa67f4dc65':
SearchView API Review - bug 3370353 and bug 3370338
2011-01-21 10:58:45 -08:00
Scott Main
d368a35c44
am 535ad65e: am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
...
* commit '535ad65e543d724d177fb8e8175e120d571d804b':
cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
2011-01-21 10:58:30 -08:00
Scott Main
aa99dc6543
am 244c10b0: am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was n
...
* commit '244c10b0d879d9373a1ad4b80ae71d5a35c762ba':
cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
2011-01-21 10:58:22 -08:00
Robert Ly
dab49a65fa
am 16c0a0f6: am edc2aac7: cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
...
* commit '16c0a0f638b845ce4f24b6124154a00707676819':
cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
2011-01-21 10:58:13 -08:00
Stephen Hines
ee2399273b
am 536f525d: am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
...
* commit '536f525ddb96cf751eccbd787189f34738e21a05':
Properly use Long2 for "UInt2" for FieldPacker.
2011-01-21 10:56:57 -08:00
Scott Main
91d94ea513
am 0cf6d22a: am 924e3528: Merge "docs: add getting started doc and version notes for HC preview" into honeycomb
...
* commit '0cf6d22a679aecf2d4dc589eaa7ba1e0635edfe0':
docs: add getting started doc and version notes for HC preview
2011-01-21 10:56:36 -08:00
Andreas Huber
701dc75442
am ec0c94b7: am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
...
* commit 'ec0c94b7d70c1e4160e1ec57070b94d052de7eb5':
Implement missing pause/resume support for NuPlayer.
2011-01-21 10:48:25 -08:00
Scott Main
d7bfa435f5
am 437bf22d: am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
...
* commit '437bf22d0f177eea06a0ab8fe9e51ebe5f9bef11':
docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
2011-01-21 10:48:16 -08:00
Dianne Hackborn
91478bbb00
am d79b8b17: am 27044f1d: Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
...
* commit 'd79b8b173c39d7a556c6c49b42c11f7c0f56172b':
Fix issue #3352125 : Crash after clearing search query
2011-01-21 10:48:03 -08:00
Glenn Kasten
0bda68b375
Merge "Bug 3361124 Remove drmioserver"
2011-01-21 07:49:19 -08:00
Ken Wakasa
6ddec8be1c
am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb
...
* commit 'ccbdf5e838eb44a1920c2c02fcf4190880a3c540':
Update class doc for InputMethodSubtype
2011-01-20 23:09:34 -08:00
Ken Wakasa
ccbdf5e838
Merge "Update class doc for InputMethodSubtype" into honeycomb
2011-01-20 23:07:53 -08:00
Ken Wakasa
e31e942455
Update class doc for InputMethodSubtype
...
bug: 3370290
Change-Id: Ib86f81c1a5f6c9acca34b586d810c6e94db1b552
2011-01-21 15:57:37 +09:00
Brad Fitzpatrick
ca87f0e832
am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb
...
* commit '6828656220f4ed5ae803e4c11fb75fb56bc3ea25':
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
2011-01-20 22:26:50 -08:00
Brad Fitzpatrick
6828656220
Merge "StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties" into honeycomb
2011-01-20 22:24:18 -08:00
satok
d57c1fcf5a
am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
...
* commit '0e5bf5051b02bc382fb7e6c975511af499b31624':
Show ime switch icon when there is a hard keyboard
2011-01-20 21:44:59 -08:00
Adam Cohen
f95a963e73
am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
...
* commit 'cdd5626da62cb2dc013cded470e264232617f635':
Cleaning up some StackView bad behavior
2011-01-20 21:42:45 -08:00
Romain Guy
8e2d489a86
am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb
...
* commit '99d49118b857df4051a864b35254e275bc8a68b6':
Add support for drawBitmapMesh().
2011-01-20 21:42:40 -08:00
Jim Miller
be71a923b0
am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb
...
* commit '055e56ee1bf62d9dc97ba3b483c79312e2bb2beb':
Fix 3374446: Allow multiple shift keys in Keyboard.
2011-01-20 21:42:36 -08:00
Adam Powell
b6b4711648
am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
...
* commit '9a161b0981ad41169d006186979b7648a2acfd56':
SearchView API Review - bug 3370353 and bug 3370338
2011-01-20 21:42:31 -08:00
Scott Main
535ad65e54
am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
...
* commit '0f8056321f4d4552fb96a671c3cd194814ad0d4e':
cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
2011-01-20 21:42:23 -08:00
Scott Main
244c10b0d8
am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at
...
* commit '77d6fcff7b97b53d7bf15557e117d32b95c21f63':
cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
2011-01-20 21:42:18 -08:00
Robert Ly
16c0a0f638
am edc2aac7: cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
...
* commit 'edc2aac7bf75ce0fb17ab9f83cb2d02d825f829f':
cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
2011-01-20 21:42:13 -08:00
satok
0e5bf5051b
Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
2011-01-20 19:47:43 -08:00
Adam Cohen
cdd5626da6
Merge "Cleaning up some StackView bad behavior" into honeycomb
2011-01-20 19:42:23 -08:00
satok
865b97761c
Show ime switch icon when there is a hard keyboard
...
Change-Id: Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0
2011-01-21 12:28:01 +09:00
Romain Guy
99d49118b8
Merge "Add support for drawBitmapMesh()." into honeycomb
2011-01-20 19:07:28 -08:00
Romain Guy
5a7b466a2b
Add support for drawBitmapMesh().
...
Change-Id: Ic77f9c534bb90dc7b9458299544bd50b8b6ae6a5
2011-01-20 19:09:30 -08:00
Jim Miller
055e56ee1b
Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb
2011-01-20 18:51:12 -08:00
Adam Powell
9a161b0981
Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
2011-01-20 18:44:32 -08:00
Scott Main
0f8056321f
cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51
...
docs: add OEM USB Drivers document
and update install guide with windows 7 procedures
misc style edits
Change-Id: Icadbfc1136463a75039f87e7c0cbc79d29afbd84
2011-01-20 18:37:41 -08:00
Scott Main
77d6fcff7b
cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175
...
docs: update supports-screens doc with xlargescreens attribute...
we updated the Supporting Multiple Screens document with this attribute
for gingerbread, but this document was not updated at that time.
Change-Id: I946e7eb8b93cee1a7223d400c882f415d6045815
2011-01-20 18:33:51 -08:00
Stephen Hines
536f525ddb
am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
...
* commit '47171a7b65d841ed27940bb961f7934770c69440':
Properly use Long2 for "UInt2" for FieldPacker.
2011-01-20 18:31:39 -08:00
Scott Main
0cf6d22a67
am 924e3528: Merge "docs: add getting started doc and version notes for HC preview" into honeycomb
...
* commit '924e352875849acc30ff87355e80b96a20e78eca':
docs: add getting started doc and version notes for HC preview
2011-01-20 18:31:22 -08:00
Robert Ly
edc2aac7bf
cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4
...
Doc change: Updating ndk/sdk/tools overview pages for hc preview
Change-Id: I7e5feecc645be48e92d1f4a6d80f86ddb98e48b9
2011-01-20 18:30:42 -08:00
Adam Powell
01f2135465
SearchView API Review - bug 3370353 and bug 3370338
...
Renaming as per API council review
Change-Id: Id889be5a708fdc295ee50bb1b05014b2ff72122c
2011-01-20 18:30:10 -08:00
Stephen Hines
47171a7b65
Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
2011-01-20 18:27:43 -08:00
Scott Main
924e352875
Merge "docs: add getting started doc and version notes for HC preview" into honeycomb
2011-01-20 18:27:41 -08:00
Scott Main
7fb538cc77
docs: add getting started doc and version notes for HC preview
...
Change-Id: Ia969c54a9b57197fb0f8814cc1898e50c02608e0
2011-01-20 18:26:43 -08:00
Jim Miller
6465f77537
Fix 3374446: Allow multiple shift keys in Keyboard.
...
This fixes a bug introduced in 3c6dd8f9 because we now
have two shift keys. The code now tracks a global state
and looks for up to two shift keys.
Update after review and added code to handle extra
invalidate required by additional shift key.
Change-Id: Ic1728dd0ceec089089cd1beca1b0b30565d6e658
2011-01-20 18:20:12 -08:00
Stephen Hines
e9f5c1894b
Properly use Long2 for "UInt2" for FieldPacker.
...
We were misusing this API, since it requires the additional precision of
the next size up on unsigned versions of types.
Change-Id: Ic3c87f681ac6705ae0b36a3464ce0d63737945fd
2011-01-20 18:17:25 -08:00
Adam Cohen
ef17dd497e
Cleaning up some StackView bad behavior
...
-> Issue: 3363564, 3320865
Change-Id: I32215478006a689f543532af4ce2267ccbb7fa56
2011-01-20 17:36:27 -08:00
Brad Fitzpatrick
9e9d886b27
am 7204528e: am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb
...
* commit '7204528e71145e34bedd6cfb13110eb872d8a968':
Fixes for StrictMode instance count checking.
2011-01-20 17:26:29 -08:00
Dianne Hackborn
4789b873a6
am 8a545b9e: am e69e0fde: Merge "Fix issue #3374356 : Buttons sometimes don\'t highlight" into honeycomb
...
* commit '8a545b9e3f67fedcb18f3ab9de00e8003a7fcd51':
Fix issue #3374356 : Buttons sometimes don't highlight
2011-01-20 17:26:21 -08:00