Jerry J. Wang
1545d8e9e7
Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
2011-06-22 15:08:25 -07:00
Scott Main
0996fc868c
Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
2011-06-22 14:23:22 -07:00
Irfan Sheriff
5867716fbd
Merge "Release wakelock after use" into honeycomb-mr2
2011-06-21 19:17:27 -07:00
Bruno Oliveira
4a0501a75e
Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
2011-06-21 16:44:56 -07:00
Irfan Sheriff
a5eebbd1ca
Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2
2011-06-21 14:23:17 -07:00
Irfan Sheriff
deab10e7ba
Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
2011-06-21 14:23:09 -07:00
Bruno Oliveira
972cd2f323
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
2011-06-21 11:07:47 -07:00
Daniel Sandler
f59e969313
Merge "Fix crazy notification panel background." into honeycomb-mr2
2011-06-20 17:29:24 -07:00
Robert Ly
9fcc542657
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
2011-06-20 09:37:51 -07:00
Robert Ly
d02950e3a0
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
2011-06-20 09:37:36 -07:00
Mathias Agopian
debc234c24
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
...
Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
2011-06-16 17:22:28 -07:00
John Wang
3c44627702
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
2011-06-16 16:47:18 -07:00
Dianne Hackborn
9240137679
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
2011-06-16 14:47:53 -07:00
Robert Greenwalt
865fc6c36c
Merge "DO NOT MERGE" into honeycomb-mr2
2011-06-16 14:40:25 -07:00
Mathias Agopian
1b2c2a9ea0
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
2011-06-15 20:45:32 -07:00
Mathias Agopian
63ad28fb53
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
2011-06-15 20:42:25 -07:00
Mathias Agopian
c6601d3e01
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
2011-06-15 20:16:15 -07:00
Mathias Agopian
3790e7997a
revert surfaceflinger leak fix as it uncovered a crasher on xoom
...
Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
2011-06-15 19:31:04 -07:00
Dianne Hackborn
975acd5556
Merge "We must keep up with the Joneses." into honeycomb-mr2
2011-06-15 17:08:04 -07:00
Eric Fischer
32066cf9de
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-06-15 16:38:43 -07:00
Justin Ho
d502ddadca
Merge "Updated art for compat mode dialog." into honeycomb-mr2
2011-06-15 14:52:52 -07:00
Irfan Sheriff
1e765667fb
Merge "Fix lease duration handling" into honeycomb-mr2
2011-06-15 14:00:23 -07:00
Daniel Sandler
474a302d5a
Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
2011-06-15 06:10:32 -07:00
Daniel Sandler
75566f4bf5
Merge "Final UI for compatibility mode." into honeycomb-mr2
2011-06-15 06:10:27 -07:00
Dianne Hackborn
ff427a1560
Merge "Fix issue #4592768 : Xoom display does not resize when..." into honeycomb-mr2
2011-06-14 19:16:46 -07:00
Robert Ly
9396bd944d
Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
2011-06-14 17:45:04 -07:00
Robert Ly
2039f17754
Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
2011-06-14 17:43:38 -07:00
Robert Ly
739a085e09
Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
2011-06-14 16:36:17 -07:00
Robert Ly
4c190ffb02
Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
2011-06-14 16:35:22 -07:00
Robert Ly
02bae11c2e
Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
2011-06-14 16:35:12 -07:00
Amith Yamasani
98bbfc6a14
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
2011-06-14 15:35:13 -07:00
Dianne Hackborn
b085343ab5
Merge "Fix issue #4603422 : Compatibility mode button doesn't always update" into honeycomb-mr2
2011-06-14 15:12:01 -07:00
Robert Ly
0e5750378f
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
2011-06-14 15:06:42 -07:00
Robert Ly
28fe7d5707
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
2011-06-14 14:58:32 -07:00
Robert Ly
14231eff1e
Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
2011-06-14 14:56:00 -07:00
Robert Ly
aefe60df4a
Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
2011-06-14 14:55:35 -07:00
Mathias Agopian
7b1ef58d56
DO NOT MERGE. may fix build on some version of gcc
...
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
2011-06-14 12:05:42 -07:00
Dianne Hackborn
8cb535b11d
Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
2011-06-14 11:27:09 -07:00
Dianne Hackborn
bfb01f297c
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
2011-06-14 11:24:29 -07:00
Mathias Agopian
867740df05
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
2011-06-13 13:44:28 -07:00
Dianne Hackborn
fcd83591ff
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
2011-06-10 18:37:22 -07:00
Teng-Hui Zhu
e473ce1b54
Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2
2011-06-10 14:19:22 -07:00
Dianne Hackborn
729fc387b0
Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
2011-06-09 15:55:54 -07:00
Dianne Hackborn
d4bfc93113
Enforce public resource restriction on bag parents.
...
Need to put some more styles in the SDK to avoid breaking apps.
Also, welcome Android 3.2.
Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
2011-06-09 15:27:39 -07:00
James Dong
f98f69241f
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
2011-06-09 11:56:09 -07:00
Justin Ho
c762e30727
Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
2011-06-09 10:18:13 -07:00
Xavier Ducrohet
4734541892
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
...
* changes:
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
2011-06-09 10:12:40 -07:00
Dianne Hackborn
deb21d3eda
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
2011-06-08 22:33:34 -07:00
Dianne Hackborn
ab6bf752b3
Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
2011-06-08 20:00:50 -07:00
Mathias Agopian
ee8e9af975
Merge "Fix a leak in RefBase" into honeycomb-mr2
2011-06-08 19:28:39 -07:00
