Irfan Sheriff
5cd336e4d9
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
2011-05-19 14:54:25 -07:00
Chet Haase
31808fa85d
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
2011-05-19 13:57:03 -07:00
Joe Fernandez
10f5d9880b
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
Joe Fernandez
5986a9eb56
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
2011-05-19 10:49:45 -07:00
Adam Powell
ff661a6e78
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
2011-05-18 19:13:22 -07:00
Xavier Ducrohet
04a238006c
am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
...
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
2011-05-18 17:40:08 -07:00
Xavier Ducrohet
8b836da477
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
2011-05-18 17:36:16 -07:00
James Dong
502019a5df
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
2011-05-18 16:06:14 -07:00
Dianne Hackborn
9a11c3710a
Merge "Fix fake display size when rotated." into honeycomb-mr2
2011-05-18 15:09:58 -07:00
Gloria Wang
4bee0c6039
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
2011-05-18 09:17:50 -07:00
Adam Powell
57d723dfaf
Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
2011-05-17 20:24:39 -07:00
Dianne Hackborn
0265a6ba75
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -07:00
Adam Powell
39bbfc22a9
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
Katie McCormick
cdb8f8f181
am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:38:04 -07:00
Mike Lockwood
77656e2961
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
2011-05-17 16:42:48 -07:00
Eric Fischer
37ce5ab46d
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -07:00
Adam Powell
d1438416be
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
2011-05-17 12:16:29 -07:00
Scott Main
dfd85f44da
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
2011-05-17 11:19:01 -07:00
Andreas Huber
1e9440dc86
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
2011-05-17 10:29:36 -07:00
Adam Powell
0e85987167
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
2011-05-17 09:41:52 -07:00
Adam Powell
dee13897a2
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
2011-05-17 09:41:33 -07:00
Roman Nurik
908a65b8f8
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.
2011-05-16 16:01:27 -07:00
Roman Nurik
12192dfc47
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
2011-05-16 15:58:08 -07:00
Irfan Sheriff
3b440f7c8b
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
2011-05-16 14:02:39 -07:00
Scott Main
80769efc0a
am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:01:30 -07:00
Dianne Hackborn
b181f7ffa2
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
2011-05-16 13:10:23 -07:00
Dianne Hackborn
9b076812bb
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
2011-05-16 13:01:07 -07:00
Dianne Hackborn
dac5784ab3
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
2011-05-16 12:54:22 -07:00
Mike Lockwood
f3be466e9f
Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
2011-05-16 12:34:35 -07:00
Mike Lockwood
f35699af48
Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
2011-05-16 12:34:02 -07:00
Robert Ly
60aaec5f01
am 904f4810: doc change: added link to diydrones and a few small changes
...
* commit '904f48107e2843a1e255872afac8ddf8e9513ca4':
doc change: added link to diydrones and a few small changes
2011-05-16 12:29:17 -07:00
Dianne Hackborn
658d84fad7
Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
2011-05-16 11:02:29 -07:00
Dirk Dougherty
c1fca8eaf9
am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
...
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
Doc change: typo fix
2011-05-16 11:01:44 -07:00
Scott Main
19d44f26e7
am 5eba0e98: docs: update featured videos and increase the max results for each playlist
...
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
docs: update featured videos and increase the max results for each playlist
2011-05-16 11:01:42 -07:00
Dirk Dougherty
56526b508a
Merge "Doc change: typo fix" into honeycomb-mr1
2011-05-16 10:59:00 -07:00
Scott Main
45d5a051ad
am fc0ea7ea: docs: add oem driver for alcatel
...
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
docs: add oem driver for alcatel
2011-05-16 10:20:59 -07:00
Scott Main
3fce43da30
am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
ebbc478d9b
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
2011-05-13 20:26:56 -07:00
Xavier Ducrohet
0c36d14f6b
am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
Dianne Hackborn
bd2fecd927
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
2011-05-13 16:24:32 -07:00
Dianne Hackborn
a15868e6cb
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
2011-05-13 15:33:21 -07:00
Dianne Hackborn
29a781c814
Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
2011-05-13 11:16:42 -07:00
Scott Main
74c4d84a19
am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 10:56:52 -07:00
Scott Main
9fed145eb4
am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:55:09 -07:00
Scott Main
f87d9feac1
Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
2011-05-13 10:54:00 -07:00
Dianne Hackborn
88c0d696cc
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
...
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
Irfan Sheriff
a51147adb4
Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2
2011-05-12 14:18:03 -07:00
Irfan Sheriff
a4ae316ca4
Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2
2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
4755b0da13
Merge "Fix the Uri parsing issue" into honeycomb-mr2
2011-05-12 14:11:25 -07:00
Robert Ly
6b9a781755
am a45e4f4d: doc change: adding link to pic board
...
* commit 'a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
doc change: adding link to pic board
2011-05-11 09:04:52 -07:00