Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Retry "Always show auxiliary subtypes from NavBar keyboard icon." | Seigo Nonaka | 2015-05-06 | 7 | -15/+70 |
* | Merge "Revert "Remove incomplete media router API."" into mnc-dev | Bart Sears | 2015-05-07 | 6 | -0/+1510 |
|\ | |||||
| * | Revert "Remove incomplete media router API." | Bart Sears | 2015-05-07 | 6 | -0/+1510 |
* | | am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to ... | Diego Perez | 2015-05-07 | 1 | -0/+4 |
|\ \ | |||||
| * \ | am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a draw... | Diego Perez | 2015-05-07 | 2 | -6/+56 |
| |\ \ | |||||
| | * \ | am 33e54563: am 4b125836: Merge "Added function to render a drawable in all a... | Diego Perez | 2015-05-07 | 2 | -6/+56 |
| | |\ \ | |||||
| | | * \ | am 4b125836: Merge "Added function to render a drawable in all available stat... | Diego Perez | 2015-05-07 | 2 | -6/+56 |
| | | |\ \ | |||||
| | | | * \ | Merge "Added function to render a drawable in all available states" into lmp-... | Diego Perez | 2015-05-07 | 2 | -6/+56 |
| | | | |\ \ | |||||
| | | | | * | | Added function to render a drawable in all available states | Andrew Shulaev | 2015-05-07 | 2 | -6/+56 |
* | | | | | | | Merge "Remove incomplete media router API." into mnc-dev | Jeff Brown | 2015-05-07 | 6 | -1510/+0 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Remove incomplete media router API. | Jeff Brown | 2015-05-06 | 6 | -1510/+0 |
* | | | | | | | Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" in... | Bart Sears | 2015-05-07 | 6 | -68/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Always show auxiliary subtypes from NavBar keyboard icon." | Bart Sears | 2015-05-07 | 6 | -68/+14 |
* | | | | | | | | Merge changes from topic 'mr' into mnc-dev | Jeff Brown | 2015-05-07 | 28 | -4271/+3 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. | Jeff Brown | 2015-05-06 | 2 | -16/+1 |
| * | | | | | | | Revert "Initial draft of new MediaRouter APIs." | Jeff Brown | 2015-05-06 | 27 | -4255/+2 |
* | | | | | | | | am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,I... | Diego Perez | 2015-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into... | Diego Perez | 2015-05-07 | 3 | -7/+36 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev | Diego Perez | 2015-05-07 | 3 | -7/+36 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | * | | | | | am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev | Diego Perez | 2015-05-07 | 3 | -7/+36 |
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | * | | | | Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev | Diego Perez | 2015-05-07 | 3 | -7/+36 |
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | | * | | | Add new parameter to the render method to allow forcing a measure pass. | Diego Perez | 2015-04-28 | 2 | -2/+5 |
| | | | | * | | | Avoid caching mImage on the main render loop and use clipping. | Diego Perez | 2015-04-22 | 2 | -5/+31 |
* | | | | | | | | am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and na... | Diego Perez | 2015-05-07 | 3 | -2/+36 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars... | Diego Perez | 2015-05-07 | 3 | -2/+36 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and ... | Diego Perez | 2015-05-07 | 3 | -2/+36 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | am 263e6dfa: Merge "Make status and navigation bars widgets and usable from l... | Diego Perez | 2015-05-07 | 3 | -2/+36 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge "Make status and navigation bars widgets and usable from layouts" into ... | Diego Perez | 2015-05-06 | 3 | -2/+36 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Make status and navigation bars widgets and usable from layouts | Diego Perez | 2015-04-21 | 3 | -2/+36 |
| | | | | |/ / / | |||||
* | | | | | | | | am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to ... | Diego Perez | 2015-05-07 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBar... | Diego Perez | 2015-05-07 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme a... | Diego Perez | 2015-05-07 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" int... | Diego Perez | 2015-05-06 | 1 | -1/+2 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev | Diego Perez | 2015-05-06 | 1 | -1/+2 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Move StatusBar to use statusBarColor theme attribute | Diego Perez | 2015-04-30 | 1 | -1/+2 |
| | | | | |/ / / | |||||
* | | | | | | | | am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders ... | Diego Perez | 2015-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color m... | Diego Perez | 2015-05-07 | 4 | -8/+19 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatib... | Diego Perez | 2015-05-07 | 4 | -8/+19 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | am bc47abe4: Merge "Make sure shaders use a color model compatible with the d... | Diego Perez | 2015-05-06 | 4 | -8/+19 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge "Make sure shaders use a color model compatible with the destination." ... | Diego Perez | 2015-05-06 | 4 | -8/+19 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Make sure shaders use a color model compatible with the destination. | Diego Perez | 2015-04-15 | 4 | -8/+19 |
* | | | | | | | | | am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tes... | Deepanshu Gupta | 2015-05-07 | 13 | -14/+467 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp... | Deepanshu Gupta | 2015-05-07 | 13 | -14/+467 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-05-07 | 13 | -14/+467 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-05-06 | 13 | -14/+467 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | * | | | | | Merge "More layoutlib tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-05-06 | 13 | -14/+467 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | More layoutlib tests. | Deepanshu Gupta | 2015-04-16 | 13 | -14/+467 |
* | | | | | | | | | | resolved conflicts for merge of a663e012 to mnc-dev | Deepanshu Gupta | 2015-05-06 | 4 | -129/+50 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: bett... | Deepanshu Gupta | 2015-05-07 | 6 | -168/+93 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs.... | Deepanshu Gupta | 2015-05-07 | 6 | -168/+93 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / |