Joe Onorato
8b16ebd0e8
am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit 'b940659f415d536966f1bb8af4d5281efa3a7f7a':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:45:42 -08:00
Joe Onorato
b940659f41
am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:43:17 -08:00
Joe Onorato
94eb3d0f7e
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
2011-01-28 13:40:28 -08:00
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
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
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
Vasu Nori
ce3b35a7b0
Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
2011-01-27 12:46:00 -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
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
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
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
437ff39c74
resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp
...
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
2011-01-25 18:00:41 -06:00
Dianne Hackborn
1a904dedbb
am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
...
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
New extra for GET_CONTENT.
2011-01-25 15:19:17 -08:00
Dianne Hackborn
c4d0e6fcea
New extra for GET_CONTENT.
...
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
2011-01-25 15:16:55 -08:00
Jeff Hamilton
eb645a15b9
am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
...
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Jeff Hamilton
d88e9aa575
Use classnames instead of ints for NFC techs.
...
This makes the system more flexible and allows
adding new technology types without having to
update the API.
Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
2011-01-25 16:32:26 -06:00
Vasu Nori
4d724546e4
Merge "add extra prams to intent to start Download App in sort-by-size mode"
2011-01-25 12:50:27 -08:00
Vasu Nori
e5f92249f1
add extra prams to intent to start Download App in sort-by-size mode
...
Change-Id: Icedf50477681bc79582517500748b9a916121903
2011-01-25 11:49:30 -08:00
Nick Pelly
cf1f20e701
am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
...
* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
Add operands to mifare classic increment, decrement.
2011-01-25 10:30:11 -08:00
Nick Pelly
fd06cc10ac
resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
...
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
866264fa26
am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
...
* commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a':
Make MifareClassic methods more consistent.
2011-01-25 10:22:41 -08:00
Nick Pelly
bdd265ba5f
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
...
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00