Commit Graph

31508 Commits

Author SHA1 Message Date
Dianne Hackborn
55f6d6e82b Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 2011-05-25 11:10:15 -07:00
Amith Yamasani
c207d53276 Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 2011-05-25 10:58:24 -07:00
Russell Brenner
e2888ad71b Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
Dianne Hackborn
964ce8d835 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Kristian Monsen
4994521abe Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2 2011-05-24 11:16:39 -07:00
John Reck
79b4767c7b Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 2011-05-24 11:03:11 -07:00
Jeffrey Tinker
e56ab8987a Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Mike Lockwood
e8b9b1ad24 Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 2011-05-23 18:01:50 -07:00
Amith Yamasani
793c8503d7 Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 2011-05-23 17:05:47 -07:00
Mike Lockwood
147079acee Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 2011-05-23 17:04:01 -07:00
John Reck
fe750a4010 Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 2011-05-23 16:47:32 -07:00
Dianne Hackborn
ac3311f484 Merge "Add "television" mode." into honeycomb-mr2 2011-05-23 15:18:20 -07:00
Dianne Hackborn
a6b34ef26a Add "television" mode.
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
2011-05-23 15:11:08 -07:00
Jim Miller
643ad1de51 Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 2011-05-20 16:49:08 -07:00
Adam Powell
a7a8ea1f6f Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 2011-05-20 15:59:19 -07:00
Dianne Hackborn
cbc706222f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Jim Miller
43e0fc2793 Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 2011-05-20 13:13:19 -07:00
Jim Miller
d01bbac731 Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 2011-05-20 13:12:57 -07:00
Adam Powell
d415a61653 Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 2011-05-20 12:59:43 -07:00
Dianne Hackborn
22585947ff Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -07:00
Adam Powell
3da5b00cf0 Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 2011-05-19 15:48:38 -07:00
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