summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove obsolete ThirdPartyCall APIsEvan Charlton2014-05-147-463/+0
* Revert "Expose sendEnvelope."Evan Charlton2014-05-142-45/+4
* Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of s...Evan Charlton2014-05-143-12/+10
* Merge "Fix potential crash in libandroidfw"Adam Lesinski2014-05-141-1/+1
|\
| * Fix potential crash in libandroidfwAdam Lesinski2014-05-141-1/+1
* | merge master nova by hand, skipped translationsEd Heyl2014-05-14309-3733/+4717
|\ \
| * \ am b7e6a817: Merge "PowerManager: Minor Coding style issues."Ruchi Kandoi2014-05-121-9/+15
| |\ \
| * \ \ am 5ba476c3: Merge "Make sessions aware of user id"RoboErik2014-05-125-49/+138
| |\ \ \
| * \ \ \ am 9fca9ecb: Merge "notification ranking infrastructure"Chris Wren2014-05-1216-534/+867
| |\ \ \ \
| * \ \ \ \ am 8ce0c4b3: am 728614e4: am c5df4d0e: Merge "BootReceiver: add ro.boot.bootr...Simon Wilson2014-05-120-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | am 631fa0d0: Merge "Improved stack scroll range logic and more card backgroun...Selim Cinek2014-05-123-27/+22
| |\ \ \ \ \
| * \ \ \ \ \ am b0a630fb: Merge "Fix clipping and outline for top quick settings header."Jorim Jaggi2014-05-121-0/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 5b3a28e9: am 82c93357: (-s ours) am 05c581ac: Merge "DO NOT MERGE Hide mor...Tim Kilbourn2014-05-120-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am f939e960: am 0ff8f796: (-s ours) am d6fc5115: Merge "DO NOT MERGE Hide lea...Tim Kilbourn2014-05-120-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 05400140: Merge "Fix magnitude of AbsListView nested scrolling offset"Yorke Lee2014-05-121-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 7003af19: Merge "Directly start to collapse QS when overscrolling."Jorim Jaggi2014-05-122-1/+71
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 2fbcff12: Merge "First pass on multinetwork framework"Robert Greenwalt2014-05-128-11/+192
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 9c889271: Merge "Add support for building split APKs"Adam Lesinski2014-05-1237-1931/+2543
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 9a273b89: Merge "Support for hollow switch and seek bar thumbs"Alan Viverette2014-05-1224-118/+244
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 5efd55a1: Merge "Fix nested scrolling bugs in AbsListView"Yorke Lee2014-05-121-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4accb98: Merge "Define audio attributes"Jean-Michel Trivi2014-05-122-0/+483
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bf857065: Merge "Support multiple calls to AsyncChannel.disconnect"Robert Greenwalt2014-05-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fbba06df: Merge "Turn down the logging."Robert Greenwalt2014-05-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8b05d273: Merge "Flush dump output before calling score cache dump() metho...Jeff Davidson2014-05-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e27bfe30: Merge "Fix QuickSettings header state on Keyguard."Jorim Jaggi2014-05-122-10/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 913f7dcc: Merge "Set primary color of SystemUI."Jorim Jaggi2014-05-125-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c0f5df4: Merge "Corrected top stack logic of notifications again."Selim Cinek2014-05-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b1c07444: Implement intermediate brigthness control on header.Jorim Jaggi2014-05-128-15/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 790489fa: Merge "Implement settings affordance in header."Jorim Jaggi2014-05-1216-75/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3838b611: Improved the notification stack logic furtherSelim Cinek2014-05-125-40/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 964ba838: Remove an unused member.Yohei Yukawa2014-05-121-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"Adam Powell2014-05-116-170/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cdea825c: Merge "New clock design in header for expanded status bar."Jorim Jaggi2014-05-115-19/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e302d4dc: Merge "Make notification panel fullscreen on tablets."Jorim Jaggi2014-05-116-17/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4de9b44: Merge "Adding shell command execution to UiAutomation."Svetoslav2014-05-114-2/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1fc9180b: Fix measure performance of whole status bar window #2.Jorim Jaggi2014-05-118-24/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc3f4bee: Revert "Simplify projection matrix management."Jorim Jaggi2014-05-115-19/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 41ecb84d: Merge "Don\'t force black status bar when expanded."Jorim Jaggi2014-05-111-7/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 879c4491: Merge "Implement new multi-user affordance."Jorim Jaggi2014-05-117-4/+344
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 83830a9b: Merge "Real fix for recent SystemUI crash."Jorim Jaggi2014-05-112-9/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 50386c57: am ddba067f: am f521ee6f: am e3e2c471: Merge "Set ActionMode tit...Jeff Sharkey2014-05-101-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 133d4e92: Merge "Fix Os.link apicheck breakage."Elliott Hughes2014-05-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 49dc64d1: am 0932eb35: am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs:...Robert Ly2014-05-103-19/+178
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""Adam Powell2014-05-103-11/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 82902c45: Merge "Remove the View#initializeScrollbars API"Adam Powell2014-05-103-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3555c81: Merge "Adding dismiss method on the top cards, and disabling the...Winson Chung2014-05-1012-20/+164
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 22e2eca6: Merge "Simplify projection matrix management."Chris Craik2014-05-105-27/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b1a0a46: Merge "Fixing crash in Activity.onApplyTheme()."Winson Chung2014-05-091-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ed517771: Merge changes I5d21645b,I8928e357Winson Chung2014-05-099-137/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2d3af881: Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-0913-95/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \