summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 4ea54f44 to masterRobert Greenwalt2010-08-274-49/+120
* Deprecated the managed cursor API's on Activity. Loaders are the new world or...Jason parks2010-08-271-0/+13
* Some new preferences features.Dianne Hackborn2010-08-261-6/+63
* Added methods for managing uri query parametersBen Dodson2010-08-261-51/+96
* Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..."Dianne Hackborn2010-08-262-16/+13
|\
| * Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work...Dianne Hackborn2010-08-262-16/+13
* | Merge "Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT"Jaikumar Ganesh2010-08-261-0/+4
|\ \
| * | Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENTJaikumar Ganesh2010-08-261-0/+4
* | | am b318ef79: am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt.Gilles Debunne2010-08-261-2/+2
|\ \ \
| * \ \ am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt.Gilles Debunne2010-08-261-2/+2
| |\ \ \
| | * | | Fix for IndexOutOfBounds in TextView getWordLimitsAt.Gilles Debunne2010-08-261-2/+2
* | | | | Merge "-> Added the ability to specify an AdapterView's empty view through R...Adam Cohen2010-08-264-1/+59
|\ \ \ \ \
| * | | | | -> Added the ability to specify an AdapterView's empty viewAdam Cohen2010-08-264-1/+59
* | | | | | Merge "Updated documentation for upcoming fix for @code tags"Ben Dodson2010-08-265-11/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated documentation for upcoming fix for @code tagsBen Dodson2010-08-265-11/+11
* | | | | | resolved conflicts for merge of f309c7a8 to masterGilles Debunne2010-08-261-31/+32
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | am 1b400c77: Merge "Fix for NPE in TextView." into gingerbreadGilles Debunne2010-08-261-0/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix for NPE in TextView." into gingerbreadGilles Debunne2010-08-261-0/+5
| | |\ \ \
| | | * | | Fix for NPE in TextView.Gilles Debunne2010-08-251-0/+5
* | | | | | Merge "Fix 2797185: Integrate 3D RecentApps View into system."Jim Miller2010-08-262-39/+96
|\ \ \ \ \ \
| * | | | | | Fix 2797185: Integrate 3D RecentApps View into system.Jim Miller2010-08-252-39/+96
* | | | | | | Merge "Fix problems with early ending of Sequencer"Chet Haase2010-08-262-0/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix problems with early ending of SequencerChet Haase2010-08-262-0/+5
* | | | | | | am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on star...Dianne Hackborn2010-08-261-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gin...Dianne Hackborn2010-08-261-4/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbreadDianne Hackborn2010-08-261-4/+5
| | |\ \ \ \
| | | * | | | Fix issue #2951784: Launcher crashes on startupDianne Hackborn2010-08-261-4/+5
| * | | | | | Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" int...Robert Greenwalt2010-08-265-37/+142
| |\ \ \ \ \ \
| | * \ \ \ \ \ resolved conflicts for merge of b998f311 to gingerbread-plus-aospRobert Greenwalt2010-08-255-37/+142
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Add an API to request route to an IPv6 host."Robert Greenwalt2010-08-235-38/+144
| | | |\ \ \ \ \ \
| | | | * | | | | | Add an API to request route to an IPv6 host.Banavathu, Srinivas Naik2010-08-195-38/+144
* | | | | | | | | | Merge "Restore zoom level when browser is restored."Shimeng (Simon) Wang2010-08-261-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Restore zoom level when browser is restored.Shimeng (Simon) Wang2010-08-261-0/+2
* | | | | | | | | | | resolved conflicts for merge of 66d633d2 to masterDianne Hackborn2010-08-253-7/+106
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | am 3003a017: Merge "Don\'t retain global ref to last inflated context." into ...Dianne Hackborn2010-08-253-5/+104
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Don't retain global ref to last inflated context." into gingerbreadDianne Hackborn2010-08-253-5/+104
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Don't retain global ref to last inflated context.Dianne Hackborn2010-08-253-5/+104
* | | | | | | | | | am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting...Konstantin Lopyrev2010-08-251-15/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once ...Konstantin Lopyrev2010-08-251-15/+17
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Preventing the hierarchy viewer from getting stuck, once when trying t...Konstantin Lopyrev2010-08-251-15/+17
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Preventing the hierarchy viewer from getting stuck, once when trying to load ...Konstantin Lopyrev2010-08-251-15/+17
* | | | | | | | | | Fix for end events from Sequencer objectsChet Haase2010-08-254-20/+36
* | | | | | | | | | am a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gi...Mathias Agopian2010-08-251-1/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbreadMathias Agopian2010-08-251-1/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Improve Sensors documentation a bit" into gingerbreadMathias Agopian2010-08-251-1/+18
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Improve Sensors documentation a bitMathias Agopian2010-08-251-1/+18
| | | | |_|_|_|_|/ / | | | |/| | | | | |
* | | | | | | | | | am 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" in...Brad Fitzpatrick2010-08-252-2/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbreadBrad Fitzpatrick2010-08-252-2/+40
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbreadBrad Fitzpatrick2010-08-252-3/+41
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Start of SharedPreferences$Editor.startCommit()Brad Fitzpatrick2010-08-252-3/+41
| | | | |/ / / / / / | | | |/| | | | | |