summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | Merge "Simplify projection matrix management."Chris Craik2014-05-095-27/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Simplify projection matrix management.Chris Craik2014-05-095-27/+19
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixing crash in Activity.onApplyTheme()."Winson Chung2014-05-091-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fixing crash in Activity.onApplyTheme().Winson Chung2014-05-091-3/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge changes I5d21645b,I8928e357Winson Chung2014-05-099-137/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | / / / / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fixing NPE in accessing theme attribute.Winson Chung2014-05-091-7/+10
| * | | | | | | | | | | | | | | | | | | | | Better transition between excluded-from-recent applications to recents.Winson Chung2014-05-088-130/+68
* | | | | | | | | | | | | | | | | | | | | | Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-0913-95/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Refactor VirtualLightRefBase & JNIJohn Reck2014-05-0913-95/+127
* | | | | | | | | | | | | | | | | | | | | | | Merge "Vibrator: Minor coding style changes."Ruchi Kandoi2014-05-091-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Vibrator: Minor coding style changes.Ruchi Kandoi2014-05-091-3/+4
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Temporary workaround for recent system UI regression."John Spurlock2014-05-091-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround for recent system UI regression.John Spurlock2014-05-091-2/+8
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Battery stats tweaks."Dianne Hackborn2014-05-092-122/+179
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Battery stats tweaks.Dianne Hackborn2014-05-092-122/+179
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "WindowManagerService: add some defensive checks"Kenny Root2014-05-092-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | WindowManagerService: add some defensive checksKenny Root2014-05-092-2/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to c...Chris Craik2014-05-091-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph b...Chris Craik2014-05-091-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"Chris Craik2014-05-091-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Correct stride for drawing to cached glyph bitmap"Chris Craik2014-05-091-5/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | Correct stride for drawing to cached glyph bitmapDigish Pandya2014-05-091-5/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 99aa0c17: am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented ho...Andrew Solovay2014-05-091-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set noti...Andrew Solovay2014-05-091-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification prio...Andrew Solovay2014-05-091-0/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | am bff632c8: Merge "doc: Documented how to set notification priority." into k...Andrew Solovay2014-05-091-0/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge "doc: Documented how to set notification priority." into klp-docsAndrew Solovay2014-05-091-0/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | doc: Documented how to set notification priority.Andrew Solovay2014-05-081-0/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup remainings of old webview."Selim Gurun2014-05-092-29/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup remainings of old webview.Selim Gurun2014-05-082-29/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Bitmap.cpp line endings"Chris Craik2014-05-091-837/+837
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bitmap.cpp line endingsChris Craik2014-05-091-837/+837
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Display: Brightness: Low power mode scales the brightness to 50 percent."Ruchi Kandoi2014-05-093-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Display: Brightness: Low power mode scales the brightness to 50 percent.Ruchi Kandoi2014-05-093-2/+15
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move Carrier label into universal status bar header."Jorim Jaggi2014-05-097-20/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Move Carrier label into universal status bar header.Jorim Jaggi2014-05-097-20/+47
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 88aa8aab to master"Vinod Krishnan2014-05-096-20/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 88aa8aab to masterVinod Krishnan2014-05-096-20/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular U...Vinod Krishnan2014-05-096-21/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-...Vinod Krishnan2014-05-096-21/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Adding a margin for the AlertDialog to work on circular UI.Vinod Krishnan2014-05-096-21/+77
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp"Lajos Molnar2014-05-094-7/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Added MediaCodec.releaseOutputBuffer() method with render timestampLajos Molnar2014-05-094-7/+66
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reparent status bar icons into header when expanded."Jorim Jaggi2014-05-097-27/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Reparent status bar icons into header when expanded.Jorim Jaggi2014-05-097-27/+87
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Animated state transition drawableAlan Viverette2014-05-09139-29/+822
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix misaligned vectors. #cannotunsee"Dan Sandler2014-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix misaligned vectors. #cannotunseeDan Sandler2014-05-091-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2: Minor update for exposureCompensation spec"Yin-Chia Yeh2014-05-092-2/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2: Minor update for exposureCompensation specYin-Chia Yeh2014-05-092-2/+32