Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename isScreenOn() to isInteractive(). | Jeff Brown | 2014-04-11 | 2 | -4/+4 |
* | resolved conflicts for merge of 337e764d to master | Jeff Brown | 2014-04-11 | 33 | -536/+621 |
|\ | |||||
| * | am f24687e2: Merge "Plumb display power state through display manager." into ... | Jeff Brown | 2014-04-11 | 36 | -583/+626 |
| |\ | |||||
| | * | Merge "Plumb display power state through display manager." into klp-modular-dev | Jeff Brown | 2014-04-11 | 36 | -583/+626 |
| | |\ | |||||
| | | * | Plumb display power state through display manager. | Jeff Brown | 2014-04-10 | 36 | -583/+626 |
* | | | | Merge "fix build" | Colin Cross | 2014-04-11 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | fix build | Colin Cross | 2014-04-10 | 1 | -2/+2 |
* | | | | | Merge "Fix support for TouchFeedbackDrawable tint mode" | Alan Viverette | 2014-04-11 | 1 | -15/+47 |
|\ \ \ \ \ | |||||
| * | | | | | Fix support for TouchFeedbackDrawable tint mode | Alan Viverette | 2014-04-10 | 1 | -15/+47 |
* | | | | | | Merge "Add equals, hashCode, and toString methods in TvInputInfo." | Sungsoo Lim | 2014-04-11 | 1 | -0/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add equals, hashCode, and toString methods in TvInputInfo. | Sungsoo Lim | 2014-04-11 | 1 | -0/+28 |
* | | | | | | | Update volume panel | Alan Viverette | 2014-04-10 | 10 | -45/+75 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge "Corp badging for Recents" | Amith Yamasani | 2014-04-11 | 4 | -20/+63 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Corp badging for Recents | Amith Yamasani | 2014-04-10 | 4 | -20/+63 |
* | | | | | | | MediaFrameworkTest: Fix Camera2 API unit test build breakage | Zhijun He | 2014-04-10 | 2 | -37/+96 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge "Update brightness icons to use color attribute" | Alan Viverette | 2014-04-10 | 14 | -10/+49 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update brightness icons to use color attribute | Alan Viverette | 2014-04-10 | 14 | -10/+49 |
* | | | | | | | Merge "MediaFocusControl: fix comment" | Jean-Michel Trivi | 2014-04-10 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | MediaFocusControl: fix comment | Jean-Michel Trivi | 2014-04-10 | 1 | -4/+2 |
* | | | | | | | | Merge "Fix path interpretation on curves" | ztenghui | 2014-04-10 | 1 | -44/+56 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix path interpretation on curves | ztenghui | 2014-04-09 | 1 | -44/+56 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge "Fix build breakage" | Raph Levien | 2014-04-10 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix build breakage | Raph Levien | 2014-04-10 | 1 | -2/+0 |
* | | | | | | | | Merge "Make attachFunctor blocking" | John Reck | 2014-04-10 | 6 | -115/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Make attachFunctor blocking | John Reck | 2014-04-10 | 6 | -115/+9 |
* | | | | | | | | Fix build breakage | Alan Viverette | 2014-04-10 | 2 | -7/+30 |
* | | | | | | | | Merge "Remove sync flush" | John Reck | 2014-04-10 | 5 | -39/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove sync flush | John Reck | 2014-04-10 | 5 | -39/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Further improved NotificationStackScroller" | Selim Cinek | 2014-04-10 | 8 | -34/+290 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Further improved NotificationStackScroller | Selim Cinek | 2014-04-10 | 8 | -34/+290 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Camera2 API: enable burst capture and repeating burst." | Jianing Wei | 2014-04-10 | 7 | -63/+444 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Camera2 API: enable burst capture and repeating burst. | Jianing Wei | 2014-04-10 | 7 | -63/+444 |
* | | | | | | | | | Merge "Cleaning up VectorDrawable" | Alan Viverette | 2014-04-10 | 2 | -149/+100 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cleaning up VectorDrawable | Alan Viverette | 2014-04-10 | 2 | -149/+100 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Adding render stats APIs to UiAutomation (framework)." | Svetoslav | 2014-04-10 | 21 | -18/+1004 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Adding render stats APIs to UiAutomation (framework). | Svetoslav | 2014-04-07 | 21 | -18/+1004 |
* | | | | | | | | | | Merge "support the people extra on the notification object" | Chris Wren | 2014-04-10 | 4 | -1/+244 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | support the people extra on the notification object | Chris Wren | 2014-04-10 | 4 | -1/+244 |
* | | | | | | | | | | am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO ... | Baligh Uddin | 2014-04-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-mod... | Baligh Uddin | 2014-04-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-dev | Baligh Uddin | 2014-04-10 | 6 | -6/+6 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-09 | 6 | -6/+6 |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-04-10 | 56 | -6/+230 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-09 | 56 | -6/+230 |
* | | | | | | | | | | | Merge "Allow encryption when keyguard is set to pattern or no protection" | Paul Lawrence | 2014-04-10 | 2 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Allow encryption when keyguard is set to pattern or no protection | Paul Lawrence | 2014-04-03 | 2 | -6/+9 |
* | | | | | | | | | | | am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest f... | Narayan Kamath | 2014-04-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded... | Narayan Kamath | 2014-04-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" | Narayan Kamath | 2014-04-10 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge "Removed android.debug.JNITest from preloaded-classes" | Narayan Kamath | 2014-04-10 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ |