summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-298-68/+196
|\
| * am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| |\
| * \ resolved conflicts for merge of c76345a3 to klp-dev-plus-aospDeepanshu Gupta2014-03-122-4/+20
| |\ \
| * \ \ am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-03-111-5/+0
| |\ \ \
| * \ \ \ am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...Narayan Kamath2014-03-061-4/+4
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aospBrian Carlstrom2014-03-063-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMA...Xavier Ducrohet2014-02-201-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp...Xavier Ducrohet2014-02-201-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-02-191-0/+3
| * | | | | | | | am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in l...Deepanshu Gupta2014-02-201-3/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-02-191-3/+5
| | |/ / / / / /
| * | | | | | | am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Improve text rendering and measurement.Deepanshu Gupta2014-02-061-40/+45
| * | | | | | | am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-devDeepanshu Gupta2014-02-061-2/+101
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add methods for Time_Delegate" into klp-devDeepanshu Gupta2014-02-061-2/+101
| | |\ \ \ \ \ \
| | | * | | | | | Add methods for Time_DelegateDeepanshu Gupta2014-01-311-2/+101
| * | | | | | | | am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into...Deepanshu Gupta2014-02-061-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Optimize layout rendering in layoutlib" into klp-devDeepanshu Gupta2014-02-061-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Optimize layout rendering in layoutlibDeepanshu Gupta2014-01-201-2/+2
| | | |/ / / / / /
| * | | | | | | | am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into kl...Deepanshu Gupta2014-02-063-41/+60
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix the measurement of text bounds." into klp-devDeepanshu Gupta2014-02-063-41/+60
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix the measurement of text bounds.Deepanshu Gupta2014-01-073-41/+60
| | | |/ / / / / /
| * | | | | | | | am d5129e75: am 8a892279: Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-061-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-051-2/+2
| | |/ / / / / /
| * | | | | | | resolved conflicts for merge of b82b2f98 to klp-dev-plus-aospNarayan Kamath2014-01-2838-344/+344
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Update delegate methods in layoutlib.Deepanshu Gupta2013-11-255-89/+25
| * | | | | | | Update ICU_Delegate methods. DO NOT MERGEDeepanshu Gupta2013-11-181-2/+2
* | | | | | | | Add missing ICU_Delegate methods.Deepanshu Gupta2014-04-211-0/+10
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fix layoutlib build.Narayan Kamath2014-03-141-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix the delegate method signatures in LayoutLibDeepanshu Gupta2014-03-056-94/+46
| |_|_|_|/ |/| | | |
* | | | | Update layoutlib method for SystemClockDeepanshu Gupta2014-02-241-5/+0
| |_|_|/ |/| | |
* | | | Merge "AArch64: Use of long for pointers in PropertyValuesHolder"Narayan Kamath2014-01-301-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | AArch64: Use of long for pointers in PropertyValuesHolderAshok Bhat2014-01-291-4/+4
| | |/ | |/|
* | | Fix a few more delegate methods in layoutlib.Narayan Kamath2014-01-293-4/+4
|/ /
* | Track 64bit changes to android/graphics.Narayan Kamath2014-01-2838-344/+344
|/
* Fix NPE in layoutlib. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+0
* Update changed delegate method in Bitmap_Delegate. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+2
* Relayout windows that handle their own config change.Craig Mautner2013-11-121-1/+1
* Fix text size in Fake Action BarDeepanshu Gupta2013-11-081-1/+1
* Add a method to set a list of uids for a wake lockMarco Nelissen2013-10-251-0/+5
* Merge "Fix layoutlib for KK" into klp-devDeepanshu Gupta2013-10-184-15/+50
|\
| * Fix layoutlib for KKDeepanshu Gupta2013-10-164-15/+50
* | Layoutlib: Add DateIntervalFormat_Delegate required by CalendarViewDeepanshu Gupta2013-10-171-0/+70
* | am 873c76d0: am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the ri...Deepanshu Gupta2013-10-171-0/+61
|\ \
| * \ Merge "Fix CalendarView to show the right month and year label." into jb-mr2-devDeepanshu Gupta2013-10-171-0/+61
| |\ \
| | * | Fix CalendarView to show the right month and year label.Deepanshu Gupta2013-10-161-0/+61
* | | | am 92a80b18: am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon...Deepanshu Gupta2013-10-178-7/+6
|\ \ \ \ | |/ / /
| * | | Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-devDeepanshu Gupta2013-10-178-7/+6
| |\ \ \ | | |/ / | |/| |
| | * | Layoutlib: Update the wifi icon in the status bar.Deepanshu Gupta2013-10-148-7/+6
* | | | am 9568ad39: am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in ...Deepanshu Gupta2013-10-171-2/+8
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |