summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix sp<> conversion operator / constructorMathias Agopian2011-02-253-8/+34
* Merge "Implement issue #3426299: Introduce application "stopped" state"Dianne Hackborn2011-02-2511-37/+531
|\
| * Implement issue #3426299: Introduce application "stopped" stateDianne Hackborn2011-02-2511-37/+531
* | Merge "ViewPropertyAnimator cancels prior animations"Chet Haase2011-02-251-18/+49
|\ \
| * | ViewPropertyAnimator cancels prior animationsChet Haase2011-02-251-18/+49
* | | am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks ...Andreas Huber2011-02-250-0/+0
|\ \ \
| * \ \ am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync...Andreas Huber2011-02-252-61/+153
| |\ \ \
| | * \ \ Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." int...Andreas Huber2011-02-252-61/+153
| | |\ \ \
| | | * | | DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.Andreas Huber2011-02-252-61/+153
* | | | | | Merge "Adding framework support for resizable widgets"Adam Cohen2011-02-256-11/+127
|\ \ \ \ \ \
| * | | | | | Adding framework support for resizable widgetsAdam Cohen2011-02-256-11/+127
* | | | | | | Merge "Fixing the write of BackgroundData setting."Robert Greenwalt2011-02-251-7/+5
|\ \ \ \ \ \ \
| * | | | | | | Fixing the write of BackgroundData setting.Robert Greenwalt2011-02-251-7/+5
* | | | | | | | Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"Christopher Tate2011-02-252-146/+52
* | | | | | | | Merge "Fixing build"Winson Chung2011-02-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing buildWinson Chung2011-02-251-1/+1
* | | | | | | | | Merge "Moving dependency includes out of librs headers."Alex Sakhartchouk2011-02-254-29/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Moving dependency includes out of librs headers.Alex Sakhartchouk2011-02-254-29/+39
* | | | | | | | | | Merge "Fixing issue where RemoteViewsService.onDestroy() was never being call...Winson Chung2011-02-254-15/+100
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fixing issue where RemoteViewsService.onDestroy() was never being called.Winson Chung2011-02-254-15/+100
* | | | | | | | | | Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun me...Xavier Ducrohet2011-02-251-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods.Xavier Ducrohet2011-02-241-3/+2
* | | | | | | | | | | Merge "Unset device trust state before unpairing."Jaikumar Ganesh2011-02-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Unset device trust state before unpairing.Jaikumar Ganesh2011-02-251-0/+2
* | | | | | | | | | | Merge "Code clean-up around ScrollView."Gilles Debunne2011-02-253-83/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Code clean-up around ScrollView.Gilles Debunne2011-02-253-83/+55
* | | | | | | | | | | | Merge "Removed ViewTreeObserver in TextView when handles are hidden"Gilles Debunne2011-02-251-26/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removed ViewTreeObserver in TextView when handles are hiddenGilles Debunne2011-02-251-26/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0"David Li2011-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0David Li2011-02-251-1/+1
* | | | | | | | | | | | | am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_tele...Samyeoul Choi2011-02-252-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' f...Samyeoul Choi2011-02-252-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for SprintSamyeoul Choi2011-02-252-1/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Crespo4G: Voicemail: Add 'config_telephony_...' for SprintSamyeoul Choi2011-02-252-1/+11
* | | | | | | | | | | | | | | am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plu...Svetoslav Ganov2011-02-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into ...Svetoslav Ganov2011-02-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 66edf2bb to honeycomb-plus-aospSvetoslav Ganov2011-02-251-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gi...Svetoslav Ganov2011-02-251-6/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge "Use different version of CLDR data in DatePicker" into gingerbreadSvetoslav Ganov2011-02-241-6/+33
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Use different version of CLDR data in DatePickerSvetoslav Ganov2011-02-241-6/+33
* | | | | | | | | | | | | | | | | Merge "mp4a box contains mp3 audio when the object type indication is 0x6b"James Dong2011-02-251-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mp4a box contains mp3 audio when the object type indication is 0x6bJames Dong2011-02-251-0/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-02-2540-83/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import revised translations.Eric Fischer2011-02-2540-83/+83
* | | | | | | | | | | | | | | | | | am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO N...Eric Fischer2011-02-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-02-252-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-02-252-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-02-252-3/+3
* | | | | | | | | | | | | | | | Merge "Make sure pinch zoom and overview scale are within limits"Shimeng (Simon) Wang2011-02-251-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make sure pinch zoom and overview scale are within limitsShimeng (Simon) Wang2011-02-241-2/+4