Svetoslav Ganov
47730f1582
am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
...
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
NumberPicker getting stuck if scroll wheel not wrapable.
2011-12-09 18:09:16 -08:00
Gilles Debunne
70511ade47
am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
...
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
Make the Next key navigate between TextViews
2011-12-09 18:09:03 -08:00
Gilles Debunne
2afcfa4239
resolved conflicts for merge of 5371a165 to master
...
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
2011-12-09 18:06:34 -08:00
Nick Pelly
1db7a31a45
Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"
2011-12-09 14:37:05 -08:00
Nick Pelly
75596b4545
Add BluetoothAdapter.getRemoteDevice(byte[])
...
This is useful for NFC->BT hand-over, where we are already working with bytes.
Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
2011-12-09 14:35:38 -08:00
Gilles Debunne
683a485fbc
am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
...
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
IOOB is Suggestions
2011-12-09 14:25:55 -08:00
Gilles Debunne
47a4b78eb7
am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
...
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
Prevent NPE in SuggestionSpan
2011-12-09 14:25:53 -08:00
Jeff Brown
bdc18b28eb
am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
...
* commit '03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.
2011-12-09 14:25:41 -08:00
Romain Guy
3f7be830f0
Merge "Enable dirty regions on newly created EGL surfaces"
2011-12-09 12:28:46 -08:00
Romain Guy
9477c6e658
Enable dirty regions on newly created EGL surfaces
...
This change fixes an issue on some tiler architectures that do not
enable the swap buffer behavior by default on EGL surfaces.
Change-Id: Ibda1ae582da1a20afad3be9c3361080e72df5206
2011-12-09 12:27:21 -08:00
Narayan Kamath
e61fd281a8
Merge "Remove BlockingMediaPlayer."
2011-12-09 06:30:14 -08:00
Mangesh Ghiware
66b2ff818b
Update computation of reading level scale.
...
Fixes bug 5726043 (Extra double-tap needed to zoom out to overview mode
on nytimes.com on a Stingray)
Change-Id: I54dc303f4aa81ddc38c234228adc915b9f6749dc
2011-12-08 17:11:16 -08:00
Svetoslav Ganov
48b428fb13
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
2011-12-08 12:28:11 -08:00
Gilles Debunne
aa4a5713aa
Merge "Make the Next key navigate between TextViews" into ics-mr1
2011-12-08 11:57:06 -08:00
Gilles Debunne
0e7b8020fd
Merge "Limit created string size in Spell Checker" into ics-mr1
2011-12-08 11:56:28 -08:00
Gilles Debunne
06a8e9b1ce
Make the Next key navigate between TextViews
...
Bug 5718127
Fixes from changes introduced in
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=0500b3cfda5192efc09d6d4344b0c6c785c0a815
Change-Id: I4f6d213cd744b913b053275c4a26194cd030de84
2011-12-08 10:39:39 -08:00
Gilles Debunne
a5a98a034b
Merge "IOOB is Suggestions" into ics-mr1
2011-12-08 09:59:44 -08:00
Gilles Debunne
89f2e8a099
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
2011-12-08 09:59:29 -08:00
Jeff Brown
8e0ecbfc97
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
2011-12-07 23:29:52 -08:00
Jeff Brown
7bedf24490
Shortcut keys should be handled on down, not up.
...
Bug: 5720360
Change-Id: I3afc278e576ea992c76f024c8b6bad14b214239c
2011-12-07 21:37:19 -08:00
Dave Burke
9650b018e3
am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888 " into ics-mr1
...
* commit 'e118c1de0037e6732b66b9f52903567caa961c31':
Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:43:18 -08:00
Dave Burke
ef8913c035
Merge "Remove dangerous and useless optimization Bug #5525888 " into ics-mr1
2011-12-07 20:40:10 -08:00
Jaikumar Ganesh
07c2c9f03b
am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
...
* commit '38342c9d858d8b021bc5c616cfe6c0ab9f359b2b':
Reduce likelihood of crash in state machine.
2011-12-07 19:53:47 -08:00
Jaikumar Ganesh
d426c338a6
Merge "Reduce likelihood of crash in state machine." into ics-mr1
2011-12-07 19:50:03 -08:00
Svetoslav Ganov
234484a9fb
NumberPicker getting stuck if scroll wheel not wrapable.
...
1. If the number picker was not wrapping the selector wheel
it was incorrectly initializing the fling scroller and
the error was proportional to the difference of the
current value and the max size. As a result if the number
picker gets stuck for a very long time.
2. The alpha of the selector wheel paint was not reset on
every subsequent fling so if the wheel was fading out
and a new fling is performed the selector wheel is
dimmed during the fling, rather bright.
bug:5728363
Change-Id: Ia90a6af86f162bda1b28f43f7ba7e4a9f5051b78
2011-12-07 19:35:15 -08:00
Romain Guy
c7ee3cab56
Remove dangerous and useless optimization
...
Bug #5525888
Change-Id: I553828c0da09b15d0dce3727e4c26a9d0bcf72ea
2011-12-07 19:10:04 -08:00
Gilles Debunne
b69c8cab56
am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
...
* commit '0235016acb241556f24689e3d818db6973b5ad4f':
Insert into user dict with the correct locale
2011-12-07 19:03:30 -08:00
Gilles Debunne
2df13452e0
Merge "Insert into user dict with the correct locale" into ics-mr1
2011-12-07 18:41:04 -08:00
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
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
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
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
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
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
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
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
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
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