summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Retry "Always show auxiliary subtypes from NavBar keyboard icon."Seigo Nonaka2015-05-067-15/+70
* Merge "Revert "Remove incomplete media router API."" into mnc-devBart Sears2015-05-076-0/+1510
|\
| * Revert "Remove incomplete media router API."Bart Sears2015-05-076-0/+1510
* | am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to ...Diego Perez2015-05-071-0/+4
|\ \
| * \ am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a draw...Diego Perez2015-05-072-6/+56
| |\ \
| | * \ am 33e54563: am 4b125836: Merge "Added function to render a drawable in all a...Diego Perez2015-05-072-6/+56
| | |\ \
| | | * \ am 4b125836: Merge "Added function to render a drawable in all available stat...Diego Perez2015-05-072-6/+56
| | | |\ \
| | | | * \ Merge "Added function to render a drawable in all available states" into lmp-...Diego Perez2015-05-072-6/+56
| | | | |\ \
| | | | | * | Added function to render a drawable in all available statesAndrew Shulaev2015-05-072-6/+56
* | | | | | | Merge "Remove incomplete media router API." into mnc-devJeff Brown2015-05-076-1510/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Remove incomplete media router API.Jeff Brown2015-05-066-1510/+0
* | | | | | | Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" in...Bart Sears2015-05-076-68/+14
|\ \ \ \ \ \ \
| * | | | | | | Revert "Always show auxiliary subtypes from NavBar keyboard icon."Bart Sears2015-05-076-68/+14
* | | | | | | | Merge changes from topic 'mr' into mnc-devJeff Brown2015-05-0728-4271/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.Jeff Brown2015-05-062-16/+1
| * | | | | | | Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-0627-4255/+2
* | | | | | | | am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,I...Diego Perez2015-05-070-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into...Diego Perez2015-05-073-7/+36
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-devDiego Perez2015-05-073-7/+36
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-devDiego Perez2015-05-073-7/+36
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge changes I60c09f33,Ie0134c2b into lmp-mr1-devDiego Perez2015-05-073-7/+36
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | | * | | Add new parameter to the render method to allow forcing a measure pass.Diego Perez2015-04-282-2/+5
| | | | | * | | Avoid caching mImage on the main render loop and use clipping.Diego Perez2015-04-222-5/+31
* | | | | | | | am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and na...Diego Perez2015-05-073-2/+36
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars...Diego Perez2015-05-073-2/+36
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and ...Diego Perez2015-05-073-2/+36
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 263e6dfa: Merge "Make status and navigation bars widgets and usable from l...Diego Perez2015-05-073-2/+36
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Make status and navigation bars widgets and usable from layouts" into ...Diego Perez2015-05-063-2/+36
| | | | |\ \ \ \
| | | | | * | | | Make status and navigation bars widgets and usable from layoutsDiego Perez2015-04-213-2/+36
| | | | | |/ / /
* | | | | | | | am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to ...Diego Perez2015-05-071-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBar...Diego Perez2015-05-071-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme a...Diego Perez2015-05-071-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" int...Diego Perez2015-05-061-1/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-devDiego Perez2015-05-061-1/+2
| | | | |\ \ \ \
| | | | | * | | | Move StatusBar to use statusBarColor theme attributeDiego Perez2015-04-301-1/+2
| | | | | |/ / /
* | | | | | | | am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders ...Diego Perez2015-05-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color m...Diego Perez2015-05-074-8/+19
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatib...Diego Perez2015-05-074-8/+19
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am bc47abe4: Merge "Make sure shaders use a color model compatible with the d...Diego Perez2015-05-064-8/+19
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Make sure shaders use a color model compatible with the destination." ...Diego Perez2015-05-064-8/+19
| | | | |\ \ \ \
| | | | | * | | | Make sure shaders use a color model compatible with the destination.Diego Perez2015-04-154-8/+19
* | | | | | | | | am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tes...Deepanshu Gupta2015-05-0713-14/+467
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp...Deepanshu Gupta2015-05-0713-14/+467
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-devDeepanshu Gupta2015-05-0713-14/+467
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-devDeepanshu Gupta2015-05-0613-14/+467
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge "More layoutlib tests." into lmp-mr1-devDeepanshu Gupta2015-05-0613-14/+467
| | | | |\ \ \ \ \
| | | | | * | | | | More layoutlib tests.Deepanshu Gupta2015-04-1613-14/+467
* | | | | | | | | | resolved conflicts for merge of a663e012 to mnc-devDeepanshu Gupta2015-05-064-129/+50
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: bett...Deepanshu Gupta2015-05-076-168/+93
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs....Deepanshu Gupta2015-05-076-168/+93
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /