Dianne Hackborn
c851ea5672
am 69cb8757: Add new "-swNNNdp" resource qualifier.
...
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.
2011-05-19 19:30:32 -07:00
Adam Powell
8abebcde3f
New opaque cab assets; search dialog tweaks.
...
* New opaque assets (now actually opaque!)
* SearchDialog determines theme to use from parent context
* SearchDialog now disallows action modes
Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
2011-05-19 18:48:44 -07:00
Svetoslav Ganov
e219b5452c
Merge "TouchExplorer - refactoring and a couple of bug fixes"
2011-05-19 18:29:45 -07:00
Svetoslav Ganov
91feae3c59
TouchExplorer - refactoring and a couple of bug fixes
...
1. Refactored the code to avoid code duplication.
2. Fixed a bug in removing unused pointers from the event.
3. Fixed a bug that was crashing the explorer.
4. Sending hover exit immediately at the end of touch exploration
gesture rather with a delay.
Change-Id: Ie288cb8090d6fb5e5c715afa6ea5660b17c019e0
2011-05-19 18:29:01 -07:00
Dianne Hackborn
69cb87576b
Add new "-swNNNdp" resource qualifier.
...
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -07:00
Adam Powell
d36263fa3e
am 90177e59: (-s ours) am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
...
* commit '90177e59e5211dd9ab33761ce800e8a86a49d1e2':
DO NOT MERGE Action bar config changes
2011-05-19 17:21:09 -07:00
Adam Powell
90177e59e5
am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
...
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
DO NOT MERGE Action bar config changes
2011-05-19 17:17:30 -07:00
Jim Miller
49b7adfdfb
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
...
Change-Id: Id182bc6e9e69a308329412a91929a65af1329beb
2011-05-19 17:11:08 -07:00
Adam Powell
d40575eb98
am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
...
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
DO NOT MERGE Action bar config changes
2011-05-19 17:06:09 -07:00
Jim Miller
74de8b923a
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
...
This fixes LockScreen on 7" tablets by moving the resources to xlarge.
In addition, it has some minor layout tweaks to center pattern and
wave unlock widgets on both so we can share the layout resources.
Change-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb
2011-05-19 17:05:30 -07:00
Xavier Ducrohet
d9af22e204
Merge 05b7b69c from honeycomb-mr1. do not merge.
...
Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c
LayoutLib: support the new baseline/margin query API.
2011-05-19 16:52:41 -07:00
Xavier Ducrohet
e172a3fc23
Merge 2fae858d from Honeycomb-mr1. do not merge.
...
Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909
LayoutLib: implement data binding for most AdapterView
2011-05-19 16:52:29 -07:00
Chet Haase
44984ea0cb
Enable large font rendering with GPU acceleration
...
Change-Id: I7b022100fb0762613f9cf7753dbb0217e1e75f8d
2011-05-19 16:39:37 -07:00
Mathias Agopian
f74bf9a47d
Merge "Fix a crasher in SensorService"
2011-05-19 16:23:25 -07:00
Mathias Agopian
057f625cd9
Fix a crasher in SensorService
...
SensorService main thread wasn't java-enabled. however, in
some situations we end-up calling into the BatteryService from
that thread which causes a crash.
Change-Id: Iffba90e4c4b743dba84d62f1342001a9db31916d
2011-05-19 16:21:32 -07:00
Romain Guy
71fcc865e3
Merge "Code cleanup."
2011-05-19 16:16:43 -07:00
Romain Guy
88b4f153e2
Code cleanup.
...
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
2011-05-19 16:15:46 -07:00
Adam Powell
b9537db8d9
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
2011-05-19 15:48:38 -07:00
Mathias Agopian
c23774baad
Merge changes Id3a4a573,I7adf4ef0
...
* changes:
eglTerminate() now actually frees up all active egl objects
refactor EGL source code
2011-05-19 15:47:43 -07:00
Adam Powell
dacbb746c9
DO NOT MERGE Action bar config changes
...
Handle action bar padding on configuration changes when the app
handles these changes itself.
Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
2011-05-19 15:38:27 -07:00
John Reck
9414b04178
Merge "expandGroup can now animate"
2011-05-19 15:23:58 -07:00
Irfan Sheriff
e526cfb490
am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
...
* commit '5b9ceebafd36db4491a49c1f00750ce50c4d4433':
Move softap config handling to WifiConfigStore
2011-05-19 15:17:33 -07:00
Chet Haase
ead8b50da6
am 7189d571: (-s ours) am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
...
* commit '7189d571e2748972e1599ead3d503a9b185fdd3c':
DO NOT MERGE: Add custom fragment anims for popping backstack
2011-05-19 15:17:14 -07:00
Kenny Root
a51b6fd6f8
resolved conflicts for merge of b2d0ee16 to master
...
Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
2011-05-19 15:02:18 -07:00
Irfan Sheriff
5b9ceebafd
am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
...
* commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
Move softap config handling to WifiConfigStore
2011-05-19 15:01:48 -07:00
Alex Sakhartchouk
a7f17320f3
Removing unused code
...
Change-Id: I6eee2a6c9b9aa313a6ec16ad7ea28c075d1939a4
2011-05-19 14:58:49 -07:00
Irfan Sheriff
a4815c0ec0
am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
...
* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
Move softap config handling to WifiConfigStore
2011-05-19 14:57:54 -07:00
Irfan Sheriff
9c9088a54f
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
2011-05-19 14:54:25 -07:00
Chet Haase
7189d571e2
am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
...
* commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d':
DO NOT MERGE: Add custom fragment anims for popping backstack
2011-05-19 14:03:04 -07:00
Chet Haase
f0c6ddd99b
am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
...
* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
DO NOT MERGE: Add custom fragment anims for popping backstack
2011-05-19 13:59:06 -07:00
Chet Haase
51fb97031f
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
2011-05-19 13:57:03 -07:00
Chet Haase
19e748a3d1
DO NOT MERGE: Add custom fragment anims for popping backstack
...
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.
The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.
Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
2011-05-19 13:44:40 -07:00
Joe Onorato
dba50c7ed2
Reduce log spew.
...
Change-Id: I69c9d7227d6cb91eac3b9f18d9edaa121c86ad0f
2011-05-19 13:32:25 -07:00
Kenny Root
b2d0ee164a
Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-05-19 12:48:41 -07:00
Kenny Root
e6cd0c747e
resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp
...
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
2011-05-19 12:48:14 -07:00
Jason Sams
3a9e712aca
Merge "Move context and device creation out of the spec file."
2011-05-19 12:27:22 -07:00
James Dong
3c707256cf
Merge "Publish setLocation() method as a public Java API"
2011-05-19 11:51:37 -07:00
Wink Saville
b568b51255
am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit '09ded82b784b9f6e01d4cd4298097fd2b459560b':
Reset connection while data state changed.
2011-05-19 11:32:27 -07:00
Wink Saville
09ded82b78
am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
2011-05-19 11:28:36 -07:00
Wink Saville
ab5baa1d5f
Merge "Reset connection while data state changed." into honeycomb-LTE
2011-05-19 11:25:45 -07:00
Gloria Wang
612956c914
Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059."
2011-05-19 11:15:16 -07:00
Joe Fernandez
36cca79ca7
am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit '0a36cec642fb58e295d0608026890d95d0ae3cc0':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 11:13:41 -07:00
Joe Fernandez
0a36cec642
am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit '605be31c4a80e03dc0af76a73aaa33316ca4a635':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 11:06:04 -07:00
Kenny Root
2433c443bb
am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread
...
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
Break apart queries to getInstalled* API
2011-05-19 11:04:01 -07:00
Joe Fernandez
605be31c4a
am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:59:16 -07:00
Kenny Root
f2006f3123
Merge "Break apart queries to getInstalled* API" into gingerbread
2011-05-19 10:55:00 -07:00
Joe Fernandez
146a0b4522
am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:53:04 -07:00
Mike Lockwood
44bcfcae3b
Merge "resolved conflicts for merge of c1730dcf to master"
2011-05-19 10:52:43 -07:00
Joe Fernandez
fde9ac7266
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
2011-05-19 10:49:45 -07:00
Gloria Wang
f9cf277cda
Add one more MIME type (audio/aac-adts) for aac file.
...
Fix for bug 4463059.
Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
2011-05-19 10:45:45 -07:00