summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-073-3/+5
|\ | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:45 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * Add bound checks to utf16_to_utf8Sergio Giro2016-07-213-3/+5
| | | | | | | | | | | | | | Test: ran libaapt2_tests64 Bug: 29250543 Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3 (cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
* | AIDL: Add option to generate No-Op methodsLuis Vidal2016-07-156-8/+115
| | | | | | | | | | | | | | Add the option to generate a default (no-op) implementation of an interface Change-Id: I2631e93c8b85e056cf928e9592342dc4466f293e
* | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1131-351/+1550
|\ \ | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * \ DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2Adam Lesinski2015-12-161-151/+285
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 8c9209183f * commit '8c9209183fa67953bebe1adb5dfb529c1b6273f0': DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
| | * | DO NOT MERGE: AAPT: Dump uses-permission-sdk-23Adam Lesinski2015-12-161-151/+285
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include <uses-permission-sdk-23> permissions in dump badging and dump permissions. This will also add implied features for that permission, marked as -sdk-23 features. Ex: uses-permission: name='android.permission.ACCESS_FINE_LOCATION' uses-permission-sdk-23: name='android.permission.CAMERA' feature-group: label='' uses-feature: name='android.hardware.location' uses-implied-feature: name='android.hardware.location' reason='...' uses-feature-sdk-23: name='android.hardware.camera' uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...' Bug:24939655 Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3 (cherry picked from commit 5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
| * | 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
* | | aapt: Hide "No comment for public symbol" warningsMichael Bestas2016-02-201-2/+2
| | | | | | | | | | | | | | | | | | * Hide these warnings by default behind the kIsDebug flag Change-Id: I56270c5e34bb05a88500eea83879790ad43a814c
* | | aapt: add check for untranslatable "string-array"sChirayu Desai2016-01-261-1/+17
| | | | | | | | | | | | | | | Change-Id: Id884af0505c0bcdfa20b400fcdd54f699f8ef38f Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
* | | aapt: Use a std::map instead of a SortedVectorChristopher R. Palmer2016-01-052-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android's SortedVectorImpl uses arrays that it must insert into the middle of. Each insertion is O(N) time because it must move on average half the elements of the array to make room for the new element. That is, O(N^2) time to build this sorted vector. std::map on the other hand normally uses red/black trees and has a cost of NlogN to add N elements to it. Change-Id: I5da0363ba806ab615b2aad0fb2a43ef9a9bec327
* | | aapt: Speed up the style pruningChristopher R. Palmer2016-01-041-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit it removed each style one by one which causes the vector to repeatedly be shrunk and reallocated and copied (aka either quadratic or NlogN in the number of items removed). This commit simply makes it remove them all at once to make it linear instead. Change-Id: I541d151675ab19f37d9de1e7a323104d0d3b3c63
* | | Udpate instrumentation codeWilliam Clark2015-11-301-0/+2
| | | | | | | | | | | | | | | | | | Added changes to support new features in QSSP Change-Id: I92c0a4eb3cb5363fbf08185f25644a3202c38788
* | | aapt: Fix compiler warning (clobbered by longjmp)Christopher R. Palmer2015-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The error handling can clobber the fp variable when the code is being optimized and therefore fp must be marked as volatile to stop it from doing unsafe optimizations. Change-Id: Ib133587687c7fc0e788c4b9673669ef9b5bbe91a
* | | 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]
generated by cgit v1.1 at 2024-12-22 11:37:00 +0000