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

1489 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Brad Fitzpatrick
7adf848183 am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit 'b4f655d5912869078cb7be29d108ebfea06019fc':
  StrictMode class instance limit interface.
 2011-01-18 13:13:07 -08:00
Brad Fitzpatrick
758035757f StrictMode class instance limit interface. 
Change-Id: Ic5eea539586e5d4965d83364bf9f623d1d89f2b1
 2011-01-18 11:38:37 -08:00
Jeff Hamilton
97ac293507 am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread 
* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
  Javadoc updates for NFC.
 2011-01-18 11:26:39 -08:00
Jeff Hamilton
0716ea144d Merge "Javadoc updates for NFC." into gingerbread 2011-01-18 11:01:55 -08:00
Jeff Hamilton
ce3224cda5 Javadoc updates for NFC. 
Change-Id: Ibd91829979576297599fbcc9eb8054924af1d527
 2011-01-18 10:57:30 -08:00
Dianne Hackborn
ad81f4ffb8 am f4c4b666: Merge "Remove old APIs." into honeycomb 
* commit 'f4c4b666234d0e5c510c846b13382b77175f10e1':
  Remove old APIs.
 2011-01-18 07:34:09 -08:00
Dianne Hackborn
2d6dae2f4d am 80ad0b0a: Merge "Fix a bunch of API review bugs." into honeycomb 
* commit '80ad0b0aeb5a55d2e62aaaf18863253501b87b60':
  Fix a bunch of API review bugs.
 2011-01-17 20:00:20 -08:00
Dianne Hackborn
17b9b81418 Remove old APIs. 
Change-Id: If676e4e7886ad71c4959d4253db99639b49218b8
 2011-01-17 17:16:02 -08:00
Dianne Hackborn
327fbd2c8f Fix a bunch of API review bugs. 
3362464 API REVIEW: android.content potpourri
3362445 API REVIEW: Fragment transaction stuff
3362428 API REVIEW: Fragment stuff
3362418 API REVIEW: Loader stuff
3362414 API REVIEW: android.content.pm.ActivityInfo

Change-Id: I6475421a4735759b458acb67df4380cc6234f147
 2011-01-17 16:23:42 -08:00
Vasu Nori
58f765a45e am 376fedf6: Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb 
* commit '376fedf6595188ad714022b5d1ab012dc8689c3e':
  bug:3362635 add new public API to downloadmanager to get mxbytesovermobile
 2011-01-17 15:36:45 -08:00
Vasu Nori
376fedf659 Merge "bug:3362635 add new public API to downloadmanager to get mxbytesovermobile" into honeycomb 2011-01-17 15:34:06 -08:00
Vasu Nori
0abbf809bf bug:3362635 add new public API to downloadmanager to get mxbytesovermobile 
bug:3362635
Change-Id: I7380964c6098d5ca6396b17980f78457c23d1a87
 2011-01-17 15:14:53 -08:00
Scott Main
36578e308c am 662cc7a4: add javadoc for getView method 
* commit '662cc7a46a44af782a1f697d16b0613498312e1f':
  add javadoc for getView method
 2011-01-17 15:09:43 -08:00
Scott Main
662cc7a46a add javadoc for getView method 
Change-Id: Ia8d9516c4017319f8bcaedb3e4c451c5c3825857
 2011-01-17 15:02:07 -08:00
Kenny Root
a33dd09b5c am d6c54d97: Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb 
* commit 'd6c54d97867edd566700c535f3edf57dd4396350':
  Revert "Add the {get,set}PackageObbPaths calls to API"
 2011-01-17 13:05:22 -08:00
Kenny Root
d6c54d9786 Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb 2011-01-17 13:02:48 -08:00
Kenny Root
a1cbb94dbc Revert "Add the {get,set}PackageObbPaths calls to API" 
This reverts commit 5d40fe9c68.

Change-Id: Ie41010c92fb860b19a12bcf63f6fe95ffa68da81
 2011-01-17 13:00:47 -08:00
Andy Stadler
d9bc2b5e9e am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb 
* commit '2c12c708bfb62464e75dcde292547b2d778dafce':
  Add internal plumbing to DPM for encryption
 2011-01-17 12:54:17 -08:00
Andy Stadler
22dbfda976 Add internal plumbing to DPM for encryption 
* Add code to persist per-admin setting
* Add hooks for OS-level tie-in (is supported, get / set status)
* Add 3rd API call to get OS status (irrespective of admin settings)
* Remove "REQUESTED" status, no longer relevant with 3rd API
* Fixed bug that impacted global proxy settings
* Update api/11.xml to match current.xml

Bug: 3346770
Change-Id: I56bdf9a7894f6ca4842402c7b82ddb3caf4b37b9
 2011-01-17 12:47:31 -08:00
Dianne Hackborn
74871f9c37 am db7f3867: Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb 
* commit 'db7f38673c33ba55801019007ff18fa4c57f75e0':
  Start renaming FragmentTransaction.openTransaction() to beginTransaction().
 2011-01-17 12:35:59 -08:00
Dianne Hackborn
db7f38673c Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb 2011-01-17 12:33:50 -08:00
Dianne Hackborn
48e7b45869 Start renaming FragmentTransaction.openTransaction() to beginTransaction(). 
Change-Id: Ib4a6d824b33cca699b7b25159c491fb610d5f5da
 2011-01-17 12:28:35 -08:00
Kenny Root
e26aa3f78a am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API" 
* commit '34d2b41e48281d1df2c844e004740f008e699093':
  Revert "Add the {get,set}PackageObbPaths calls to API"
 2011-01-17 12:23:43 -08:00