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
Dianne Hackborn
acf87675ae
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
...
...for Market App iRunner
There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.
Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.
Also a few changes here and there to get rid of $#*&^!! debug logs.
Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
2011-06-08 18:45:43 -07:00
Adam Powell
59fd67e54b
Merge "Public styles for action bar tabs" into honeycomb-mr2
2011-06-08 16:54:50 -07:00
Mathias Agopian
3b0a7a739e
Fix a leak in RefBase
...
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Id85e749ba04521199555dd701198edd097c313d4
2011-06-08 16:25:01 -07:00
Jeff Brown
1c251f9d9a
Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
2011-06-07 16:58:06 -07:00
Adam Powell
886afd25c9
Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
2011-06-07 16:19:26 -07:00
Dianne Hackborn
c16a374f3f
Merge "Remove compat mode dialog." into honeycomb-mr2
2011-06-07 15:45:14 -07:00
Dianne Hackborn
6086cca9ff
Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
2011-06-07 15:36:51 -07:00
Mathias Agopian
36ca5e7217
fix a surface leak introduced by a failed merge (DO NOT MERGE)
...
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
2011-06-07 14:52:22 -07:00
Robert Greenwalt
aa580c7936
Merge "Reveal some network constants." into honeycomb-mr2
2011-06-07 12:00:37 -07:00
Jeff Brown
a6d2cd4f07
Merge "Fix build." into honeycomb-mr2
2011-06-06 21:06:30 -07:00
Jeff Brown
1d3a7130f9
Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
2011-06-06 20:32:18 -07:00
Jeff Brown
455c66e7ff
Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
2011-06-06 20:31:55 -07:00
Jeff Brown
e5c60a3479
Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
2011-06-06 20:30:47 -07:00
Jeff Brown
769acf8623
Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
2011-06-06 20:27:28 -07:00
Jeff Brown
7ca7ba2064
Revert velocity damping.
...
Bug: 4364920
Velocity damping proved to be a bad idea because it would
cause a significant ramp in velocity at the beginning of
a gesture, instead of the desired smooth behavior. Oh well.
Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
2011-06-06 20:23:54 -07:00
Dianne Hackborn
1975da38d2
Merge "Fix issue #4539687 : At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
2011-06-06 17:30:50 -07:00
Xavier Ducrohet
83176b7577
Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
2011-06-06 16:17:44 -07:00
Mathias Agopian
f3d939c5e5
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
...
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp
Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
2011-06-06 15:14:25 -07:00
Eric Fischer
2768505342
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-06-06 10:38:42 -07:00
Dianne Hackborn
77a171c55c
Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
2011-06-03 17:52:23 -07:00
Gilles Debunne
b8c3181422
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
2011-06-03 10:26:18 -07:00
Andy Stadler
4d68ae93e2
Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
2011-06-03 10:24:27 -07:00
Jeff Brown
c51a9f87bd
Merge "Add a preference panel for mouse speed." into honeycomb-mr2
2011-06-02 17:26:05 -07:00
Jeff Brown
2127c742d8
Merge "Implement pointer acceleration." into honeycomb-mr2
2011-06-02 17:25:59 -07:00
Jeff Brown
adab620383
Implement pointer acceleration.
...
Bug: 4124987
Change-Id: I1f31a28f1594c55302ccabe13fe3ca6d2ff71d50
2011-06-02 14:12:05 -07:00
Scott Main
7d0972efde
Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2
2011-06-02 09:52:09 -07:00
Scott Main
f95a59b340
Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
2011-06-02 09:49:43 -07:00
Scott Main
cac9b2cee3
Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
2011-06-02 09:47:31 -07:00
Dianne Hackborn
da86002d17
Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
2011-06-01 22:28:56 -07:00
Scott Main
a76b2cdc17
Merge "doc typo" into honeycomb-mr2
2011-06-01 18:19:12 -07:00
Adam Powell
c3bab1a4c9
Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
2011-06-01 12:48:03 -07:00
Dianne Hackborn
9e19c9e4ef
Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
2011-06-01 12:43:56 -07:00
Dianne Hackborn
5717c26845
Merge "Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2
2011-06-01 12:34:48 -07:00