summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1130-200/+1265
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * Merge "Revert "Revert "Update StaticLayout_Delegate to use new ↵Deepanshu Gupta2015-11-192-4/+6
| |\ | | | | | | | | | nLoadHyphenator""" into mnc-ub-dev
| | * Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""Deepanshu Gupta2015-11-192-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65a834980cdbb9407a3f27e48cd0a8c472182cd6. The original revert was only for cherry-pick to release branch. Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
| * | Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" ↵Deepanshu Gupta2015-11-192-6/+4
| |\ \ | | |/ | | | | | | into mnc-ub-dev
| | * Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"Deepanshu Gupta2015-11-192-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9. The revert is only for cherry-pick back to mnc-sdk-release. Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, delegation of inner static classes methods is broken since the rewritten method tries to pass an instance to the outer class. This updates the method generation to only pass the reference if the inner class is not static. Change-Id: I8493929cafdbd80968989b422af0f956fa65681a
| * | | Revert "LayoutLib: Fix true transparency in status bar."Deepanshu Gupta2015-11-174-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4eb298a941c3f465944b63f1a06518e911681c89. Even though this is techinically closer to what the framework does, the fix is not complete. As a result, it looks worse when using AppCompat themes. Revert the change for the release. Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To test the presence of WindowDecorActionBar class, use findClass() instead of loadClass() which logs warnings. Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
| * | | | LayoutLib: IntelliJ changed project files.Deepanshu Gupta2015-11-171-3/+4
| |/ / / | | | | | | | | | | | | Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
| * | | WindowDecorActionBar name change fix.Deepanshu Gupta2015-11-161-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536, WindowDecorActionBar's package name was changed. This breaks layoutlib. Fix the issue by checking both package names when loading the class. Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
| * | | Improve error reporting on Exceptions in fw views.Deepanshu Gupta2015-11-122-29/+91
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there's an exception during the inflation of a framework view (for example invalid attributes), report the exception correctly. The earlier behaviour assumed the exception to be a ClassNotFoundException and tried to load it from the user's project. This is not longer the case. Also, update the MockView class to a FrameLayout with a single TextView. This means that the MockView is a ViewGroup and will not choke when someone attempts to add a View to it (although, the view will be silently dropped). Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728
| * | Fix Switch colorsDeepanshu Gupta2015-11-051-4/+6
| | | | | | | | | | | | | | | | | | | | | The conversion of the PorterDuff mode from int to enum was incorrect resulting in the wrong PorterDuff Mode being used. Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
| * | 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
| | | | | | | | | | | | Change-Id: I3f9ba5d78363f878fa0c58ca8cbf736bd43fe1c0
| * | Update StaticLayout_Delegate to use new nLoadHyphenatorDiego Perez2015-11-042-4/+6
| |/ | | | | | | | | | | Small fix to update call parameters Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
| * LayoutLib: Fix android:dependency for preferences.Deepanshu Gupta2015-10-091-5/+2
| | | | | | | | | | Bug: http://b.android.com/189314 Change-Id: I229632d11a2529e865f3f2e8eca3a78b47ad462c
| * LayoutLib: Fix ring rendering.Deepanshu Gupta2015-10-072-0/+74
| | | | | | | | | | Bug: http://b.android.com/65503 Change-Id: I6ed901703cffee345f3083ea3ddeb52a28f4ac64
| * 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
| | | | | | | | | | | | | | | Bug: http://b.android.com/178278 Change-Id: I693912678ed79e9c6690560b618a605da5a807c6
| * | Implement Path.approximate and add PathMeasure supportDiego Perez2015-10-074-104/+246
| |/ | | | | | | | | | | | | | | | | | | | | PathMeasure is needed to use the trimPath* properties in drawables. These properties are used in the vector drawable for indeterminate progress bars in Material so this is needed to be able to render them correctly in the preview. PathMeasure makes use of Path.approximate to calculate which segments to paint. Change-Id: Ic513f0a30a6aac0317f7c13cd75e9154c37405c8
| * LayoutLib: Fix bitmap scaling.Deepanshu Gupta2015-10-052-1/+8
| | | | | | | | | | Bug: http://b.android.com/187939 Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
| * 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
| | | | | | | | | | | | Change-Id: If52097ba90481644707dd0323ec63ca3ddf0986b
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the text properties of the Paint object are updated, or when .set() is called, updateFontObject will be called. This method is currently at the top of the methods for number of allocations. This CL reduces the number of calls to updateFontObject by a 90%, reducing the number of Font allocations. Change-Id: I3e232f9e6e230da8ecdd19921faadf2d3f4ff763
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Add a wrapper around the PullParser to support stripping out databinding parts. Bug: http://b.android.com/187428 Change-Id: I88080d8f4108cb5ae27a137ad20c5dd7d516f3ea
| * | Fix TypedArray.getTextArray()Deepanshu Gupta2015-09-232-9/+16
| |/ | | | | | | Change-Id: Ic55b52840892fbf2a4258ba97ed31ca0283da8ed
| * Avoid calling scrollBy(0,0) on renderDiego Perez2015-09-221-4/+0
| | | | | | | | | | | | | | | | | | | | Usually scrollBy(0, 0) won't have any effect but when called on the NumberPicker but, in some cases, it seems to cause an endless loop. When called from layoutlib, this will hold the read lock causing all operations trying to acquire the write lock to block forever. Bug: http://b.android.com/182506 Change-Id: Ib25427d3f32d804d1c481d979795eee71fbdbc6d
| * am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am ↵Deepanshu Gupta2015-09-021-19/+27
| |\ | | | | | | | | | | | | | | | | | | eb26f5ce: LayoutLib: Fix typedArray caching. * commit '7209945fd38d22078b2fd208abe0aa976c311dde': LayoutLib: Fix typedArray caching.
| * | Fix android:theme parsing for custom views.Deepanshu Gupta2015-08-281-2/+20
| | | | | | | | | | | | Change-Id: Iba83ba1d2e4a96461cc298a759e32e4e51e311a0
| * | LayoutLib: Fix true transparency in status bar.Deepanshu Gupta2015-08-264-12/+16
| | | | | | | | | | | | Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782
* | | Udpate instrumentation codeWilliam Clark2015-11-301-0/+2
| | | | | | | | | | | | | | | | | | Added changes to support new features in QSSP Change-Id: I92c0a4eb3cb5363fbf08185f25644a3202c38788
* | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-19/+27
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * | am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-021-19/+27
| |\ \ | | |/ | |/| | | | | | | * commit 'eb54172719db60740a0b8dde6380db54d4006159': LayoutLib: Fix typedArray caching.
| | * am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| | |\ | | | | | | | | | | | | | | | | * commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a': LayoutLib: Fix typedArray caching.
| | | * LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The typedArray depends on the current context (more specifically, the themes set on the context). The fact was ignored in the caching of the typedArray and caused the android:theme attribute to be ignored in certain cases. Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0
| | * | am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]Deepanshu Gupta2015-08-269-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '4299409775ffd5cb70a8970c15807f33fc8b08d4': LayoutLib: Update golden test images. [DO NOT MERGE]
| | | * LayoutLib: Update golden test images. [DO NOT MERGE]Deepanshu Gupta2015-08-259-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Also update the generated classes from the MyApplication test project. Change-Id: I97bce3737c0cb528a61fa652988a2edb09ec885d
| | * | am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]Deepanshu Gupta2015-08-263-1/+100
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '2b99b5da279a7cbf1f6412a8ac7d6bfdd82e26c6': An ugly hack to render CalendarView. [DO NOT MERGE]
| | | * An ugly hack to render CalendarView. [DO NOT MERGE]Deepanshu Gupta2015-08-253-1/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an ugly hack to switch the field android.widget.SimpleMonthView.mDayFormatter from java.text.SimpleDateFormat to icu's version of the same class. The hack is only for the L version of the LayoutLib. It's done in a better way in M and even better in N. Change-Id: Id84a1d32040211c46b20cdaf3a77119676e748b6
| | * | am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. ↵Deepanshu Gupta2015-08-264-12/+16
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit '7eb81868c338fc78139592ac81845c080f53b1c5': LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
| | | * LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]Deepanshu Gupta2015-08-254-12/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782 (cherry picked from commit f9662c006c650c9f61f19a5e1ea4a76640eb85ca)
| | * | am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty ↵Deepanshu Gupta2015-08-261-5/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | String. [DO NOT MERGE] * commit '9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b': Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
| | | * Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]Deepanshu Gupta2015-08-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XML editor already warns about the empty strings in places where an int value is required. There's no need to show another warning for it in the rendering panel. Also, the rendering might have also failed when the empty string is encountered. Try an continue the rendering, because no rendering state is really bad. Change-Id: I85106f37e4462f237e85f0b065b4ce8a4bfabf4d (cherry picked from commit 0437cac76c24dc6cac7b530e6d80f789565550ec)
| | * | am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]Deepanshu Gupta2015-08-261-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'c43506fc2dbe3fea6885e74ac8c67b91a0a644ff': Fix layout mirroring. [DO NOT MERGE]
| | | * Fix layout mirroring. [DO NOT MERGE]Deepanshu Gupta2015-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b (cherry picked from commit a9090705efcc44f015486944e5aeb926173a7968)
| | * | am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. ↵Deepanshu Gupta2015-08-261-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit '918e62f1cb7e5802cfb7435dd606380fa5d3a278': Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
generated by cgit v1.1 at 2025-01-08 18:01:56 +0000