2877 Commits

Author SHA1 Message Date
Dianne Hackborn
e579b34752 am 6a11185b: am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb
* commit '6a11185b9293151cb3c12c296cf989ea0e7cb898':
  Fix issue #3398767: Need translucent holo theme
2011-01-27 22:50:45 -08:00
Dianne Hackborn
6a11185b92 am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
  Fix issue #3398767: Need translucent holo theme
2011-01-27 22:48:32 -08:00
Dianne Hackborn
c8c3021ac3 Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb 2011-01-27 22:46:44 -08:00
Joe Onorato
857fd9b856 Plumb whether an input view is actually visible or not through from the IME
to the status bar.

Bug: 3391067
Change-Id: I049531155bf7ee0b29874916c0b5b0a45b73c09e
2011-01-27 21:19:46 -08:00
Nick Pelly
2478e617c4 resolved conflicts for merge of b7d6ffd7 to honeycomb-merge
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
2011-01-27 18:35:19 -08:00
Nick Pelly
0cad3d23d3 resolved conflicts for merge of a701cf85 to honeycomb-merge
Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070
2011-01-27 16:59:02 -08:00
Nick Pelly
34afc2cd83 am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
  API: Make close() throw an IOException.
2011-01-27 16:26:28 -08:00
Mike Lockwood
dd8b64c0a5 Merge "Add support for synchronous bulk USB transfers" 2011-01-27 16:25:26 -08:00
Ashish Sharma
89316a2f2a Merge "TrafficStats: Include UDP stats and packet count to API" 2011-01-27 16:22:50 -08:00
Mike Lockwood
1fce24b241 Add support for synchronous bulk USB transfers
Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-27 16:22:15 -08:00
Nick Pelly
3fcedf7728 API: Make close() throw an IOException.
IOException on close() can be useful to indicate that in-progress transactions
were canceled.

I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.

Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
2011-01-27 16:17:14 -08:00
Ashish Sharma
c39c1d4dee TrafficStats: Include UDP stats and packet count to API
Change-Id: I70063e6033d3c181bcc5b9e401f9474900e25281
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-01-27 15:52:38 -08:00
Dianne Hackborn
e79b55482e Fix issue #3398767: Need translucent holo theme
Change-Id: I2ce87798ff58315cb96968ab06e5a52da9f35ef8
2011-01-27 15:18:46 -08:00
Vasu Nori
2d73dcbbc5 am 242fa0eb: am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
* commit '242fa0eb73d555eb025c39cf212030f00cb53cb4':
  bug:3398527 return List insttead of ArrayList from public API
2011-01-27 15:11:44 -08:00
Vasu Nori
242fa0eb73 am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
* commit 'ce3b35a7b0b80061692d9fa1977cee68b365728c':
  bug:3398527 return List insttead of ArrayList from public API
2011-01-27 15:00:38 -08:00
Nick Pelly
55e124c448 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
2011-01-27 13:25:52 -08:00
Vasu Nori
ce3b35a7b0 Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb 2011-01-27 12:46:00 -08:00
Nick Pelly
4a5e253220 Clean up MifareUltralight API.
o Some javadoc updates
o writeBlock -> writePages  (Block means something else in NFC Forum).
o validate page offset

Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
2011-01-27 12:22:56 -08:00
Vasu Nori
a017edace7 bug:3398527 return List insttead of ArrayList from public API
Change-Id: Idbdcb59fe860a9168c9ef6c00eb128b05fce84ff
2011-01-27 11:47:28 -08:00
Jeff Hamilton
fb69e0c0ff resolved conflicts for merge of 0716ea14 to honeycomb-merge
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
2011-01-27 12:29:27 -06:00
Jeff Hamilton
5e2113ff27 resolved conflicts for merge of 3a223404 to honeycomb-merge
Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c
2011-01-27 11:27:58 -06:00
Chet Haase
82782446cd am fcf51a67: am a45c056e: Merge "Fix display List bugs" into honeycomb
* commit 'fcf51a67967a402bf2178c3d0e09828e8942cade':
  Fix display List bugs
2011-01-26 23:55:50 -08:00
Chet Haase
fcf51a6796 am a45c056e: Merge "Fix display List bugs" into honeycomb
* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
  Fix display List bugs
2011-01-26 23:51:58 -08:00
Chet Haase
678e0adbdb Fix display List bugs
Various property setters in View need to invalidate the parent's
cache to get redrawn properly when accelerated with display lists.

Also, fix logic around display lists and old-style Animations in
ViewGroup.

Change-Id: I70e1c2fa49e62228ee4a1301a006ce50bda4c305
2011-01-26 22:44:52 -08:00
Jeff Hamilton
7ef536ad2e resolved conflicts for merge of 52d3203e to honeycomb-merge
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
2011-01-26 23:26:16 -06:00
Kenny Root
d01d1dd7d5 am 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
* commit '1f8e2f99585040b3904f1b6863000d9d208eda02':
  Add API for preferred Launcher icon size and density
