summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* TTS API: Replace "voice id" with "voice name"Przemyslaw Szczepaniak2013-10-296-57/+65
* am 0298ebb2: am 60fb1e28: am 714ba345: Merge "Complete implementation of the ...Svetoslav2013-10-284-33/+127
|\
| * am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced prin...Svetoslav2013-10-284-33/+127
| |\
| | * Merge "Complete implementation of the advanced print options." into klp-devSvetoslav2013-10-284-33/+127
| | |\
| | | * Complete implementation of the advanced print options.Svetoslav2013-10-284-33/+127
* | | | am a03fc2c2: am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dump...Dianne Hackborn2013-10-281-206/+222
|\ \ \ \ | |/ / /
| * | | am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo t...Dianne Hackborn2013-10-281-206/+222
| |\ \ \ | | |/ /
| | * | Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native proc...Dianne Hackborn2013-10-281-206/+222
| | |\ \ | | | |/ | | |/|
| | | * Fix issue #11391003: Allow dumpsys meminfo to be used with native processesDianne Hackborn2013-10-251-206/+222
* | | | Merge "Add support for using ColorStateList in GradientDrawable"Alan Viverette2013-10-281-0/+25
|\ \ \ \
| * | | | Add support for using ColorStateList in GradientDrawableAlan Viverette2013-10-281-0/+25
* | | | | am 13c4645b: am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeatin...Christopher Tate2013-10-251-33/+52
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak...Christopher Tate2013-10-251-33/+52
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-devChristopher Tate2013-10-261-33/+52
| | |\ \ \
| | | * | | Un-deprecate setInexactRepeating() and tweak docsChristopher Tate2013-10-251-33/+52
| | | | |/ | | | |/|
* | | | | am de9b66fe: am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced d...Jeff Sharkey2013-10-251-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into...Jeff Sharkey2013-10-251-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Extra to always show advanced devices.Jeff Sharkey2013-10-251-0/+3
| | |/ /
* | | | am 66f6fa7b: am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Ma...Christopher Tate2013-10-251-25/+97
|\ \ \ \ | |/ / /
| * | | am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and...Christopher Tate2013-10-251-25/+97
| |\ \ \ | | |/ /
| | * | Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-devChristopher Tate2013-10-251-25/+97
| | |\ \
| | | * | DOCS: document API 19+ Alarm Manager API and behaviorsChristopher Tate2013-10-251-25/+97
| * | | | am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wak...Marco Nelissen2013-10-251-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add a method to set a list of uids for a wake lock" into klp-devMarco Nelissen2013-10-251-1/+2
| | |\ \ \
| | | * | | Add a method to set a list of uids for a wake lockMarco Nelissen2013-10-251-1/+2
* | | | | | am 01b1e661: am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the ...Svetoslav Ganov2013-10-2510-90/+362
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print...Svetoslav Ganov2013-10-2510-90/+362
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Update the documentaton of the android.print package." into klp-devSvetoslav Ganov2013-10-2510-90/+362
| | |\ \ \ \
| | | * | | | Update the documentaton of the android.print package.Svetoslav Ganov2013-10-2510-90/+362
* | | | | | | am d8a81d06: am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when co...Jeff Sharkey2013-10-251-25/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed....Jeff Sharkey2013-10-251-25/+27
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Skip writing PFD status when comm is closed." into klp-devJeff Sharkey2013-10-251-25/+27
| | |\ \ \ \ \
| | | * | | | | Skip writing PFD status when comm is closed.Jeff Sharkey2013-10-251-25/+27
* | | | | | | | am f09a1b88: am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel cha...Dianne Hackborn2013-10-252-13/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing c...Dianne Hackborn2013-10-252-13/+58
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into kl...Dianne Hackborn2013-10-252-13/+58
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fix issue #11290095: Parcel change causing crashing in KLP...Dianne Hackborn2013-10-252-13/+58
| | | | |_|/ / | | | |/| | |
* | | | | | | am 098bc61f: am fd08694e: am 215add2e: Merge "Hide TransitionManager default ...Adam Powell2013-10-251-4/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am fd08694e: am 215add2e: Merge "Hide TransitionManager default transition me...Adam Powell2013-10-251-4/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Hide TransitionManager default transition methodsAdam Powell2013-10-241-4/+8
* | | | | | am c3661b16: am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setT...Adam Powell2013-10-241-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-devAdam Powell2013-10-241-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix bug in Scene's use of setTagAdam Powell2013-10-241-1/+1
| | |/ / /
* | | | | fix javadocs.Nick Kralevich2013-10-244-8/+8
* | | | | am 11e0c0e6: am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in S...Aravind Akella2013-10-241-7/+27
|\ \ \ \ \ | |/ / / /
| * | | | am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorMa...Aravind Akella2013-10-241-7/+27
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix for ClassCastException in SystemSensorManager." into klp-devAravind Akella2013-10-241-7/+27
| | |\ \ \
| | | * | | Fix for ClassCastException in SystemSensorManager.Aravind Akella2013-10-231-7/+27
* | | | | | Add new TTS API.Przemyslaw Szczepaniak2013-10-2425-436/+3390
* | | | | | am 39e991bd: am f8525caf: am 02e4c3a1: Merge "Cache Scene objects by layout I...Chet Haase2013-10-231-8/+9
|\ \ \ \ \ \ | |/ / / / /