summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* MTP: work in progress on expanded property supportMike Lockwood2010-08-251-0/+3
* Merge "Fix the documentation of ContentValues."Jeff Hamilton2010-08-251-0/+4
|\
| * Fix the documentation of ContentValues.Jeff Hamilton2010-08-251-0/+4
* | Merge "Change animator xml importing to use new inflater class"Chet Haase2010-08-255-221/+304
|\ \ | |/ |/|
| * Change animator xml importing to use new inflater classChet Haase2010-08-245-221/+304
* | resolved conflicts for merge of 20afae51 to masterChih-Chung Chang2010-08-251-10/+20
|\ \
| * \ am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called...Chih-Chung Chang2010-08-251-10/+20
| |\ \
| | * | Avoid allocating buffer every time getThumbnail is called.Chih-Chung Chang2010-08-251-10/+20
* | | | resolved conflicts for merge of d3cd2596 to masterDianne Hackborn2010-08-241-0/+7
|\ \ \ \ | |/ / /
| * | | am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerb...Dianne Hackborn2010-08-241-0/+7
| |\ \ \ | | |/ /
| | * | Merge "Verify that onPause() calls its superclass." into gingerbreadDianne Hackborn2010-08-241-0/+7
| | |\ \
| | | * | Verify that onPause() calls its superclass.Dianne Hackborn2010-08-241-0/+7
| * | | | am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbreadGilles Debunne2010-08-241-4/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix for an NPE in TextView." into gingerbreadGilles Debunne2010-08-241-4/+6
| | |\ \ \
| | | * | | Fix for an NPE in TextView.Gilles Debunne2010-08-241-4/+6
| | | |/ /
* | | | | Merge "Use only one GL context per process, share chaches."Romain Guy2010-08-243-83/+122
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use only one GL context per process, share chaches.Romain Guy2010-08-243-83/+122
* | | | | am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbreadBrad Fitzpatrick2010-08-242-7/+39
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am b1bbe99a: Merge "Some StrictMode API changes." into gingerbreadBrad Fitzpatrick2010-08-242-7/+39
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Some StrictMode API changes." into gingerbreadBrad Fitzpatrick2010-08-242-7/+39
| | |\ \ \
| | | * | | Some StrictMode API changes.Brad Fitzpatrick2010-08-242-7/+39
| | | | |/ | | | |/|
| * | | | am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerb...Daisuke Miyakawa2010-08-241-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix vCard so that it looks at IM correctly." into gingerbreadDaisuke Miyakawa2010-08-241-1/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix vCard so that it looks at IM correctly.Daisuke Miyakawa2010-08-241-1/+3
* | | | | resolved conflicts for merge of 9765b2a0 to masterGilles Debunne2010-08-242-20/+12
|\ \ \ \ \ | |/ / / /
| * | | | am 2703a42d: When an EditText gains focus by tapping, move the insertion poin...Gilles Debunne2010-08-242-20/+10
| |\ \ \ \ | | |/ / /
| | * | | When an EditText gains focus by tapping, move the insertion point where tapped.Gilles Debunne2010-08-242-20/+10
* | | | | Merge "Allow reliable detection of a message that is in use."Wink Saville2010-08-242-3/+24
|\ \ \ \ \
| * | | | | Allow reliable detection of a message that is in use.Wink Saville2010-08-242-3/+24
* | | | | | Merge "Disable FEATURE_ACTION_BAR on windows with incompatible feature sets."Adam Powell2010-08-241-0/+9
|\ \ \ \ \ \
| * | | | | | Disable FEATURE_ACTION_BAR on windows with incompatible feature sets.Adam Powell2010-08-241-0/+9
* | | | | | | Add facilities for layout transitionsChet Haase2010-08-248-25/+167
* | | | | | | Merge "resolved conflicts for merge of 0b7b9807 to master"Brad Fitzpatrick2010-08-241-31/+35
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of 0b7b9807 to masterBrad Fitzpatrick2010-08-241-31/+35
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am d132892a: Merge "Don\'t touch the VFS during window relayout." into ginger...Brad Fitzpatrick2010-08-231-30/+35
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Don't touch the VFS during window relayout.Brad Fitzpatrick2010-08-231-30/+35
* | | | | | | | communicate drawing pause to webkit to pause gif animationCary Clark2010-08-241-4/+6
|/ / / / / / /
* | | | | | | resolved conflicts for merge of b037da40 to masterKenny Root2010-08-242-38/+62
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3e05a0be: Hysteresis effect in Text selection.Gilles Debunne2010-08-232-39/+63
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Hysteresis effect in Text selection.Gilles Debunne2010-08-232-39/+63
| | | |_|/ / | | |/| | |
| | * | | | Merge "add new sensor types for handling gyro data and device orientation mor...Mathias Agopian2010-08-233-0/+230
| | |\ \ \ \
| | | * | | | add new sensor types for handling gyro data and device orientationKevin Powell2010-08-203-0/+230
* | | | | | | am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aospJean-Baptiste Queru2010-08-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | resolved conflicts for merge of 1ffd753e to gingerbread-plus-aospJean-Baptiste Queru2010-08-231-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Crash when powering off."Jean-Baptiste Queru2010-08-231-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Crash when powering off.Mathias Jeppsson2010-08-171-0/+4
* | | | | | | | | am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable."...Steve Howard2010-08-241-5/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerb...Steve Howard2010-08-201-5/+7
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Make ProgressBar.setVisibility() remotable." into gingerbreadSteve Howard2010-08-201-5/+7
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Make ProgressBar.setVisibility() remotable.Steve Howard2010-08-201-5/+7