Xavier Ducrohet
52909f1bac
am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
...
* commit '2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
Import the Layoutlib from hc-mr1.
2011-06-06 16:20:16 -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
e667e0c73b
am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
...
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
2011-06-06 15:21: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
8f2bc7998d
am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
Import revised translations. DO NOT MERGE
2011-06-06 10:54:41 -07:00
Eric Fischer
2768505342
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-06-06 10:38:42 -07:00
Wink Saville
a3bd4c076b
Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
2011-06-04 06:15:21 -07:00
Dianne Hackborn
4d3177dfda
am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
...
* commit 'bd754205d0b59315582855329649dad925a04b82':
Fix to not lose state when saving a deactivated fragment.
2011-06-03 17:54:28 -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
Roman Nurik
62a5e3e4d4
am e7d60078: Add old blog posts as articles, batch 1
...
* commit 'e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
Add old blog posts as articles, batch 1
2011-06-03 17:27:03 -07:00
Dianne Hackborn
7b68400e7c
am 185e3e24: Fix when managed cursors are required.
...
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
Fix when managed cursors are required.
2011-06-03 16:23:15 -07:00
Robert Greenwalt
c1fdb11b74
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
2011-06-03 15:42:48 -07:00
John Wang
34fef438ce
Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
2011-06-03 14:01:59 -07:00
Daniel Sandler
aac874a461
am b4b44bd3: DO NOT MERGE. Restore status bar on phones.
...
* commit 'b4b44bd32983e154f2ad61b99809ed6cedd46d47':
DO NOT MERGE. Restore status bar on phones.
2011-06-03 11:22:49 -07:00
Gilles Debunne
9467440179
am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
...
* commit '0538e6217de35e418c9779fd48c8300e65cc4f1e':
Tap timeout removed on paste. Relying on position only.
2011-06-03 10:32:00 -07:00
Andy Stadler
d163899fa6
am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
...
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
2011-06-03 10:28:45 -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
Wink Saville
ffc24f1b5b
Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
2011-06-03 10:16:11 -07:00
satok
63dc0677ec
am be96408b: (Do not merge) Backport a fix for InputMethodManager.java
...
* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
(Do not merge) Backport a fix for InputMethodManager.java
2011-06-02 23:22:35 -07:00
Dianne Hackborn
8453c5fa89
am b46ed763: Add new Fragment API for explicitly saving/restoring state.
...
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:30:34 -07:00
Wink Saville
bc69a26f21
Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
2011-06-02 18:21:50 -07:00
Wink Saville
7f1e2d79ca
Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
2011-06-02 18:21:37 -07:00
Jeff Brown
af155f072a
am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
Add a preference panel for mouse speed.
2011-06-02 17:28:07 -07:00
Jeff Brown
ee6acacafc
am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
...
* commit '10c3f367a3eb66081c06f1d75107d26e64ce248f':
Implement pointer acceleration.
2011-06-02 17:27:48 -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
dc26da8320
am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
...
* commit 'a86290891a661ecdc8115fd441b44dcebedb9e3d':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
2011-06-02 10:01:53 -07:00
Scott Main
46b600df71
am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
...
* commit 'b82367512177999e240bb35ededcae20dd1e14ee':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
2011-06-02 10:01:51 -07:00
Scott Main
04e966268e
am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
...
* commit '0d5ed597b7b2a91d6a97d188df37caef039242af':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
2011-06-02 10:01:42 -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
0c5ffe9987
am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit '2969b51132b80c873663aa2472b21d3e95845927':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:31:26 -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
5acfb5fa8c
am f58e6c98: Merge "doc typo" into honeycomb-mr2
...
* commit 'f58e6c982267e6e027b8a286ebe2a2e349348ee7':
doc typo
2011-06-01 18:29:54 -07:00
Dianne Hackborn
f81450c455
am e6676351: Work around OpenFeint bug.
...
* commit 'e66763516a9c27c192adaba417616371a1c3c9bf':
Work around OpenFeint bug.
2011-06-01 18:29:50 -07:00
Scott Main
a76b2cdc17
Merge "doc typo" into honeycomb-mr2
2011-06-01 18:19:12 -07:00
Adam Powell
d6a6bb6f53
am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit 'fa8ee17702a79a2597670374679a0b1952f4630f':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:49:47 -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
2083dd1a58
am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
Compatibility mode never needed for normal size screens.
2011-06-01 12:47:29 -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
e593915ba6
am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '80cf4e79d2acd1f94b6a9866255459c6ab2760be':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:39:36 -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
Adam Powell
60888e4a1a
am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
...
* commit '8656ba1298da98dde9ff6517aa06b86317a65bf7':
Fix bug 4501658 - adjust toast frame padding
2011-06-01 10:29:58 -07:00
Adam Powell
d27a23d661
Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
2011-06-01 10:27:54 -07:00
Scott Main
794992b956
am f5992953: docs: fix typos
...
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
docs: fix typos
2011-06-01 09:50:21 -07:00
Robert Greenwalt
d05f356f75
Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
2011-06-01 09:01:22 -07:00
Dianne Hackborn
1c131d4d87
am fd206560: Merge "Forgot this file." into honeycomb-mr2
...
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
Forgot this file.
2011-05-31 18:30:01 -07:00