summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2Marco Nelissen2009-12-101-0/+22
* am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - ...Fred Quintana2009-12-1016-699/+571
* am 274b8c58: am 7b935e84: Merge change Iead0d4d8 into eclair-mr2Romain Guy2009-12-101-1/+1
|\
| * am 7b935e84: Merge change Iead0d4d8 into eclair-mr2Romain Guy2009-12-091-1/+1
| |\
| | * Merge change Iead0d4d8 into eclair-mr2Android (Google) Code Review2009-12-081-1/+1
| | |\
| | | * Fix the build when ViewDebug.TRACE_RECYCLER is set to true.Romain Guy2009-12-081-1/+1
* | | | resolved conflicts for merge of 1cf55c56 to masterPaul Westbrook2009-12-101-2468/+0
|\ \ \ \ | |/ / /
| * | | am b882b361: Merge change Iee7f2457 into eclair-mr2Paul Westbrook2009-12-091-2468/+0
| |\ \ \ | | |/ /
| | * | Merge change Iee7f2457 into eclair-mr2Android (Google) Code Review2009-12-081-2468/+0
| | |\ \
| | | * | Deleted Gmail.java from frameworks. Previously it had been moved to vendor/g...Paul Westbrook2009-12-081-2468/+0
| | | |/
* | | | am eb68a226: am af9788a9: Merge change Ia53c6725 into eclair-mr2Dianne Hackborn2009-12-102-2/+15
|\ \ \ \ | |/ / /
| * | | am af9788a9: Merge change Ia53c6725 into eclair-mr2Dianne Hackborn2009-12-092-2/+15
| |\ \ \ | | |/ /
| | * | Add bindService API to not bring ot foreground.Dianne Hackborn2009-12-082-2/+15
| | |/
* | | am e0b52cad: am ea4823c1: Improve javadoc in View.Romain Guy2009-12-101-2/+2
|\ \ \ | |/ /
| * | am ea4823c1: Improve javadoc in View.Romain Guy2009-12-091-2/+2
| |\ \ | | |/
| | * Improve javadoc in View.Romain Guy2009-12-081-2/+2
* | | am 774568f7: am 1ee7b645: Merge change I0743a389 into eclair-mr2Amith Yamasani2009-12-101-1/+2
|\ \ \ | |/ /
| * | am 1ee7b645: Merge change I0743a389 into eclair-mr2Amith Yamasani2009-12-091-1/+2
| |\ \ | | |/
| | * Merge change I0743a389 into eclair-mr2Android (Google) Code Review2009-12-081-1/+2
| | |\
| | | * Close popup when Keyboard gets a CANCEL motion event.Amith Yamasani2009-12-081-1/+2
* | | | am 3a0a9e25: am a5ba0a78: am 767eb427: Merge change If990cab0 into eclairChristopher Tate2009-12-101-2/+16
|\ \ \ \ | |/ / /
| * | | am a5ba0a78: am 767eb427: Merge change If990cab0 into eclairChristopher Tate2009-12-091-2/+16
| |\ \ \ | | |/ /
| | * | am 767eb427: Merge change If990cab0 into eclairChristopher Tate2009-12-081-2/+16
| | |\ \
| | | * | Make sure to acknowledge stale broadcastsChristopher Tate2009-12-081-2/+16
* | | | | am 506afbd6: am 3f40bd48: Remove the code where we suspect webkit draw during...Grace Kloba2009-12-101-25/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 3f40bd48: Remove the code where we suspect webkit draw during drag. It was...Grace Kloba2009-12-091-25/+1
| |\ \ \ \ | | |/ / /
| | * | | Remove the code where we suspect webkit draw duringGrace Kloba2009-12-081-25/+1
* | | | | am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2Ken Shirriff2009-12-106-288/+40
|\ \ \ \ \ | |/ / / /
| * | | | am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2Ken Shirriff2009-12-096-288/+40
| |\ \ \ \ | | |/ / /
| | * | | Merge change I96ddd6e2 into eclair-mr2Android (Google) Code Review2009-12-086-288/+40
| | |\ \ \
| | | * | | Migration to TrafficStats.Ken Shirriff2009-12-086-288/+40
* | | | | | am c99f154b: am dcd8bad3: Merge change Ia28d9547 into eclair-mr2Bjorn Bringert2009-12-102-13/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am dcd8bad3: Merge change Ia28d9547 into eclair-mr2Bjorn Bringert2009-12-092-13/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge change Ia28d9547 into eclair-mr2Android (Google) Code Review2009-12-082-13/+24
| | |\ \ \ \
| | | * | | | Expose SearchableInfo and getSearchablesInGlobalSearch()Bjorn Bringert2009-12-082-13/+24
| | | |/ / /
* | | | | | am 8f4bca2a: am 06ffc12a: Merge change I237c1cee into eclair-mr2Romain Guy2009-12-102-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 06ffc12a: Merge change I237c1cee into eclair-mr2Romain Guy2009-12-092-2/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge change I237c1cee into eclair-mr2Android (Google) Code Review2009-12-082-2/+6
| | |\ \ \ \
| | | * | | | Improve exception message thrown when a View's state is of the wrong type.Romain Guy2009-12-082-2/+6
* | | | | | | am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2Dianne Hackborn2009-12-101-0/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 24eca800: Merge change I887f355f into eclair-mr2Dianne Hackborn2009-12-091-0/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge change I887f355f into eclair-mr2Android (Google) Code Review2009-12-081-0/+7
| | |\ \ \ \ \
| | | * | | | | Propagate background scheduling class across processes.Dianne Hackborn2009-12-071-0/+7
* | | | | | | | am 9f1ea0d4: am 6be3bf23: Some fixes for positioning the WebTextView.Leon Scroggins2009-12-102-14/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6be3bf23: Some fixes for positioning the WebTextView.Leon Scroggins2009-12-092-14/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Some fixes for positioning the WebTextView.Leon Scroggins2009-12-082-14/+4
| | | |_|/ / / | | |/| | | |
* | | | | | | am 0e933c85: am f7d0b013: Add TrafficStats class to SDK.Ken Shirriff2009-12-101-0/+265
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f7d0b013: Add TrafficStats class to SDK.Ken Shirriff2009-12-091-0/+265
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add TrafficStats class to SDK.Ken Shirriff2009-12-081-0/+265
* | | | | | | am 45ccb6a5: am 51ef573a: Switching from activity based full screen plugins t...Derek Sollenberger2009-12-105-91/+103
|\ \ \ \ \ \ \ | |/ / / / / /