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
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
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
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
Adam Cohen
ef17dd497e
Cleaning up some StackView bad behavior
...
-> Issue: 3363564, 3320865
Change-Id: I32215478006a689f543532af4ce2267ccbb7fa56
2011-01-20 17:36:27 -08:00
Scott Main
437bf22d0f
am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
...
* commit 'cfaa9c152cf7fbdf13b41876422fdfe9bffa3c2a':
docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
2011-01-20 17:14:55 -08:00
Dianne Hackborn
d79b8b173c
am 27044f1d: Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
...
* commit '27044f1d4c5765388a745527b220a3a574c4f834':
Fix issue #3352125 : Crash after clearing search query
2011-01-20 17:14:41 -08:00
Brad Fitzpatrick
7204528e71
am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb
...
* commit '9358bd39dc8829ef8413294da70d44cd928ca878':
Fixes for StrictMode instance count checking.
2011-01-20 17:07:41 -08:00
Dianne Hackborn
8a545b9e3f
am e69e0fde: Merge "Fix issue #3374356 : Buttons sometimes don\'t highlight" into honeycomb
...
* commit 'e69e0fde6cf0e6302d5a05363a3db7a9c555e9dc':
Fix issue #3374356 : Buttons sometimes don't highlight
2011-01-20 17:07:31 -08:00
Adam Powell
8bbec79447
am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb
...
* commit '9c91c7e27fbfff5abc34e19779a9477239ab9b10':
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
2011-01-20 17:06:35 -08:00
Christopher Tate
9424bfa91d
am 7fb8b565: Include the local state obj in ACTION_DRAG_STARTED events
...
* commit '7fb8b565f9cd2ec6a63ff4d8a89f98f68a1a138c':
Include the local state obj in ACTION_DRAG_STARTED events
2011-01-20 17:05:57 -08:00
Scott Main
cfaa9c152c
Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
2011-01-20 17:04:48 -08:00
Joe Onorato
2d821b8cb8
am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb
...
* commit '913d04aa3b187beffd7691acb1e61a8b09810bbe':
Don't log the full stack trace when we can't load a resource.
2011-01-20 17:04:13 -08:00
Dianne Hackborn
27044f1d4c
Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
2011-01-20 16:57:34 -08:00
Brad Fitzpatrick
c0bb0bb5e3
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
...
Change-Id: I1b2531b66d09c850519af17918aed8be9853ef3b
2011-01-20 16:29:52 -08:00
Brad Fitzpatrick
9358bd39dc
Merge "Fixes for StrictMode instance count checking." into honeycomb
2011-01-20 15:56:47 -08:00
Dianne Hackborn
e69e0fde6c
Merge "Fix issue #3374356 : Buttons sometimes don't highlight" into honeycomb
2011-01-20 15:38:14 -08:00
Dianne Hackborn
be1f62260a
Fix issue #3374356 : Buttons sometimes don't highlight
...
On touch up, View would move itself to the pressed state if it
hadn't already shown as pressed. However, it did this *after*
scheduling the message to deliver the onClick(). Thus if the
app took a little too long to execute inside of onClick(), the
invalidate to draw the highlight state would be executed right
before the following message to remove the highlight state,
causing it to basically not be shown.
This change just does the invalidate before scheduling the
onClick, so we can be sure it gets done first.
Change-Id: I6a4d1742a3aab60969c38b44bb3e163f48de62d4
2011-01-20 15:24:28 -08:00
Brad Fitzpatrick
5f8b5c191c
Fixes for StrictMode instance count checking.
...
Misc stuff found after looking at the first day of data, Jesse's
review, and comments from Dianne about tracking Activity counts
better.
Change-Id: Ifee1ef8f59f41061d4aac8c02765627dbf3cd8e4
2011-01-20 15:12:08 -08:00
Dianne Hackborn
6e1bf6a305
Fix issue #3352125 : Crash after clearing search query
...
Don't deliver data arriving from a Loader after the application
has moved on to a new Loader.
Also throttle the number of Loaders will have actively running
for a particular ID.
Oh, and documentation. Documentation is good.
Change-Id: I5a5cfdbb8c9bfb320ffc014f99e37fe7e3001382
2011-01-20 14:58:40 -08:00
Adam Powell
9c91c7e27f
Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb
2011-01-20 14:39:56 -08:00
Christopher Tate
7fb8b565f9
Include the local state obj in ACTION_DRAG_STARTED events
...
Fixes bug 3362502
The underlying cause was that the DragEvent.obtain() variant which
clones an existing event was failing to copy the local state field.
This change also moves the logic for inserting the local state object
into DragEvents about to be dispatched from the Binder incall thread
into the main-thread code sequence. This is to eliminate any potential
SMP memory coherency issues around drag start vs incoming events
needing to refer to the local state object.
Change-Id: I368e8936dbf8a00b7d5cc19c2ef0101bd75b6b2d
2011-01-20 13:53:17 -08:00
Adam Powell
1264c33163
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
...
Fix bug 3362453 - API REVIEW: android.app.ActionBar
Change-Id: I4e0233cd9355a47682bfe7b4a7fda39801586f1a
2011-01-20 13:25:08 -08:00
Joe Onorato
913d04aa3b
Merge "Don't log the full stack trace when we can't load a resource." into honeycomb
2011-01-20 12:33:34 -08:00
Joe Onorato
08f1654417
Don't log the full stack trace when we can't load a resource.
...
Bug: 3369315
Change-Id: I3a586bbefccbd59a0e99d712efe9a1cd3da6d058
2011-01-20 11:50:12 -08:00
Romain Guy
cff27e523d
am c8219299: Merge "Remove unnecessary code." into honeycomb
...
* commit 'c8219299b0003793cee8049b96a3bf7530765eea':
Remove unnecessary code.
2011-01-20 11:39:18 -08:00
Romain Guy
c8219299b0
Merge "Remove unnecessary code." into honeycomb
2011-01-20 11:37:22 -08:00
Romain Guy
ff26a0c1c9
Remove unnecessary code.
...
Change-Id: I83eba3406c26a4028af08b4d4c95ecd02803e75a
2011-01-20 11:39:09 -08:00
Huahui Wu
baa647e325
am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb
...
* commit '292f39c1201f2f08ac90d5562a7fd7070e9b32a0':
b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
2011-01-20 11:13:36 -08:00
Huahui Wu
292f39c120
Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb
2011-01-20 11:08:33 -08:00
Svetoslav Ganov
f008667e6d
am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
...
* commit '1ec1fdfce959069f3092c15d27efc1c2286dc15c':
API REVIEW: android.widget.NumberPicker.OnValueChangedListener
2011-01-20 11:04:27 -08:00
Svetoslav Ganov
1ec1fdfce9
Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
2011-01-20 11:02:14 -08:00
Romain Guy
1eaac21e6f
am 68c56a51: Merge "Documentation fix." into honeycomb
...
* commit '68c56a51b32b5f5322c4f0f7dbba918712ad6473':
Documentation fix.
2011-01-20 11:00:19 -08:00
Romain Guy
482b34a6f8
Documentation fix.
...
Activity's documentation wasn't clear on what would happen when
calling setContentView(View).
Change-Id: I37be6565ba897694460c80a39562346293faa8ea
2011-01-20 10:59:28 -08:00
Romain Guy
68c56a51b3
Merge "Documentation fix." into honeycomb
2011-01-20 10:57:59 -08:00