summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename isScreenOn() to isInteractive().Jeff Brown2014-04-112-4/+4
* resolved conflicts for merge of 337e764d to masterJeff Brown2014-04-1133-536/+621
|\
| * am f24687e2: Merge "Plumb display power state through display manager." into ...Jeff Brown2014-04-1136-583/+626
| |\
| | * Merge "Plumb display power state through display manager." into klp-modular-devJeff Brown2014-04-1136-583/+626
| | |\
| | | * Plumb display power state through display manager.Jeff Brown2014-04-1036-583/+626
* | | | Merge "fix build"Colin Cross2014-04-111-2/+2
|\ \ \ \
| * | | | fix buildColin Cross2014-04-101-2/+2
* | | | | Merge "Fix support for TouchFeedbackDrawable tint mode"Alan Viverette2014-04-111-15/+47
|\ \ \ \ \
| * | | | | Fix support for TouchFeedbackDrawable tint modeAlan Viverette2014-04-101-15/+47
* | | | | | Merge "Add equals, hashCode, and toString methods in TvInputInfo."Sungsoo Lim2014-04-111-0/+28
|\ \ \ \ \ \
| * | | | | | Add equals, hashCode, and toString methods in TvInputInfo.Sungsoo Lim2014-04-111-0/+28
* | | | | | | Update volume panelAlan Viverette2014-04-1010-45/+75
| |/ / / / / |/| | | | |
* | | | | | Merge "Corp badging for Recents"Amith Yamasani2014-04-114-20/+63
|\ \ \ \ \ \
| * | | | | | Corp badging for RecentsAmith Yamasani2014-04-104-20/+63
* | | | | | | MediaFrameworkTest: Fix Camera2 API unit test build breakageZhijun He2014-04-102-37/+96
| |_|/ / / / |/| | | | |
* | | | | | Merge "Update brightness icons to use color attribute"Alan Viverette2014-04-1014-10/+49
|\ \ \ \ \ \
| * | | | | | Update brightness icons to use color attributeAlan Viverette2014-04-1014-10/+49
* | | | | | | Merge "MediaFocusControl: fix comment"Jean-Michel Trivi2014-04-101-4/+2
|\ \ \ \ \ \ \
| * | | | | | | MediaFocusControl: fix commentJean-Michel Trivi2014-04-101-4/+2
* | | | | | | | Merge "Fix path interpretation on curves"ztenghui2014-04-101-44/+56
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix path interpretation on curvesztenghui2014-04-091-44/+56
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Fix build breakage"Raph Levien2014-04-101-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix build breakageRaph Levien2014-04-101-2/+0
* | | | | | | | Merge "Make attachFunctor blocking"John Reck2014-04-106-115/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make attachFunctor blockingJohn Reck2014-04-106-115/+9
* | | | | | | | Fix build breakageAlan Viverette2014-04-102-7/+30
* | | | | | | | Merge "Remove sync flush"John Reck2014-04-105-39/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove sync flushJohn Reck2014-04-105-39/+9
| |/ / / / / / /
* | | | | | | | Merge "Further improved NotificationStackScroller"Selim Cinek2014-04-108-34/+290
|\ \ \ \ \ \ \ \
| * | | | | | | | Further improved NotificationStackScrollerSelim Cinek2014-04-108-34/+290
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "Camera2 API: enable burst capture and repeating burst."Jianing Wei2014-04-107-63/+444
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera2 API: enable burst capture and repeating burst.Jianing Wei2014-04-107-63/+444
* | | | | | | | | Merge "Cleaning up VectorDrawable"Alan Viverette2014-04-102-149/+100
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleaning up VectorDrawableAlan Viverette2014-04-102-149/+100
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Adding render stats APIs to UiAutomation (framework)."Svetoslav2014-04-1021-18/+1004
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding render stats APIs to UiAutomation (framework).Svetoslav2014-04-0721-18/+1004
* | | | | | | | | | Merge "support the people extra on the notification object"Chris Wren2014-04-104-1/+244
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | support the people extra on the notification objectChris Wren2014-04-104-1/+244
* | | | | | | | | | am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-04-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-mod...Baligh Uddin2014-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-04-106-6/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-096-6/+6
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1056-6/+230
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-0956-6/+230
* | | | | | | | | | | Merge "Allow encryption when keyguard is set to pattern or no protection"Paul Lawrence2014-04-102-6/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow encryption when keyguard is set to pattern or no protectionPaul Lawrence2014-04-032-6/+9
* | | | | | | | | | | am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest f...Narayan Kamath2014-04-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded...Narayan Kamath2014-04-101-1/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"Narayan Kamath2014-04-101-1/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Removed android.debug.JNITest from preloaded-classes"Narayan Kamath2014-04-101-1/+0
| | | |\ \ \ \ \ \ \ \ \ \