summaryrefslogtreecommitdiffstats
path: root/core/java/com/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Resolving resources across users."Nicolas Prevot2014-05-132-0/+10
|\
| * Resolving resources across users.Nicolas Prevot2014-05-132-0/+10
* | Merge "More native interpolators"John Reck2014-05-131-0/+8
|\ \
| * | More native interpolatorsJohn Reck2014-05-121-0/+8
* | | Merge "Add TimeInterpolator support to RNA"John Reck2014-05-124-0/+152
|\ \ \ | |/ /
| * | Add TimeInterpolator support to RNAJohn Reck2014-05-124-0/+152
* | | Merge "notification ranking infrastructure"Chris Wren2014-05-123-442/+0
|\ \ \
| * | | notification ranking infrastructureChris Wren2014-05-093-442/+0
| | |/ | |/|
* | | Support multiple calls to AsyncChannel.disconnectRobert Greenwalt2014-05-121-0/+3
| |/ |/|
* | Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-091-0/+47
|\ \
| * | Refactor VirtualLightRefBase & JNIJohn Reck2014-05-091-0/+47
| |/
* | Merge "Battery stats tweaks."Dianne Hackborn2014-05-091-53/+29
|\ \
| * | Battery stats tweaks.Dianne Hackborn2014-05-091-53/+29
| |/
* | Merge "Cleanup remainings of old webview."Selim Gurun2014-05-091-7/+0
|\ \
| * | Cleanup remainings of old webview.Selim Gurun2014-05-081-7/+0
* | | resolved conflicts for merge of 88aa8aab to masterVinod Krishnan2014-05-091-19/+55
|\ \ \ | |_|/ |/| |
| * | am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular U...Vinod Krishnan2014-05-091-20/+55
| |\ \
| | * | Adding a margin for the AlertDialog to work on circular UI.Vinod Krishnan2014-05-091-20/+55
* | | | Merge "Introduce new API for floating window support"Yohei Yukawa2014-05-091-0/+3
|\ \ \ \
| * | | | Introduce new API for floating window supportYohei Yukawa2014-05-091-0/+3
* | | | | Usage stats!Dianne Hackborn2014-05-083-117/+7
|/ / / /
* | | | Merge "Make ChooserActivity intents doccentric and transitory"Craig Mautner2014-05-081-3/+17
|\ \ \ \
| * | | | Make ChooserActivity intents doccentric and transitoryCraig Mautner2014-05-081-3/+17
| | |_|/ | |/| |
* | | | am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedis...Mindy Pereira2014-05-081-9/+8
|\ \ \ \ | | |/ / | |/| |
| * | | am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" i...Mindy Pereira2014-05-071-9/+8
| |\ \ \ | | | |/ | | |/|
| | * | Make distance count when dismissing swipedismisslayoutMindy Pereira2014-05-071-9/+8
| * | | am 84aaf124: Merge "Plumb display state and interactive information to Batter...Jeff Brown2014-05-062-71/+90
| |\ \ \ | | |/ /
| | * | Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)Jeff Brown2014-05-062-71/+90
* | | | Merge "Quantum notification improvements."Dan Sandler2014-05-081-5/+9
|\ \ \ \
| * | | | Quantum notification improvements.Dan Sandler2014-05-081-5/+9
* | | | | Merge "Initial implementation of WifiScanner"Vinit Deshapnde2014-05-081-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Initial implementation of WifiScannerVinit Deshapnde2014-05-071-0/+2
| | |_|/ | |/| |
* | | | L: WIP.Dan Sandler2014-05-081-132/+98
|/ / /
* | | Merge "Only show IME in navigation bar when it should"Jason Monk2014-05-072-2/+4
|\ \ \
| * | | Only show IME in navigation bar when it shouldJason Monk2014-05-072-2/+4
* | | | Merge "Plumb display state and interactive information to BatteryStats."Jeff Brown2014-05-062-82/+103
|\ \ \ \
| * | | | Plumb display state and interactive information to BatteryStats.Jeff Brown2014-05-062-82/+103
* | | | | Merge "Take supportsSwitchingToNextInputMethod into considertaion"Yohei Yukawa2014-05-061-9/+23
|\ \ \ \ \
| * | | | | Take supportsSwitchingToNextInputMethod into considertaionYohei Yukawa2014-05-011-9/+23
* | | | | | Add support for popups overlapping anchorsAlan Viverette2014-05-051-6/+8
* | | | | | Merge changes Iffd15e95,Id2db95ecChristoph Studer2014-05-051-1/+1
|\ \ \ \ \ \
| * | | | | | Log notification clicksChristoph Studer2014-04-301-1/+1
* | | | | | | Further work on voice interaction services.Dianne Hackborn2014-05-051-3/+4
| |_|/ / / / |/| | | | |
* | | | | | camera2: Add re-usable data types for camera metadata key/valuesIgor Murashkin2014-05-021-4/+171
* | | | | | Merge "Fix a bug in querying showing state for action bars"Adam Powell2014-05-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fix a bug in querying showing state for action barsAdam Powell2014-05-021-1/+1
* | | | | | | am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gestureMark Renouf2014-05-021-11/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | am 11b14691: Implement cliff guard for swipeDismiss gestureMark Renouf2014-05-021-11/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Implement cliff guard for swipeDismiss gestureMark Renouf2014-05-021-11/+9
| * | | | | am 9a76e9ba: Fix build errorBill Yi2014-04-301-2/+5
| |\ \ \ \ \