summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* New permissions UI, again.Dianne Hackborn2012-09-129-394/+472
* Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-devChristopher Tate2012-09-121-11/+41
|\
| * Moved a few telephony settings from Secure to GlobalChristopher Tate2012-09-121-11/+41
* | Merge "Fix Javadoc spelling" into jb-mr1-devFabrice Di Meglio2012-09-121-2/+2
|\ \
| * | Fix Javadoc spellingFabrice Di Meglio2012-09-121-2/+2
* | | Merge "end() a reverse()'d animation correctly" into jb-mr1-devChet Haase2012-09-121-7/+1
|\ \ \
| * | | end() a reverse()'d animation correctlyChet Haase2012-09-121-7/+1
* | | | Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-devDianne Hackborn2012-09-121-0/+23
|\ \ \ \
| * | | | Maybe fix issue #7146119: exception in FragmentManagerDianne Hackborn2012-09-111-0/+23
* | | | | Music in keyguard improvementsJim Miller2012-09-121-0/+1
* | | | | Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-devJim Miller2012-09-127-9/+17
|\ \ \ \ \
| * | | | | Initial pass at adding Music control to new keyguard.Jim Miller2012-09-117-9/+17
| | |/ / / | |/| | |
* | | | | Merge "A new broadcast action which is sent when profile changes" into jb-mr1...Makoto Onuki2012-09-121-0/+10
|\ \ \ \ \
| * | | | | A new broadcast action which is sent when profile changesMakoto Onuki2012-09-111-0/+10
* | | | | | Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-devRaph Levien2012-09-122-4/+5
|\ \ \ \ \ \
| * | | | | | Fix for b7155617 race condition in TextLayoutCache.cppRaph Levien2012-09-122-4/+5
* | | | | | | Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-devSelim Gurun2012-09-121-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Minor update to addjavascriptinterface documentationSelim Gurun2012-09-121-4/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-devFabrice Di Meglio2012-09-121-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix SeekBar when in RTL layout directionFabrice Di Meglio2012-09-111-1/+2
* | | | | | | | Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" i...Fabrice Di Meglio2012-09-121-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug #7148393 Switch can crash when hierarchyviewer is connectedFabrice Di Meglio2012-09-111-4/+5
* | | | | | | | | Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin...Fabrice Di Meglio2012-09-121-2/+24
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Enforce encapsulation for MarginLayoutParams startMargin and endMarginFabrice Di Meglio2012-09-111-2/+24
| |/ / / / / /
* | | | | | | Merge "Make JavascriptInterface annotation public." into jb-mr1-devSelim Gurun2012-09-123-12/+28
|\ \ \ \ \ \ \
| * | | | | | | Make JavascriptInterface annotation public.Selim Gurun2012-09-123-12/+28
| | |/ / / / / | |/| | | | |
* | | | | | | Tracking upgrade to bouncycastle 1.47Brian Carlstrom2012-09-121-1/+2
* | | | | | | Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-devKristian Monsen2012-09-122-0/+40
|\ \ \ \ \ \ \
| * | | | | | | Deprecating methods (and a constant) for JB MR1Kristian Monsen2012-09-072-0/+40
* | | | | | | | Include user identifier in external storage paths.Jeff Sharkey2012-09-118-66/+243
| |/ / / / / / |/| | | | | |
* | | | | | | Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1...Svetoslav Ganov2012-09-111-5/+27
|\ \ \ \ \ \ \
| * | | | | | | Screen magnifier should handle window rebuilds correctly.Svetoslav Ganov2012-09-111-5/+27
* | | | | | | | Merge "Set up default (random) Android IDs for all users" into jb-mr1-devChristopher Tate2012-09-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Set up default (random) Android IDs for all usersChristopher Tate2012-09-111-1/+1
* | | | | | | | | am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate l...Robert Greenwalt2012-09-111-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based ...Robert Greenwalt2012-09-111-1/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"Robert Greenwalt2012-09-111-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | EthernetDataTracker: indicate link up based on flagsVishal Mahaveer2012-09-111-1/+1
* | | | | | | | | | | | Merge "Deleting the defunct SearchBox interface." into jb-mr1-devSelim Gurun2012-09-112-116/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Deleting the defunct SearchBox interface.Selim Gurun2012-09-112-116/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "core: config: Update the description of the autoBrightnessLevels array...JP Abgrall2012-09-111-5/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | core: config: Update the description of the autoBrightnessLevels array.JP Abgrall2012-09-111-5/+6
* | | | | | | | | | | | Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-devJeff Brown2012-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Allow adb shell am display-size to use bigger sizes.Jeff Brown2012-09-101-1/+1
* | | | | | | | | | | | Merge "Added annotations for injected accessibility objects" into jb-mr1-devSelim Gurun2012-09-111-5/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added annotations for injected accessibility objectsSelim Gurun2012-09-111-5/+39
* | | | | | | | | | | | | Merge "Adding notion of keyguard widgets" into jb-mr1-devAdam Cohen2012-09-116-10/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Adding notion of keyguard widgetsAdam Cohen2012-09-116-10/+166
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" int...Eino-Ville Talvala2012-09-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDREino-Ville Talvala2012-09-111-1/+0