Adam Powell
f2004180f8
am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
...
* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
New opaque cab assets; search dialog tweaks.
2011-05-20 13:09:13 -07:00
Adam Powell
f5abccefb1
am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
...
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
New opaque cab assets; search dialog tweaks.
2011-05-20 13:04:11 -07:00
Adam Powell
73a31ec91c
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
2011-05-20 12:59:43 -07:00
Dianne Hackborn
ea2117bdc0
Add ParcelFileDescriptor.fromFd() and .adoptFd().
...
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
2011-05-20 12:48:22 -07:00
satok
33bdc3c999
am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
...
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
Do not merge. Backport two fixes for InputMethethodFramework
2011-05-20 06:51:14 -07:00
satok
d9435bcecc
am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
...
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
Do not merge. Backport two fixes for InputMethethodFramework
2011-05-20 06:41:03 -07:00
satok
b4788fdbfd
Do not merge. Backport two fixes for InputMethethodFramework
...
Bug: 3420384
backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942
Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
2011-05-20 22:11:54 +09:00
Dianne Hackborn
06a8ceacb0
am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
...
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.
2011-05-19 19:34:21 -07:00
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
Dianne Hackborn
69cb87576b
Add new "-swNNNdp" resource qualifier.
...
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -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
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
Adam Powell
b9537db8d9
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
2011-05-19 15:48:38 -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
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
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
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
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
Kenny Root
f2006f3123
Merge "Break apart queries to getInstalled* API" into gingerbread
2011-05-19 10:55:00 -07:00
Mike Lockwood
c1730dcf89
am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors
...
* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors
2011-05-19 10:06:44 -07:00
Mike Lockwood
ae448e2c90
am a88b42d5: USB: Add method to access raw USB device descriptors
...
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
2011-05-19 10:01:53 -07:00
Mike Lockwood
a88b42d569
USB: Add method to access raw USB device descriptors
...
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-19 12:57:41 -04:00
Adam Powell
c8f045b8a4
am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
...
* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
2011-05-18 19:16:31 -07:00
Adam Powell
d466a4631f
am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
...
* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
2011-05-18 19:14:44 -07:00
Adam Powell
67a0a6ab09
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
...
Change-Id: I56a75189ae48f04934882661ce5014549a089769
2011-05-18 19:10:46 -07:00
Robert Greenwalt
c41aefe1d4
am 59b1a4ed: Switch to use netd to add/remove routes.
...
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.
2011-05-18 16:33:16 -07:00
Wink Saville
be2b058ec1
Reset connection while data state changed.
...
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
2011-05-18 15:59:04 -07:00
Jean-Baptiste Queru
111d17ce51
Merge 4b999030
...
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
2011-05-18 15:33:27 -07:00
Robert Greenwalt
59b1a4ede7
Switch to use netd to add/remove routes.
...
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
2011-05-18 15:25:43 -07:00
Jean-Baptiste Queru
4b999030ad
am 6c427617: Merge "support humidity sensor type"
...
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type
2011-05-18 15:20:29 -07:00
Jean-Baptiste Queru
6c427617be
Merge "support humidity sensor type"
2011-05-18 15:00:11 -07:00
Kazuhiro Ondo
b22a9fd9bb
am 01758e81: Linkproperties update via unsol data call state change.
...
* commit '01758e81b3ad89934581885bb2fc7006510ec639':
Linkproperties update via unsol data call state change.
2011-05-18 00:02:31 -07:00
Kazuhiro Ondo
01758e81b3
Linkproperties update via unsol data call state change.
...
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.
Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
2011-05-17 20:53:40 -07:00
Adam Powell
961f8bef18
am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:28:06 -07:00
Adam Powell
98603eed2f
am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '30a76196c8f426b530a80166817d3280acb2b100':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:25:58 -07:00
Adam Powell
5d6c990b7f
Fix bug 4416126 - orientation change bug with action bar overflow menu
...
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Adam Powell
f61c3d077d
am 16c69222: am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '16c692229d6ed3d0df8682884b35252ea72c7c26':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:34:49 -07:00
Adam Powell
16c692229d
am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:32:06 -07:00
Adam Powell
185d9c4dbf
Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
2011-05-17 18:30:08 -07:00
Adam Powell
bd964f9624
Tweak padding and sizing of alert dialog elements to fit better in
...
landscape mode on large screen devices. Integrate new dialog frame
assets that take up less space.
Change-Id: Icd1261063511355844579d6c5c34f32284031f82
2011-05-17 18:25:56 -07:00
Mike Lockwood
53b988ba18
am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:49:40 -07:00
John Reck
c54d3a9872
am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1818b4a99016486d42de1a2ff35c88bb3197cd20':
Don't use mobile for large uastring
2011-05-17 16:49:25 -07:00
Mike Lockwood
5a79cfd751
am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:44:51 -07:00