Adam Powell
243657993c
resolved conflicts for merge of db81dc72 to master
...
Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444
2011-12-07 18:18:58 -08:00
Jaikumar Ganesh
a544d467f2
Reduce likelihood of crash in state machine.
...
Reduce likelihood of crash when state machine has quit and someone
sends a message using one of the public functions.
Bug: 5724844
Change-Id: I6582a1d19113e6ed545c8ab20adb0a414d8784a7
2011-12-07 18:07:29 -08:00
Adam Powell
b723999beb
am cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1
...
* commit 'cf6a6522fdbce05896d3a551f7cd6243857ceced':
Raise touch slop value from previous experiment
2011-12-07 17:57:16 -08:00
Adam Powell
cf6a6522fd
Merge "Raise touch slop value from previous experiment" into ics-mr1
2011-12-07 17:55:35 -08:00
Adam Powell
6720a87ad1
Raise touch slop value from previous experiment
...
Change-Id: I7681c401803643f309fd988824602169a830de29
2011-12-07 17:53:46 -08:00
Joe Malin
84a0060ea1
am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
...
* commit 'bea4285934b4cd5bab21f7c69ac82d871b6ee05f':
DOC CHANGE: Add text for android.os.storage
2011-12-07 17:17:09 -08:00
Joe Malin
549b55ba70
am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
...
* commit 'aa2719df72225402737009b1cc2e3cfea8e74bc7':
DOC CHANGE: Add text for android.os.storage
2011-12-07 17:14:44 -08:00
Robert Greenwalt
7776da1b79
am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
...
* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
Fix NPE in trimV4AddrZeros.
2011-12-07 17:12:47 -08:00
Joe Malin
aa2719df72
am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
...
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
2011-12-07 17:11:59 -08:00
Robert Greenwalt
12bee3b3e2
am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
...
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
Fix NPE in trimV4AddrZeros.
2011-12-07 17:10:26 -08:00
Robert Greenwalt
fbb09ea84f
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
2011-12-07 17:09:05 -08:00
Robert Greenwalt
0faacf0658
Fix NPE in trimV4AddrZeros.
...
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
2011-12-07 16:55:38 -08:00
Joe Malin
3937e05570
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
2011-12-07 16:07:49 -08:00
Joe Malin
13235db8f7
DOC CHANGE: Add text for android.os.storage
...
Change-Id: Ia5785cff3860907af4c53cbe769126496ee338c3
2011-12-07 15:50:34 -08:00
Joe Malin
41e2e1f991
DOC CHANGE: Package text and Formatter javadoc
...
Change-Id: Ia34bf38d07b474522f65b89db4991c32909ecff2
2011-12-07 15:24:25 -08:00
Svetoslav Ganov
ba621bd359
Merge "Make the URL for the JavaScript based screen-reader used by WebView configurable."
2011-12-07 14:38:05 -08:00
Winson Chung
1f45d25257
am a21ce1f1: am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
...
* commit 'a21ce1f1107e1aad19335bebe4aed915158b5ca6':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
2011-12-07 14:36:34 -08:00
Svetoslav Ganov
3ca5a74c17
Make the URL for the JavaScript based screen-reader used by WebView configurable.
...
The URl from which to inject a screen-reader for WebView accessiblity support should be
configurable because: 1) The accessibility engineering team should be able to point
devices to a staging build of the screen-reader; 2) We would like to be able to change
this URL via the Google services mechanism.
bug:5718543
Change-Id: I3d4d343f1c93e0e0173f04b2912949fe8a3566b9
2011-12-07 14:35:59 -08:00
Winson Chung
7992f3e541
am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
...
* commit '0a361b10a665a3d158c846722290f26ce62276e1':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
2011-12-07 14:35:59 -08:00
Winson Chung
0a361b10a6
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
2011-12-07 14:33:31 -08:00
Gilles Debunne
c115fa041c
Fixed SpellCheckerSessions leak in TextView
...
Bug 5709546
Change 1a22db29 created a potential leak: setText calls
sendOnTextChange that now calls updateSpellCheckSpans.
The original call to updateSpellCheckSpans made sure the
View had been attached to a window, through the existence
of the SpellChecker object.
The mSpellChecker object will now only be created when the
View is attached, all other spell related method will do
nothing if it has not been initialized.
Change-Id: I8885c12be6395e2346c0ed057bb6a275256f012b
2011-12-07 13:38:35 -08:00
Robert Greenwalt
131746ba38
am e55e5b84: am 3957b5fc: Fix the build.
...
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
Fix the build.
2011-12-07 13:19:37 -08:00
Robert Greenwalt
bcf9deedc3
am 3957b5fc: Fix the build.
...
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
Fix the build.
2011-12-07 13:17:35 -08:00
Robert Greenwalt
3957b5fc49
Fix the build.
...
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
2011-12-07 13:10:59 -08:00
Robert Greenwalt
86a943951b
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:33:24 -08:00
Robert Greenwalt
b47f12d4a1
am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:31:35 -08:00
Robert Greenwalt
f352491aad
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
2011-12-07 12:29:14 -08:00
Bart Sears
63051d71ef
am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit '654ac45c21b257613957c8c172a3fdff79903fcd':
Fix WebTextView rings
2011-12-07 11:46:11 -08:00
Bart Sears
3edc62bc35
am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
2011-12-07 11:43:27 -08:00
Bart Sears
b56076ac9f
Merge "Fix WebTextView rings" into ics-mr1
2011-12-07 11:41:57 -08:00
Joe Malin
7c918ad493
am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3eebad61b4df7f5b4c898545aa7ec9076bc077d0':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:33:01 -08:00
Joe Malin
7659e295a5
am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:30:11 -08:00
Joe Malin
3744d1faf5
am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:28:25 -08:00
Dianne Hackborn
d6c69b7498
am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
2011-12-07 11:04:04 -08:00
Irfan Sheriff
d04f28151b
am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
2011-12-07 11:03:26 -08:00
Adam Powell
b5014d4754
am 720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1
...
* commit '720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
Lower touch slop in ViewConfiguration.
2011-12-07 11:02:38 -08:00
Gilles Debunne
a0cb89a201
am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
...
* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
Invalidated bounds tightened in TextView
2011-12-07 11:02:25 -08:00
Dianne Hackborn
138d870fb7
am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '1f1fa7edd608137863b863da44ee26efb5a93e23':
Truthiness is good.
2011-12-07 10:49:56 -08:00
Jason Simmons
a188e4dc0e
resolved conflicts for merge of ea25ea7e to ics-aah
...
Change-Id: I9d387ad2107486406f364f1cebc709126e2d27a5
2011-12-07 10:47:48 -08:00
Gilles Debunne
e6513486ee
Merge "Minor tweak in getLocationInWindow"
2011-12-07 10:40:28 -08:00
Gilles Debunne
653d3a2787
Limit created string size in Spell Checker
...
Change-Id: I2f4e7a8b0022d76bc30199ff80c2fe637dbe03ef
2011-12-07 10:40:09 -08:00
Dianne Hackborn
fb90df8c6e
Merge "Truthiness is good." into ics-mr1
2011-12-07 10:33:19 -08:00
Robert Greenwalt
d4420ab2fb
Trim leading zeros from ipv4 addrs.
...
Underlying libraries will interpret leading zeros as octal values and
fail.
bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
2011-12-07 09:58:48 -08:00
Matthew Xie
3d374bd16c
am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
...
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
Broadcast turning on/off intent as early as possible when switch on/off BT
2011-12-07 09:27:35 -08:00
Ben Murdoch
a62b9632c8
Clear the WebView picture when a new load starts.
...
Clear the old picture set when we have confirmed a new
page load.
Bug: 5701197
Change-Id: Id96fb7d8e75a0b54a448d35239a69ba1774cffae
2011-12-07 14:16:31 +00:00
Irfan Sheriff
bb60ee9766
am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
Disable poor network connection alone
2011-12-06 21:09:44 -08:00
Jean Chalard
5fa6737cac
Insert into user dict with the correct locale
...
This fixes a bug where a word would be entered in the user
dictionary with the wrong locale.
Bug: 5667272
Change-Id: I219d5461f8f8c74b6ab34f9bb157a4b977f00e68
2011-12-07 13:57:59 +09:00
Jeff Brown
2b621bc5bb
Merge "Disable postponing performTraversals(), for now."
2011-12-06 18:09:35 -08:00
Gilles Debunne
6583ce5b89
Minor tweak in getLocationInWindow
...
Change-Id: Ib3f30dbfb3aee7c46c58e1f7832e3394702c0ff6
2011-12-06 18:09:02 -08:00
Jeff Brown
90a3c5f51d
Disable postponing performTraversals(), for now.
...
Bug: 5715378
Bug: 5721047
Change-Id: I89c674306665b6caa3a63b8a9d2b4b7c9ed020ae
2011-12-06 18:01:37 -08:00