Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,687 Commits 3 Branches 0 Tags
252d95086aa213bb013158d119c0bb622f009d91
Commit Graph

13695 Commits

Author SHA1 Message Date
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
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
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
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
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
Adam Powell
1bc9e6cbb1 am 8bbec794: am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb 
* commit '8bbec794473f802d4d61613f77bc69a582e3fcc0':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
 2011-01-20 17:25:55 -08:00
Christopher Tate
3e09d42b2b am 9424bfa9: am 7fb8b565: Include the local state obj in ACTION_DRAG_STARTED events 
* commit '9424bfa91dd5686187d0e9611c17851dae580f52':
  Include the local state obj in ACTION_DRAG_STARTED events
 2011-01-20 17:25:50 -08:00
Joe Onorato
909ac9edc4 am 2d821b8c: am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb 
* commit '2d821b8cb8a3c11f2cde662d48890e81430b7f8d':
  Don't log the full stack trace when we can't load a resource.
 2011-01-20 17:25:25 -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
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
571f76a24e am cff27e52: am c8219299: Merge "Remove unnecessary code." into honeycomb 
* commit 'cff27e523d68f72012bd908bac1a78cbb5b0a7e9':
  Remove unnecessary code.
 2011-01-20 11:41:18 -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
3aae603e39 am baa647e3: am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 
* commit 'baa647e325a3ba1acaa463b8c3553de6547ff4f5':
  b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
 2011-01-20 11:16:31 -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
f27e6d5d78 am f008667e: am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 
* commit 'f008667e6d6dc62f36b46c35ebe41b7592b3931c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
 2011-01-20 11:06:40 -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
Romain Guy
e23cae2335 am 1eaac21e: am 68c56a51: Merge "Documentation fix." into honeycomb 
* commit '1eaac21e6f4056fd582a7e58fb9a553f37f7820a':
  Documentation fix.
 2011-01-20 11:02:25 -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
Svetoslav Ganov
cedc446684 API REVIEW: android.widget.NumberPicker.OnValueChangedListener 
Change-Id: I1e739553ab6b99b2768e42cf379a0b155dced81a
 2011-01-20 10:41:14 -08:00
Svetoslav Ganov
2cf5f5a103 am 655f6e10: am 19484fac: Merge "Some touches on the NumberPicker UI." into honeycomb 
* commit '655f6e1026f1d6a4db9a4453ee25897fdd5a4006':
  Some touches on the NumberPicker UI.
 2011-01-20 10:12:37 -08:00