summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src
Commit message (Expand)AuthorAgeFilesLines
* am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff...Deepanshu Gupta2015-03-022-517/+37
|\
| * am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| |\
| | * am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | |\
| | | * Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | |\
| | | | * Correct PorterDuff filters.Deepanshu Gupta2015-02-262-517/+37
* | | | | am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg f...Deepanshu Gupta2015-03-021-3/+13
|\ \ \ \ \ | |/ / / /
| * | | | am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal C...Deepanshu Gupta2015-03-021-3/+13
| |\ \ \ \ | | |/ / /
| | * | | am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into l...Deepanshu Gupta2015-03-021-3/+13
| | |\ \ \ | | | |/ /
| | | * | Merge "Better error msg for StateList/Hexadecimal Color." into lmp-devDeepanshu Gupta2015-03-021-3/+13
| | | |\ \ | | | | |/
| | | | * Better error msg for StateList/Hexadecimal Color.Deepanshu Gupta2015-02-231-3/+13
* | | | | am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-devDeepanshu Gupta2015-03-021-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | Add status bar time for 5.1Deepanshu Gupta2015-02-261-2/+5
* | | | | Merge "Hold a wake lock while dozing when display updates are pending." into ...Joe LaPenna2015-02-241-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Hold a wake lock while dozing when display updates are pending.Jeff Brown2015-02-201-0/+5
* | | | | am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included la...Deepanshu Gupta2015-02-231-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into ...Deepanshu Gupta2015-02-231-1/+1
| |\ \ \ | | |/ /
| | * | Set forceFramework correctly for included layouts.Deepanshu Gupta2015-02-231-1/+1
| | |/
* | | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-174-20/+126
|\ \ \ | |/ /
| * | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-134-20/+126
| |\ \ | | |/
| | * Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-134-20/+126
| | |\
| | | * Add Asset management support for fonts.Deepanshu Gupta2015-02-034-20/+126
* | | | am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp...Diego Perez2015-02-171-2/+7
|\ \ \ \ | |/ / /
| * | | am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp...Diego Perez2015-02-131-2/+7
| |\ \ \ | | |/ /
| | * | Do not paint shadow if outside of the clip areaDiego Perez2015-02-041-2/+7
* | | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
|\ \ \ \ | |/ / /
| * | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| |\ \ \ | | |/ /
| | * | Limited AppCompat supportDeepanshu Gupta2015-01-285-124/+452
* | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
|\ \ \ \ | |/ / /
| * | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| |\ \ \ | | |/ /
| | * | Resource resolution fixes.Deepanshu Gupta2015-01-152-8/+24
| | |/
* | | am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case...Deepanshu Gupta2015-01-101-13/+23
|\ \ \ | |/ /
| * | am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to...Deepanshu Gupta2015-01-101-13/+23
| |\ \ | | |/
| | * am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ...Deepanshu Gupta2015-01-101-13/+23
| | |\
| | | * am 74147527: am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | |\
| | | | * Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | * Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| | | | * Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-09-041-0/+4
| | | | |\
| | | | | * Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| | | | * | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| | | | |/
| | | | * Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-151-1/+1
| | | * | Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-091-0/+36
| | | * | LayoutLib: Use ICU's line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-081-0/+55
| | | * | Resource resolution bug fix. [DO NOT MERGE]Deepanshu Gupta2014-10-011-2/+1
| | | * | Add testing framework to LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-10-011-3/+2
| | | * | Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| | | * | Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modula...Deepanshu Gupta2014-09-041-0/+4
| | | |\ \
| | | | * | Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| | | * | | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| | | |/ /
| | | * | Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-161-1/+1
| | | * | am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2:...Deepanshu Gupta2014-08-062-48/+106
| | | |\ \ | | | | |/