John Wang
3811395d3a
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
2011-06-07 12:56:49 -07:00
Robert Greenwalt
2e13ac10a7
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Robert Greenwalt
aa580c7936
Merge "Reveal some network constants." into honeycomb-mr2
2011-06-07 12:00:37 -07:00
Adam Powell
aa5750fd23
am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
...
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:32:23 -07:00
Wink Saville
1baddeb506
Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
2011-06-07 10:58:09 -07:00
Robert Greenwalt
91d9684a0b
Merge "Fix NPE in the statusbar." into honeycomb-LTE
2011-06-07 10:57:20 -07:00
Jeff Brown
25065bbb27
am 5cb05eea: Merge "Fix build." into honeycomb-mr2
...
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
2011-06-06 21:08:25 -07:00
Jeff Brown
a6d2cd4f07
Merge "Fix build." into honeycomb-mr2
2011-06-06 21:06:30 -07:00
Jeff Brown
1531e594fb
am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
...
* commit '2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
Revert velocity damping. Bug: 4364920
2011-06-06 20:34:35 -07:00
Jeff Brown
3a550fa828
am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
...
* commit 'b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
Simplify spot tracking logic. Bug: 4124987
2011-06-06 20:34:33 -07:00
Jeff Brown
0a3b747378
am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
...
* commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
Touch pad improvements. Bug: 4124987
2011-06-06 20:32:25 -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
Irfan Sheriff
e69a575f0a
Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
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
bc4d24cef7
am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
...
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
Improve browser scrolling when using the mouse wheel.
2011-06-06 20:29:08 -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
4e4c8c6482
am 1b405592: Merge "Fix issue #4539687 : At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
...
* commit '1b405592550c719aa5dd93178705ae08b4e84a2f':
Fix issue #4539687 : At least one compatibility-mode app (Androminion)...
2011-06-06 17:33:59 -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
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