summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-1130-200/+1265
|\
| * Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenato...Deepanshu Gupta2015-11-192-4/+6
| |\
| | * Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""Deepanshu Gupta2015-11-192-4/+6
| * | Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into...Deepanshu Gupta2015-11-192-6/+4
| |\ \ | | |/
| | * Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"Deepanshu Gupta2015-11-192-6/+4
| * | Merge "Fix delegation of methods within inner static classes" into mnc-ub-devDiego Perez2015-11-175-5/+125
| |\ \
| | * | Fix delegation of methods within inner static classesDiego Perez2015-11-135-5/+125
| * | | Revert "LayoutLib: Fix true transparency in status bar."Deepanshu Gupta2015-11-174-16/+12
| * | | Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-devDeepanshu Gupta2015-11-171-10/+9
| |\ \ \
| | * | | AppCompatActionBar: use findClass to test presenceDeepanshu Gupta2015-11-171-10/+9
| * | | | LayoutLib: IntelliJ changed project files.Deepanshu Gupta2015-11-171-3/+4
| |/ / /
| * | | WindowDecorActionBar name change fix.Deepanshu Gupta2015-11-161-3/+20
| * | | Improve error reporting on Exceptions in fw views.Deepanshu Gupta2015-11-122-29/+91
| |/ /
| * | Fix Switch colorsDeepanshu Gupta2015-11-051-4/+6
| * | Merge "Remove auto-boxing during the inflate" into mnc-ub-devDiego Perez2015-11-042-5/+5
| |\ \ | | |/ | |/|
| | * Remove auto-boxing during the inflateDiego Perez2015-11-032-5/+5
| * | Update StaticLayout_Delegate to use new nLoadHyphenatorDiego Perez2015-11-042-4/+6
| |/
| * LayoutLib: Fix android:dependency for preferences.Deepanshu Gupta2015-10-091-5/+2
| * LayoutLib: Fix ring rendering.Deepanshu Gupta2015-10-072-0/+74
| * Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-devDeepanshu Gupta2015-10-071-0/+8
| |\
| | * Skip drawing empty shapes to keep Apple JRE happy.Deepanshu Gupta2015-10-071-0/+8
| * | Implement Path.approximate and add PathMeasure supportDiego Perez2015-10-074-104/+246
| |/
| * LayoutLib: Fix bitmap scaling.Deepanshu Gupta2015-10-052-1/+8
| * Merge "Don't break error string (easier grepping)" into mnc-ub-devDeepanshu Gupta2015-09-301-2/+1
| |\
| | * Don't break error string (easier grepping)Deepanshu Gupta2015-09-301-2/+1
| * | Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-devDiego Perez2015-09-302-19/+61
| |\ \
| | * | Reduce the amount of allocations on Paint_DelegateDiego Perez2015-09-302-19/+61
| * | | Merge "Support databinding in listitem layouts." into mnc-ub-devDeepanshu Gupta2015-09-306-7/+579
| |\ \ \ | | |/ / | |/| / | | |/
| | * Support databinding in listitem layouts.Deepanshu Gupta2015-09-296-7/+579
| * | Fix TypedArray.getTextArray()Deepanshu Gupta2015-09-232-9/+16
| |/
| * Avoid calling scrollBy(0,0) on renderDiego Perez2015-09-221-4/+0
| * am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce:...Deepanshu Gupta2015-09-021-19/+27
| |\
| * | Fix android:theme parsing for custom views.Deepanshu Gupta2015-08-281-2/+20
| * | LayoutLib: Fix true transparency in status bar.Deepanshu Gupta2015-08-264-12/+16
* | | Udpate instrumentation codeWilliam Clark2015-11-301-0/+2
* | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-19/+27
|\ \ \ | | |/ | |/|
| * | am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-021-19/+27
| |\ \ | | |/ | |/|
| | * am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| | |\
| | | * LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| | * | am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]Deepanshu Gupta2015-08-269-0/+0
| | |\ \ | | | |/
| | | * LayoutLib: Update golden test images. [DO NOT MERGE]Deepanshu Gupta2015-08-259-0/+0
| | * | am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]Deepanshu Gupta2015-08-263-1/+100
| | |\ \ | | | |/
| | | * An ugly hack to render CalendarView. [DO NOT MERGE]Deepanshu Gupta2015-08-253-1/+100
| | * | am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO...Deepanshu Gupta2015-08-264-12/+16
| | |\ \ | | | |/
| | | * LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]Deepanshu Gupta2015-08-254-12/+16
| | * | am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String...Deepanshu Gupta2015-08-261-5/+2
| | |\ \ | | | |/
| | | * Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]Deepanshu Gupta2015-08-251-5/+2
| | * | am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]Deepanshu Gupta2015-08-261-0/+1
| | |\ \ | | | |/
| | | * Fix layout mirroring. [DO NOT MERGE]Deepanshu Gupta2015-08-251-0/+1
| | * | am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [D...Deepanshu Gupta2015-08-261-1/+1
| | |\ \ | | | |/