2011-01-26 21:19:59 -08:00
Kenny Root
1f8e2f9958 am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
  Add API for preferred Launcher icon size and density
2011-01-26 21:15:28 -08:00
Kenny Root
5ef44b7566 Add API for preferred Launcher icon size and density
Applications that create an icon for launcher to use couldn't determine
which size or density the icon should be created.

Bug: 3224340
Change-Id: Iee96113a4092696a9bd18eecbd2593b38f952a16
2011-01-26 19:43:27 -08:00
Winson Chung
dd071fea23 am 38fe6ff4: am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
* commit '38fe6ff45a6cbc328d1b92c9b9d79c65c3fb29ae':
  Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:35:21 -08:00
Winson Chung
38fe6ff45a am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
* commit '2c070bae4493cd1976c5086ec4cbf6ce10482742':
  Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:32:50 -08:00
Winson Chung
2c070bae44 Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb 2011-01-26 12:30:26 -08:00
Winson Chung
16c8d8a558 Re-enabling queued unbinding of services after requests to the service. (3394210)
- Fix for crash when detaching from window
- Potential fix for occasional IllegalStateException when updating List based widgets

Change-Id: I3d3f2bb691552a1136111043db686c4926b510c6
2011-01-26 12:09:27 -08:00
Joe Onorato
b648c60854 am a4a5ec5e: am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
* commit 'a4a5ec5e748f99c40301c9c422b3d36cb44c6081':
  Expose the window flags for lights out mode.
  Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
  Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:50:38 -08:00
Joe Onorato
a4a5ec5e74 am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
* commit '1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
  Expose the window flags for lights out mode.
  Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
  Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:48:48 -08:00
Joe Onorato
14782f705e Expose the window flags for lights out mode.
I hadn't wanted to do this, but it makes porting the FLAG_FULLSCREEN
stuff over to this simpler because you don't have to go find a view
to proxy through.

This change also clears the flag everywhere when the window manager
notifies the views that the change has come back.

Change-Id: I48392c7550925bcca50c5bb9e1f263e99de6c7bc
2011-01-26 10:47:39 -08:00
Jeff Hamilton
71208ce454 resolved conflicts for merge of ca36d863 to honeycomb-merge
Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835
2011-01-26 11:27:51 -06:00
Dianne Hackborn
0793749661 am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
* commit 'b8fc8c26cba829225469a65bf8e35b06de54588e':
  Change AsyncTask.execute() back to using a thread pool...
2011-01-25 22:09:50 -08:00
Dianne Hackborn
b8fc8c26cb am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
* commit '4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
  Change AsyncTask.execute() back to using a thread pool...
2011-01-25 22:08:16 -08:00
Dianne Hackborn
4fbca2b613 Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 2011-01-25 22:05:38 -08:00
Dianne Hackborn
96438cd658 Change AsyncTask.execute() back to using a thread pool...
...for now.

Change-Id: I1fe64f3e3a575f85add11dfe4d405f0c3a4a49de
2011-01-25 21:42:37 -08:00
Adam Cohen
27d209f94a am 7975d8c0: am 0f16477b: Merge "Cleaning up StackView" into honeycomb
* commit '7975d8c0fec80cb39365cf5cbad4223c5847384f':
  Cleaning up StackView
2011-01-25 20:23:22 -08:00
Adam Cohen
7975d8c0fe am 0f16477b: Merge "Cleaning up StackView" into honeycomb
* commit '0f16477b2d2432a294801a12ac513cd41b00d03c':
  Cleaning up StackView
2011-01-25 20:20:45 -08:00
Adam Cohen
0f16477b2d Merge "Cleaning up StackView" into honeycomb 2011-01-25 20:19:17 -08:00
Adam Cohen
78db1aa911 Cleaning up StackView
Change-Id: I38cd8a5f2d25973d3f97551be0a873ca35044ed9
2011-01-25 17:09:34 -08:00
Jeff Hamilton
505be50d32 am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.
2011-01-25 16:21:28 -08:00
Dianne Hackborn
7f13e47620 am 1a904ded: am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
* commit '1a904dedbb5a15b3e60cac0fab83a3734701aff6':
  New extra for GET_CONTENT.
2011-01-25 16:19:48 -08:00
Jeff Hamilton
f0b7977f68 am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
  Fix the build, proper current.xml.
2011-01-25 16:15:58 -08:00
Nick Pelly
30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
2011-01-25 16:13:17 -08:00
Jeff Hamilton
978afba57c Fix the build, proper current.xml.
Change-Id: I9b02206042c74fd5c329fe2b70ed2b6b91d41382
2011-01-25 18:10:58 -06:00
Jeff Hamilton
437ff39c74 resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
2011-01-25 18:00:41 -06:00