summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Clear the WebView picture when a new load starts."Ben Murdoch2011-12-122-1/+9
|\
| * Clear the WebView picture when a new load starts.Ben Murdoch2011-12-072-1/+9
* | am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel n...Svetoslav Ganov2011-12-091-15/+4
|\ \
| * \ Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1Svetoslav Ganov2011-12-081-15/+4
| |\ \
| | * | NumberPicker getting stuck if scroll wheel not wrapable.Svetoslav Ganov2011-12-071-15/+4
* | | | am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews...Gilles Debunne2011-12-091-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Make the Next key navigate between TextViews" into ics-mr1Gilles Debunne2011-12-081-2/+2
| |\ \ \
| | * | | Make the Next key navigate between TextViewsGilles Debunne2011-12-081-2/+2
* | | | | resolved conflicts for merge of 5371a165 to masterGilles Debunne2011-12-093-3/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Limit created string size in Spell Checker" into ics-mr1Gilles Debunne2011-12-083-2/+21
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Limit created string size in Spell CheckerGilles Debunne2011-12-073-2/+21
* | | | | Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"Nick Pelly2011-12-091-1/+20
|\ \ \ \ \
| * | | | | Add BluetoothAdapter.getRemoteDevice(byte[])Nick Pelly2011-12-091-1/+20
* | | | | | am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1Gilles Debunne2011-12-093-11/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "IOOB is Suggestions" into ics-mr1Gilles Debunne2011-12-083-11/+64
| |\ \ \ \ \
| | * | | | | IOOB is SuggestionsGilles Debunne2011-12-063-11/+64
* | | | | | | am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1Gilles Debunne2011-12-091-6/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Prevent NPE in SuggestionSpan" into ics-mr1Gilles Debunne2011-12-081-6/+10
| |\ \ \ \ \ \
| | * | | | | | Prevent NPE in SuggestionSpanGilles Debunne2011-12-061-6/+10
* | | | | | | | am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not...Jeff Brown2011-12-091-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Shortcut keys should be handled on down, not up." into ics-mr1Jeff Brown2011-12-071-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Shortcut keys should be handled on down, not up.Jeff Brown2011-12-071-1/+2
* | | | | | | | | Merge "Enable dirty regions on newly created EGL surfaces"Romain Guy2011-12-091-2/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable dirty regions on newly created EGL surfacesRomain Guy2011-12-091-2/+15
* | | | | | | | | | Merge "Remove BlockingMediaPlayer."Narayan Kamath2011-12-094-205/+76
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove BlockingMediaPlayer.Narayan Kamath2011-12-064-205/+76
* | | | | | | | | | Update computation of reading level scale.Mangesh Ghiware2011-12-083-11/+16
* | | | | | | | | | am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bu...Dave Burke2011-12-071-7/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1Dave Burke2011-12-071-7/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove dangerous and useless optimizationRomain Guy2011-12-071-7/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine....Jaikumar Ganesh2011-12-071-5/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Reduce likelihood of crash in state machine." into ics-mr1Jaikumar Ganesh2011-12-071-5/+47
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Reduce likelihood of crash in state machine.Jaikumar Ganesh2011-12-071-5/+47
* | | | | | | | | | am 0235016a: am 2df13452: Merge "Insert into user dict with the correct local...Gilles Debunne2011-12-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Insert into user dict with the correct locale" into ics-mr1Gilles Debunne2011-12-071-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Insert into user dict with the correct localeJean Chalard2011-12-071-0/+1
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | resolved conflicts for merge of db81dc72 to masterAdam Powell2011-12-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Raise touch slop value from previous experiment" into ics-mr1Adam Powell2011-12-071-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Raise touch slop value from previous experimentAdam Powell2011-12-071-1/+1
* | | | | | | | | | | am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for androi...Joe Malin2011-12-071-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0Joe Malin2011-12-071-0/+8
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0Joe Malin2011-12-071-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | DOC CHANGE: Add text for android.os.storageJoe Malin2011-12-071-0/+8
* | | | | | | | | | | | | am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1Robert Greenwalt2011-12-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Fix NPE in trimV4AddrZeros." into ics-mr1Robert Greenwalt2011-12-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix NPE in trimV4AddrZeros.Robert Greenwalt2011-12-071-0/+1
* | | | | | | | | | | | | Merge "Make the URL for the JavaScript based screen-reader used by WebView co...Svetoslav Ganov2011-12-072-8/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make the URL for the JavaScript based screen-reader used by WebView configura...Svetoslav Ganov2011-12-072-8/+35
* | | | | | | | | | | | | | am a21ce1f1: am 0a361b10: Merge "Workaround for issue where the notifyDataset...Winson Chung2011-12-072-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Workaround for issue where the notifyDatasetChanged call chain is brok...Winson Chung2011-12-072-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |