| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recen... | Elliott Hughes | 2014-04-18 | 1 | -1/+1 |
| |\ | |||||
| | * | am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocal... | Elliott Hughes | 2014-04-18 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fix warning introduced by recent psuedolocalizer change. | Elliott Hughes | 2014-04-18 | 1 | -1/+1 |
| * | | | Merge "Add DisplayManager service to BridgeContext" | Deepanshu Gupta | 2014-04-18 | 1 | -0/+7 |
| |\ \ \ | |||||
| | * | | | Add DisplayManager service to BridgeContext | Deepanshu Gupta | 2014-04-18 | 1 | -0/+7 |
| * | | | | Merge "Add isElegantHeight to Layoutlib" | Deepanshu Gupta | 2014-04-18 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| | * | | | | Add isElegantHeight to Layoutlib | Deepanshu Gupta | 2014-04-18 | 1 | -0/+10 |
| | |/ / / | |||||
| * | | | | resolved conflicts for merge of 56ca8219 to master | Elliott Hughes | 2014-04-18 | 9 | -104/+335 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| | * | | resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp | Elliott Hughes | 2014-04-18 | 9 | -104/+335 |
| | |\ \ | | |/ | |||||
| | | * | Pseudolocalizer improvements. | Anton Krumin | 2014-04-09 | 9 | -105/+336 |
| | * | | am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev | Deepanshu Gupta | 2014-04-16 | 3 | -5/+15 |
| | |\ \ | |||||
| | | * \ | resolved conflicts for merge of 0e2049cd to klp-modular-dev | Deepanshu Gupta | 2014-04-16 | 3 | -5/+15 |
| | | |\ \ | |||||
| | | | * | | Layoutlib tests now check methods return value [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 3 | -5/+15 |
| | * | | | | resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp | Deepanshu Gupta | 2014-04-16 | 4 | -14/+150 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 4 | -14/+150 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 4 | -14/+150 |
| | * | | | | am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in ... | Deepanshu Gupta | 2014-04-16 | 6 | -93/+399 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO... | Deepanshu Gupta | 2014-04-16 | 6 | -93/+399 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 6 | -93/+399 |
| | * | | | | am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ... | Deepanshu Gupta | 2014-04-16 | 10 | -145/+429 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 10 | -145/+429 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 10 | -145/+429 |
| | * | | | | am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerD... | Deepanshu Gupta | 2014-04-16 | 1 | -0/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT... | Deepanshu Gupta | 2014-04-16 | 1 | -0/+1 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Support custom views using TimePickerDialog [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 1 | -0/+1 |
| * | | | | | Merge "Add overflow menu popup for Action Bar in Layoutlib" | Deepanshu Gupta | 2014-04-14 | 5 | -93/+385 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add overflow menu popup for Action Bar in Layoutlib | Deepanshu Gupta | 2014-04-14 | 5 | -93/+385 |
| * | | | | | | Merge "Action bar rendering in layoutlib" | Deepanshu Gupta | 2014-04-14 | 10 | -145/+429 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Action bar rendering in layoutlib | Deepanshu Gupta | 2014-04-10 | 10 | -145/+429 |
| * | | | | | | Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'" | Dan Sandler | 2014-04-14 | 1 | -2/+10 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage. | Narayan Kamath | 2014-04-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | resolved conflicts for merge of 90b39aba to master-lockscreen-dev | Colin Cross | 2014-04-10 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | resolved conflicts for merge of 6be2f952 to master-lockscreen-dev | Svetoslav | 2014-04-10 | 1 | -10/+15 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib" | Deepanshu Gupta | 2014-04-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | | am 733217e6: Merge "Update layoutlib create README" | Deepanshu Gupta | 2014-04-09 | 1 | -138/+128 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 6e5e160f: Merge "Make layoutlib load on Java 7 VM" | Deepanshu Gupta | 2014-04-09 | 2 | -1/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 30f05c29: Merge "Fix sdk build." | Ying Wang | 2014-04-08 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am e9abc279: Merge "Fix theme/style resolution in Layoutlib" | Deepanshu Gupta | 2014-04-07 | 4 | -14/+145 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am 1cb3e814: Merge "Fix sdk build" | Deepanshu Gupta | 2014-04-05 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATC... | John Spurlock | 2014-04-04 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev | Jorim Jaggi | 2014-04-02 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Wait for Keyguard to be drawn after boot. | Jorim Jaggi | 2014-04-02 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | am eaa8a6b7: am a5c8d586: Fix build break due to layout lib. | Jeff Brown | 2014-04-12 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | am a5c8d586: Fix build break due to layout lib. | Jeff Brown | 2014-04-12 | 1 | -5/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Fix build break due to layout lib. | Jeff Brown | 2014-04-11 | 1 | -5/+0 |
| | * | | | | | | | | | | | | | | | am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO ... | Deepanshu Gupta | 2014-04-12 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-12 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | Add DatePickerDialog to layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | am 73e78c75: am af42a91c: Fix another build breakage. | Narayan Kamath | 2014-04-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | am af42a91c: Fix another build breakage. | Narayan Kamath | 2014-04-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |