Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | * | | | | | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] | Deepanshu Gupta | 2014-03-28 | 1 | -3/+5 | |
| | | | | | | | |/ / / / / | ||||||
* | | | | | | | | | | | | | am 43e229a1: (-s ours) am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Me... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | ||||||
| | | | * | | | | | | | | | am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rende... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | ||||||
| | | | | * | | | | | | | | am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO N... | Deepanshu Gupta | 2014-04-16 | 1 | -2/+2 | |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | ||||||
| | | | | | * | | | | | | | am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" in... | Deepanshu Gupta | 2014-04-16 | 1 | -2/+2 | |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | ||||||
| | | | | | | * | | | | | | Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev | Deepanshu Gupta | 2014-04-16 | 1 | -2/+2 | |
| | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | Optimize layout rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-03-28 | 1 | -2/+2 | |
| | | | | | | | |/ / / / / | ||||||
* | | | | | | | | | | | | | Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event" | Wink Saville | 2014-04-16 | 7 | -1/+243 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event | Wink Saville | 2014-04-15 | 7 | -1/+243 | |
* | | | | | | | | | | | | | | Merge "Remove activitystrings.xml from localized resource directories" | Baligh Uddin | 2014-04-16 | 45 | -1620/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Remove activitystrings.xml from localized resource directories | Baligh Uddin | 2014-04-16 | 45 | -1620/+0 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd ... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | am bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE] | 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 | |
* | | | | | | | | | | | | | | am 35d46778: (-s ours) resolved conflicts for merge of ec6676dd to klp-modula... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp | Deepanshu Gupta | 2014-04-16 | 5 | -14/+155 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 5 | -14/+155 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 5 | -14/+155 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 5 | -14/+155 | |
* | | | | | | | | | | | | | | Merge "Stub APIs for network scoring." | Jeff Davidson | 2014-04-16 | 5 | -0/+165 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Stub APIs for network scoring. | Jeff Davidson | 2014-04-16 | 5 | -0/+165 | |
* | | | | | | | | | | | | | | | am 82d5f137: (-s ours) am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu p... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] | 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 f2d085e8: (-s ours) am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rend... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ... | Deepanshu Gupta | 2014-04-16 | 12 | -150/+445 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 12 | -150/+445 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 12 | -150/+445 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 12 | -150/+445 | |
* | | | | | | | | | | | | | | | am 110a05c6: (-s ours) am 2aee0712: am e75477cb: am acf0bce0: Support custom ... | Deepanshu Gupta | 2014-04-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | / / / / / / / / / / | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] | 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 "Data structures for communication with network scorer apps." | Jeff Davidson | 2014-04-16 | 8 | -0/+639 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Data structures for communication with network scorer apps. | Jeff Davidson | 2014-04-16 | 8 | -0/+639 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge "Implement jumpToCurrentState() in VectorDrawable" | Alan Viverette | 2014-04-16 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Implement jumpToCurrentState() in VectorDrawable | Alan Viverette | 2014-04-15 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | Merge "Rename basePkg to opPkg" | Christoph Studer | 2014-04-16 | 9 | -52/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Rename basePkg to opPkg | Christoph Studer | 2014-04-16 | 9 | -52/+47 | |
* | | | | | | | | | | | | | | | | Merge "Fixing the alternate recents transition on landscape views." | Winson Chung | 2014-04-16 | 2 | -19/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fixing the alternate recents transition on landscape views. | Winson Chung | 2014-04-16 | 2 | -19/+50 | |
* | | | | | | | | | | | | | | | | Merge "Revert "Import translations. DO NOT MERGE"" | Baligh Uddin | 2014-04-16 | 56 | -84/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |