OSDN Git Service
Dianne Hackborn [Fri, 20 May 2011 21:32:35 +0000 (14:32 -0700)]
am
1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
* commit '
1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Dianne Hackborn [Fri, 20 May 2011 21:28:43 +0000 (14:28 -0700)]
Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
Robert Greenwalt [Fri, 20 May 2011 21:25:29 +0000 (14:25 -0700)]
Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE
Jim Miller [Fri, 20 May 2011 20:16:47 +0000 (13:16 -0700)]
am
14e45f9b: Merge "Fix
4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
* commit '
14e45f9b19a846af074d73b3792e35de0448ac21':
Fix
4462497: Move layouts from xlarge to large to enable 7" tablets
Jim Miller [Fri, 20 May 2011 20:16:43 +0000 (13:16 -0700)]
am
5e731140: Merge "Fix
4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
* commit '
5e731140f38e06c42885fa300efc30da00711c76':
Fix
4462474: Fixes crash on 7" tablet due to using wrong resource
Jim Miller [Fri, 20 May 2011 20:13:19 +0000 (13:13 -0700)]
Merge "Fix
4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
Jim Miller [Fri, 20 May 2011 20:12:57 +0000 (13:12 -0700)]
Merge "Fix
4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
Adam Powell [Fri, 20 May 2011 20:04:11 +0000 (13:04 -0700)]
am
73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
* commit '
73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
New opaque cab assets; search dialog tweaks.
Adam Powell [Fri, 20 May 2011 19:59:43 +0000 (12:59 -0700)]
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
Dianne Hackborn [Fri, 20 May 2011 17:37:34 +0000 (10:37 -0700)]
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
Robert Greenwalt [Fri, 20 May 2011 19:23:41 +0000 (12:23 -0700)]
Simplfy getActive* calls in ConnectivityService
One had been simplified on GB, but somehow it didn't make it here.
bug:
4463770
Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
Gloria Wang [Fri, 20 May 2011 17:57:51 +0000 (10:57 -0700)]
am
a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug
4392094.
* commit '
a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug
4392094.
Gloria Wang [Fri, 20 May 2011 17:15:21 +0000 (10:15 -0700)]
Use pread() to get the decrypted data for container based DRM file.
For bug
4392094.
Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
satok [Fri, 20 May 2011 13:41:03 +0000 (06:41 -0700)]
am
b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
* commit '
b4788fdbfdda97bd9cfd0e483276934114d9c438':
Do not merge. Backport two fixes for InputMethethodFramework
satok [Fri, 20 May 2011 09:19:53 +0000 (18:19 +0900)]
Do not merge. Backport two fixes for InputMethethodFramework
Bug:
3420384
backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942
Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
Dianne Hackborn [Fri, 20 May 2011 02:30:32 +0000 (19:30 -0700)]
am
69cb8757: Add new "-swNNNdp" resource qualifier.
* commit '
69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.
Adam Powell [Fri, 20 May 2011 01:46:47 +0000 (18:46 -0700)]
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
Dianne Hackborn [Fri, 20 May 2011 01:13:32 +0000 (18:13 -0700)]
Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
Jim Miller [Fri, 20 May 2011 00:11:08 +0000 (17:11 -0700)]
Fix
4462474: Fixes crash on 7" tablet due to using wrong resource
Change-Id: Id182bc6e9e69a308329412a91929a65af1329beb
Adam Powell [Fri, 20 May 2011 00:06:09 +0000 (17:06 -0700)]
am
b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
* commit '
b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
DO NOT MERGE Action bar config changes
Jim Miller [Fri, 20 May 2011 00:05:30 +0000 (17:05 -0700)]
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
Adam Powell [Thu, 19 May 2011 22:48:38 +0000 (15:48 -0700)]
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 22:02:50 +0000 (15:02 -0700)]
DO NOT MERGE Action bar config changes
Handle action bar padding on configuration changes when the app
handles these changes itself.
Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
Irfan Sheriff [Thu, 19 May 2011 21:57:54 +0000 (14:57 -0700)]
am
9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
* commit '
9c9088a54f6dee7a13dcc7a12297137147b01baa':
Move softap config handling to WifiConfigStore
Irfan Sheriff [Thu, 19 May 2011 21:54:25 +0000 (14:54 -0700)]
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
Chet Haase [Thu, 19 May 2011 20:59:06 +0000 (13:59 -0700)]
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
Chet Haase [Thu, 19 May 2011 20:57:03 +0000 (13:57 -0700)]
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
Chet Haase [Tue, 22 Mar 2011 18:35:22 +0000 (11:35 -0700)]
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
Wink Saville [Thu, 19 May 2011 18:25:45 +0000 (11:25 -0700)]
Merge "Reset connection while data state changed." into honeycomb-LTE
Joe Fernandez [Thu, 19 May 2011 17:59:16 +0000 (10:59 -0700)]
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
Joe Fernandez [Thu, 19 May 2011 17:53:04 +0000 (10:53 -0700)]
am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:49:45 +0000 (10:49 -0700)]
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
Mike Lockwood [Thu, 19 May 2011 17:01:53 +0000 (10:01 -0700)]
am
a88b42d5: USB: Add method to access raw USB device descriptors
* commit '
a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
Mike Lockwood [Thu, 19 May 2011 15:52:40 +0000 (11:52 -0400)]
USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adam Powell [Thu, 19 May 2011 02:14:44 +0000 (19:14 -0700)]
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.
Adam Powell [Thu, 19 May 2011 02:13:22 +0000 (19:13 -0700)]
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 02:10:46 +0000 (19:10 -0700)]
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
Xavier Ducrohet [Thu, 19 May 2011 00:43:27 +0000 (17:43 -0700)]
am
b18e700c: am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
b18e700cb9c1d7090904449fc6878b8eae1d4693':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:40:08 +0000 (17:40 -0700)]
am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:36:16 +0000 (17:36 -0700)]
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
James Dong [Wed, 18 May 2011 23:09:58 +0000 (16:09 -0700)]
am
d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
* commit '
d148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
James Dong [Wed, 18 May 2011 23:06:14 +0000 (16:06 -0700)]
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
Wink Saville [Wed, 18 May 2011 22:59:04 +0000 (15:59 -0700)]
Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
Irfan Sheriff [Tue, 10 May 2011 23:26:06 +0000 (16:26 -0700)]
Move softap config handling to WifiConfigStore
Move softap config to flat file and read/write on a seperate handler thread
Bug:
4391796
Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
Robert Greenwalt [Tue, 10 May 2011 22:05:02 +0000 (15:05 -0700)]
Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
Dianne Hackborn [Wed, 18 May 2011 22:12:07 +0000 (15:12 -0700)]
am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.
Dianne Hackborn [Wed, 18 May 2011 22:09:58 +0000 (15:09 -0700)]
Merge "Fix fake display size when rotated." into honeycomb-mr2
Dianne Hackborn [Wed, 18 May 2011 22:07:48 +0000 (15:07 -0700)]
Fix fake display size when rotated.
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
Gloria Wang [Wed, 18 May 2011 16:19:56 +0000 (09:19 -0700)]
am
07e9267d: Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '
07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug
4422428 Squashed commit of the following:
Gloria Wang [Wed, 18 May 2011 16:17:50 +0000 (09:17 -0700)]
Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
Kazuhiro Ondo [Sun, 1 May 2011 01:10:57 +0000 (20:10 -0500)]
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
Wink Saville [Wed, 18 May 2011 03:35:35 +0000 (20:35 -0700)]
Merge "Remove SIM operator name hack" into honeycomb-LTE
Adam Powell [Wed, 18 May 2011 03:25:58 +0000 (20:25 -0700)]
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
Adam Powell [Wed, 18 May 2011 03:24:39 +0000 (20:24 -0700)]
Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 03:20:47 +0000 (20:20 -0700)]
Fix bug
4416126 - orientation change bug with action bar overflow menu
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
Dianne Hackborn [Wed, 18 May 2011 01:40:12 +0000 (18:40 -0700)]
am
a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
* commit '
a429d5df1aa59d817d694b96a07351224cc5d146':
Improve compat mode scaling implementation.
Dianne Hackborn [Wed, 18 May 2011 01:38:37 +0000 (18:38 -0700)]
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 01:32:06 +0000 (18:32 -0700)]
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.
Adam Powell [Wed, 18 May 2011 01:30:08 +0000 (18:30 -0700)]
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
Dianne Hackborn [Wed, 18 May 2011 00:44:51 +0000 (17:44 -0700)]
Improve compat mode scaling implementation.
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range. Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially. Instead, we just apply the inverse scale at the few
points we need to do something the app sees.
Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
Adam Powell [Tue, 17 May 2011 03:32:16 +0000 (20:32 -0700)]
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
Kazuhiro Ondo [Tue, 17 May 2011 23:13:57 +0000 (18:13 -0500)]
Remove SIM operator name hack
Change-Id: I28c6f94dd6c6bab3a3025f67013a39b3ea0fb0a1
Katie McCormick [Wed, 18 May 2011 00:40:38 +0000 (17:40 -0700)]
am
4ef5f4dc: am
566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
* commit '
4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Katie McCormick [Wed, 18 May 2011 00:38:04 +0000 (17:38 -0700)]
am
566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
* commit '
566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Katie McCormick [Tue, 29 Mar 2011 00:08:08 +0000 (17:08 -0700)]
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
Mike Lockwood [Tue, 17 May 2011 23:44:51 +0000 (16:44 -0700)]
am
27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
* commit '
27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
Mike Lockwood [Tue, 17 May 2011 23:42:48 +0000 (16:42 -0700)]
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
John Reck [Tue, 17 May 2011 23:18:11 +0000 (16:18 -0700)]
am
1147bf63: Don\'t use mobile for large uastring
* commit '
1147bf638a791ef403c0cc6654f4decd1b0d67c1':
Don't use mobile for large uastring
Joe Fernandez [Thu, 12 May 2011 17:00:25 +0000 (10:00 -0700)]
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
John Reck [Tue, 17 May 2011 21:38:44 +0000 (14:38 -0700)]
Don't use mobile for large uastring
Bug:
4427114
Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
Mike Lockwood [Tue, 17 May 2011 21:19:37 +0000 (17:19 -0400)]
StorageVolume: Add getStorageId() accessor
This ID is used for MTP as well as per volume querying in the media provider.
Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Fischer [Tue, 17 May 2011 20:27:59 +0000 (13:27 -0700)]
am
da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
da4809455716cf16451ca5db79654370a6a44f17':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 May 2011 20:25:22 +0000 (13:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Mike Lockwood [Tue, 17 May 2011 20:12:32 +0000 (13:12 -0700)]
am
50b27631: Remove some cruft that was left in config.xml by mistake
* commit '
50b27631598d56cf2def58270ddcf1619045dda4':
Remove some cruft that was left in config.xml by mistake
Mike Lockwood [Tue, 17 May 2011 20:08:22 +0000 (16:08 -0400)]
Remove some cruft that was left in config.xml by mistake
This should fix build breakage for products with nosdcard set.
Change-Id: I989f8630015baaf22fa3d597fc3c1c1646ce44ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Fischer [Tue, 17 May 2011 19:19:30 +0000 (12:19 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
Adam Powell [Tue, 17 May 2011 19:18:05 +0000 (12:18 -0700)]
am
f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
* commit '
f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
Adam Powell [Tue, 17 May 2011 19:16:29 +0000 (12:16 -0700)]
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 19:13:13 +0000 (12:13 -0700)]
Prevent cases of bogus action bar measurement.
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
Scott Main [Tue, 17 May 2011 18:22:49 +0000 (11:22 -0700)]
am
a0ecd648: am
dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug:
4395265
* commit '
a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug:
4395265
Scott Main [Tue, 17 May 2011 18:19:01 +0000 (11:19 -0700)]
am
dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug:
4395265
* commit '
dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug:
4395265
Scott Main [Tue, 17 May 2011 17:17:26 +0000 (10:17 -0700)]
docs: simple update to OpenGl doc to update version support
Note, this doc still needs a lot more work; this is a small step
bug:
4395265
Change-Id: Ibe3fd816e88aa2b20ca99859b929164715f67027
Andreas Huber [Tue, 17 May 2011 17:31:58 +0000 (10:31 -0700)]
am
c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit '
c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Andreas Huber [Tue, 17 May 2011 17:29:36 +0000 (10:29 -0700)]
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 16:45:29 +0000 (09:45 -0700)]
am
a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
* commit '
a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
Adam Powell [Tue, 17 May 2011 16:45:26 +0000 (09:45 -0700)]
am
79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit '
79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
Adam Powell [Tue, 17 May 2011 16:41:52 +0000 (09:41 -0700)]
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 16:41:33 +0000 (09:41 -0700)]
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
Dianne Hackborn [Tue, 17 May 2011 04:21:24 +0000 (21:21 -0700)]
am
7916ac65: Add new command line option to change global screen size.
* commit '
7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
Dianne Hackborn [Tue, 17 May 2011 03:45:48 +0000 (20:45 -0700)]
Add new command line option to change global screen size.
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
Xavier Ducrohet [Mon, 16 May 2011 23:29:03 +0000 (16:29 -0700)]
LayoutLib: support the new baseline/margin query API.
Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
Wink Saville [Mon, 16 May 2011 23:28:59 +0000 (16:28 -0700)]
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
Roman Nurik [Mon, 16 May 2011 23:03:31 +0000 (16:03 -0700)]
am
8f3dbe1c: am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 23:01:27 +0000 (16:01 -0700)]
am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 22:58:08 +0000 (15:58 -0700)]
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
Kazuhiro Ondo [Mon, 16 May 2011 22:28:27 +0000 (17:28 -0500)]
No data icon switch seen between LTE to EHRPD Handover
Change-Id: Ifc8e9e8d88b6617d75322f743ae96fd897a45c3b
Wink Saville [Mon, 16 May 2011 22:47:42 +0000 (15:47 -0700)]
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
Kazuhiro Ondo [Wed, 11 May 2011 04:10:37 +0000 (23:10 -0500)]
Fix data attempt while PS is not in-service
mAutoAttachOnCreation flag was incorrectly initialized which was
causing invalid data attempts while PS is not in-service.
Change-Id: Iaf16b70b1997631309a4918a99ac5f3c3ea74d02
Irfan Sheriff [Mon, 16 May 2011 21:06:11 +0000 (14:06 -0700)]
am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
Adam Powell [Mon, 16 May 2011 21:04:31 +0000 (14:04 -0700)]
Turn fading edges back on for ScrollView and HorizontalScrollView.
Change-Id: Iba880fef0083d36d105b387e4184c57a5fd62486