summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid ...Adam Powell2011-06-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams...Adam Powell2011-06-071-0/+9
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | Fix bug 4533120 - rough handling of invalid event streams inAdam Powell2011-06-071-0/+9
* | | | | | | | | | | Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the ab...Adam Powell2011-06-091-5/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug 4563099 - Action bar tabs - place second row tabs on top in theAdam Powell2011-06-091-5/+26
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Don't cut velocity"John Reck2011-06-091-5/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Don't cut velocityJohn Reck2011-06-091-5/+0
* | | | | | | | | | | Merge "Add SwitchPreference"Gilles Debunne2011-06-094-268/+499
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add SwitchPreferenceAdam Powell2011-06-084-268/+499
* | | | | | | | | | | | Merge "Persist network stats using AtomicFile."Jeff Sharkey2011-06-094-7/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Persist network stats using AtomicFile.Jeff Sharkey2011-06-094-7/+42
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fixes WebView.loadData() to avoid constructing invalid URLs."Steve Block2011-06-091-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes WebView.loadData() to avoid constructing invalid URLs.Steve Block2011-06-091-13/+22
* | | | | | | | | | | | | Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes."Narayan Kamath2011-06-097-81/+270
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes.Narayan Kamath2011-06-097-81/+270
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Change exception thrown when set() called on readonly Property."Chet Haase2011-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change exception thrown when set() called on readonly Property.Chet Haase2011-06-091-1/+1
* | | | | | | | | | | | | | Merge "Fix for baseline alignment in LinearLayout compatibiity mode."Philip Milne2011-06-091-126/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for baseline alignment in LinearLayout compatibiity mode.Philip Milne2011-06-091-126/+148
* | | | | | | | | | | | | | am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEn...Romain Guy2011-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | / / / / / | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) ...Romain Guy2011-06-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."Romain Guy2011-06-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Disable plugins if setPluginsEnabled(false) called.Tero Saarni2011-06-021-1/+1
* | | | | | | | | | | | | | | Merge "Added support for rediscovering a Tag (API)."Martijn Coenen2011-06-092-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added support for rediscovering a Tag (API).Martijn Coenen2011-06-082-0/+48
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Add a URI for recurring event exceptions"Andy McFadden2011-06-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add a URI for recurring event exceptionsAndy McFadden2011-06-081-0/+8
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Make changes to the TTS api suggested by the API review."Narayan Kamath2011-06-096-139/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make changes to the TTS api suggested by the API review.Narayan Kamath2011-06-086-139/+229
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseU...Steve Block2011-06-092-17/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()Steve Block2011-06-092-17/+10
* | | | | | | | | | | | | | resolved conflicts for merge of 7ca13deb to masterJake Hamby2011-06-081-2/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aospJake Hamby2011-06-071-2/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | resolved conflicts for merge of ab79ee4a to gingerbread-plus-aospJake Hamby2011-06-061-2/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Enable full support for SMS Cell Broadcast.Jake Hamby2011-06-011-2/+42
| | * | | | | | | | | | | | | am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into g...Jaikumar Ganesh2011-05-271-15/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Remove discoverable timeout handler. DO NOT MERGEJaikumar Ganesh2011-05-271-15/+1
* | | | | | | | | | | | | | | Merge "Introduces new Contacts API for ranking promotion."Daisuke Miyakawa2011-06-081-0/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Introduces new Contacts API for ranking promotion.Daisuke Miyakawa2011-06-081-0/+85
* | | | | | | | | | | | | | | | Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly."Svetoslav Ganov2011-06-082-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | AccessibilityNodeInfo and AccessibilityEvent to initialized properly.Svetoslav Ganov2011-06-082-5/+6
* | | | | | | | | | | | | | | | Merge "Fix initial zoom with loadViewState"John Reck2011-06-081-10/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix initial zoom with loadViewStateJohn Reck2011-06-081-10/+21
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Remove obsolete code.Romain Guy2011-06-081-13/+0
| |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTEJohn Wang2011-06-081-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTEJohn Wang2011-06-071-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add SIM PUK unlockscreen." into honeycomb-LTEJohn Wang2011-06-071-1/+23
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add SIM PUK unlockscreen.John Wang2011-06-071-1/+23
* | | | | | | | | | | | | | The service part of the user space VPN support.Chia-chi Yeh2011-06-082-0/+49
| |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Move NDEF URI helper method into android.nfc.NfcRecord"Nick Pelly2011-06-081-0/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \