Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,044 Commits 3 Branches 0 Tags
9039fa261da46efb186c8df884c8bb74ae28d7cd
Commit Graph

1518 Commits

Author SHA1 Message Date
Dianne Hackborn
9039fa261d am db4e32fe: am f36af164: Merge "Whoops, actually exclude pre-HC apps." into honeycomb 
* commit 'db4e32fe68a50ea8ba75b434a88c1adeffb6018c':
  Whoops, actually exclude pre-HC apps.
 2011-01-22 13:10:49 -08:00
Dianne Hackborn
db4e32fe68 am f36af164: Merge "Whoops, actually exclude pre-HC apps." into honeycomb 
* commit 'f36af16479e252bec168ed181885ec21d9df46f5':
  Whoops, actually exclude pre-HC apps.
 2011-01-22 13:09:01 -08:00
Dianne Hackborn
f36af16479 Merge "Whoops, actually exclude pre-HC apps." into honeycomb 2011-01-22 13:06:48 -08:00
Dianne Hackborn
842e04b221 Whoops, actually exclude pre-HC apps. 
Change-Id: I7266b3a622ae65f350bdb2a0eb6557b481a14365
 2011-01-22 13:00:12 -08:00
Dianne Hackborn
e3e6a157df am 8a0f1756: am 5503d803: Merge "Fix issue #3377999: Activities need to be stopped when sleeping" into honeycomb 
* commit '8a0f17560080077b972c97bf9d5b68961f148fe3':
  Fix issue #3377999: Activities need to be stopped when sleeping
 2011-01-22 11:54:31 -08:00
Dianne Hackborn
8a0f175600 am 5503d803: Merge "Fix issue #3377999: Activities need to be stopped when sleeping" into honeycomb 
* commit '5503d803ecee63d417128d3849717b59b971fc08':
  Fix issue #3377999: Activities need to be stopped when sleeping
 2011-01-22 11:51:40 -08:00
Dianne Hackborn
5503d803ec Merge "Fix issue #3377999: Activities need to be stopped when sleeping" into honeycomb 2011-01-22 11:38:48 -08:00
Dianne Hackborn
d9e1b56689 am 3da75ab9: am 3a56ce3a: Merge "Fix some error messages, turn off logging." into honeycomb 
* commit '3da75ab90c4e6309ec6d6801bf0208cff6249b2d':
  Fix some error messages, turn off logging.
 2011-01-21 16:49:22 -08:00
Dianne Hackborn
3da75ab90c am 3a56ce3a: Merge "Fix some error messages, turn off logging." into honeycomb 
* commit '3a56ce3ab30a72c359bf64cf75bdce6ab03f2b7a':
  Fix some error messages, turn off logging.
 2011-01-21 16:46:35 -08:00
Dianne Hackborn
ec541e1787 Fix some error messages, turn off logging. 
Change-Id: Ifcd2c0f0ad137485896144d2248361aeb0a05600
 2011-01-21 16:44:04 -08:00
Dianne Hackborn
4eba96bb31 Fix issue #3377999: Activities need to be stopped when sleeping 
This is a band-aid over the existing kludgy stopping mechanism
where the semantics of stop are different in the activity manager
than in the clients.

This change is intended to be as unobtrusive as possible, only
impacting the sleep case.  I have a different change that
completely reworks how we stop activities to simply this all
a lot by unifying the semantics between the server and client.
However, it is too late in HC for such an extensive change.  Later
I'll revert this one and put in the better solution.

Change-Id: Id77f2db1ec83469cdd888acb8fbc4679daa7766e
 2011-01-21 13:42:26 -08:00
Nick Pelly
0967c1cbc5 am 11ce84fc: resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp 
* commit '11ce84fcaadb7051735dd50a35f6e6c234fbe480':
  Javadoc updates for NFC.
 2011-01-21 11:02:35 -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
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
Nick Pelly
11ce84fcaa resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp 
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
 2011-01-21 09:41:40 -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
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
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
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
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
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
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
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
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
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
e23cae2335 am 1eaac21e: am 68c56a51: Merge "Documentation fix." into honeycomb 
* commit '1eaac21e6f4056fd582a7e58fb9a553f37f7820a':
  Documentation fix.
 2011-01-20 11:02:25 -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
Dianne Hackborn
e594d9c8a6 am 1426d6bd: am b26a651b: Merge "Hook up large heap API." into honeycomb 
* commit '1426d6bdd889821fd83e355d54da989ca3370940':
  Hook up large heap API.
 2011-01-19 16:33:31 -08:00
Dianne Hackborn
1426d6bdd8 am b26a651b: Merge "Hook up large heap API." into honeycomb 
* commit 'b26a651b47b5fc90a6685477aff5b76fdd1787f1':
  Hook up large heap API.
 2011-01-19 16:30:53 -08:00
Dianne Hackborn
b26a651b47 Merge "Hook up large heap API." into honeycomb 2011-01-19 16:28:31 -08:00
Dianne Hackborn
de39851592 Hook up large heap API. 
Change-Id: I215644f8de326fe3d4fa582447885b0aa01f72d3
 2011-01-19 16:13:18 -08:00
Joe Onorato
c3eb5c6c3d am 201dd784: am cb109a0e: Add docs for Notification.Builder. 
* commit '201dd784127b5e7e125cc57f2dfbbe16bc12624c':
  Add docs for Notification.Builder.
 2011-01-19 15:36:05 -08:00
Joe Onorato
201dd78412 am cb109a0e: Add docs for Notification.Builder. 
* commit 'cb109a0eeaca12cdd954c567da4fc5f45a23213b':
  Add docs for Notification.Builder.
 2011-01-19 15:34:04 -08:00
Joe Onorato
cb109a0eea Add docs for Notification.Builder. 
Bug: 3362451
Change-Id: I8f16a7f266812190dc8d06751f5ca914e2050111
 2011-01-19 15:29:30 -08:00
Brad Fitzpatrick
28d5206519 am bd80a12c: resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp 
* commit 'bd80a12cba480a0dbb2e9073f35c758d8b396b94':
  StrictMode: class instance limits (track object "leaks")
 2011-01-19 15:24:02 -08:00
Brad Fitzpatrick
bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp 
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
 2011-01-19 15:19:08 -08:00
Brad Fitzpatrick
bfbe577110 StrictMode: class instance limits (track object "leaks") 
Change-Id: I2db5a19060c2013078feb88a91caf655469b2f98
 2011-01-19 14:52:08 -08:00
Dianne Hackborn
7fc5d4b8e7 am 2ec5a716: am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 21:56:45 -08:00
Brad Fitzpatrick
aef99bbc69 am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
  StrictMode class instance limit interface.
 2011-01-18 21:50:45 -08:00
Dianne Hackborn
2ec5a7160b am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 15:32:44 -08:00
Dianne Hackborn
36c84403ec Merge "Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog" into honeycomb 2011-01-18 15:31:21 -08:00
Dianne Hackborn
cfaf8878de Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog 
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
 2011-01-18 15:28:41 -08:00