summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Tools attribute improvements for RecyclerView LayoutManager." into ↵Deepanshu Gupta2015-03-123-21/+36
|\ | | | | | | lmp-mr1-dev
| * Tools attribute improvements for RecyclerView LayoutManager.Deepanshu Gupta2015-03-113-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Change tools attribute for layout manager from layoutManagerType to LayoutManager. 2. Support classnames in the tools attribute. This change doesn't try to supprt arbitrary classnames for now. The reason for this is that the new layoutlib API is supposed to contain a new method for inflating custom classes that are not views. This will allow us to throw better error messages. Without the new API, trying for different constructors, will result in a error messages being logged. Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
* | am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and ↵Deepanshu Gupta2015-03-121-16/+9
|\ \ | |/ |/| | | | | | | | | BlendingMode." into lmp-dev * commit 'efc09c644fa4e8354d54485aab6c0b18868284eb': Fix cyclic dependency in BlendComposite and BlendingMode.
| * am 78660423: Merge "Fix cyclic dependency in BlendComposite and ↵Deepanshu Gupta2015-03-121-16/+9
| |\ | | | | | | | | | | | | | | | | | | BlendingMode." into lmp-dev * commit '78660423900fa255cc83b85320e98d5184be393b': Fix cyclic dependency in BlendComposite and BlendingMode.
| | * Fix cyclic dependency in BlendComposite and BlendingMode.Deepanshu Gupta2015-03-111-16/+9
| | | | | | | | | | | | | | | | | | | | | Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4 Bug: http://b.android.com/159708 Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
* | | Fix rare NPE in BridgeContext.Deepanshu Gupta2015-03-111-23/+32
| | | | | | | | | | | | | | | | | | Also fixed some deprecation warnings. Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
* | | Fix project settings.Deepanshu Gupta2015-03-102-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | 1. Update layoutlib_api source path. 2. Update jdk version 3. Update nullity annotations. Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
* | | Add RecyclerView support.Deepanshu Gupta2015-03-107-10/+332
| | | | | | | | | | | | | | | Bug: http://b.android.com/72117 Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
* | | am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
|\ \ \ | |/ / | | | | | | | | | * commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863': Correct PorterDuff filters.
| * | am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| |\ \ | | |/ | | | | | | | | | * commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71': Correct PorterDuff filters.
| | * Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | |\
| | | * Correct PorterDuff filters.Deepanshu Gupta2015-02-262-517/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove unused modes - makes the class more manageable, and missing modes can always be readded from the git history. 2. Reuse the existing BlendComposite instances where possible. 3. Fix incorrect alpha computation for multiply mode. 4. Change the alpha computation for all blend modes to compenstate for the fact that the color filter image that we create extends beyond the image it is inteded to be applied to. Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
* | | | am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into ↵Deepanshu Gupta2015-03-021-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5': Fix codestyle for switch statements.
| * | | am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84': Fix codestyle for switch statements.
| | * | Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | |\ \ | | | |/
| | | * Fix codestyle for switch statements.Deepanshu Gupta2015-02-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix intellij's codestyle settings for indenting switch/case statement. Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
* | | | am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal ↵Deepanshu Gupta2015-03-021-3/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Color." into lmp-dev * commit '81449b2c4a63392bff22d77f331f4db52011884b': Better error msg for StateList/Hexadecimal Color.
| * | | am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into ↵Deepanshu Gupta2015-03-021-3/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '10d620ff2c4770e926b693e833105e8dbbd5fa86': Better error msg for StateList/Hexadecimal Color.
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throw a better error message when resolving a hexadecimal color value but the user gave a Color State List. The two are easy to confuse since the only way to distinguish between the two is to look at the definition. Bug: http://b.android.com/70110 Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
* | | | Add status bar time for 5.1Deepanshu Gupta2015-02-261-2/+5
| | | | | | | | | | | | | | | | Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f
* | | | am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included ↵Deepanshu Gupta2015-02-231-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | layouts." into lmp-dev * commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b': Set forceFramework correctly for included layouts.
| * | | am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into ↵Deepanshu Gupta2015-02-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78': Set forceFramework correctly for included layouts.
| | * | Set forceFramework correctly for included layouts.Deepanshu Gupta2015-02-231-1/+1
| | |/ | | | | | | | | | | | | Bug: http://b.android.com/151326 Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
* | | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-174-20/+126
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 0684991 * commit '068499111c173fdd9869e7dbe5b9de857aca1c2d': Add Asset management support for fonts.
| * | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-134-20/+126
| |\ \ | | |/ | | | | | | | | | * commit 'ad879adb65ffa577844738522ab6d7d30aba2ead': Add Asset management support for fonts.
| | * 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
| | | | | | | | | | | | | | | | Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50
* | | | am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into ↵Diego Perez2015-02-171-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev automerge: a912fed * commit 'a912fedbc5fba99fb75884a1941d58170822ceb4': Do not paint shadow if outside of the clip area
| * | | am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into ↵Diego Perez2015-02-131-2/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '98c3461acd6699ab0448f1785909d0d39cd61b5a': Do not paint shadow if outside of the clip area
| | * | Merge "Do not paint shadow if outside of the clip area" into lmp-devDiego Perez2015-02-131-2/+7
| | |\ \
| | | * | Do not paint shadow if outside of the clip areaDiego Perez2015-02-041-2/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca
* | | | | am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-devDeepanshu Gupta2015-02-172-3/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4e47416 * commit '4e47416012b8cb88d564a04a29c0b79a28b9e529': Changes made by intelliJ 14.1
| * | | | am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-devDeepanshu Gupta2015-02-132-3/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a': Changes made by intelliJ 14.1
| | * | | Merge "Changes made by intelliJ 14.1" into lmp-devDeepanshu Gupta2015-02-132-3/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Changes made by intelliJ 14.1Deepanshu Gupta2015-02-042-3/+4
| | | |/ | | | | | | | | | | | | Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4
* | | | Fix AAPT daemon mode with paths containg spaces.Chris Warrington2015-02-091-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new line as a delimiter rather than space. Fixes: https://code.google.com/p/android/issues/detail?id=135757 Gradle CL: https://android-review.googlesource.com/130423 Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
* | | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 7789447 * commit '7789447bd97c851b7a09623a417300590e5439d5': Limited AppCompat support
| * | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3d5535cfb7755c20619529649b025c4682013b85': Limited AppCompat support
| | * | Limited AppCompat supportDeepanshu Gupta2015-01-285-124/+452
| | | | | | | | | | | | | | | | Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f
* | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 7e683bd * commit '7e683bdaddff77a24a36d420c5782b47795c5ccb': Resource resolution fixes.
| * | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1d59871e4e8a3a657dab3931d684706c45630a2f': Resource resolution fixes.
| | * | Resource resolution fixes.Deepanshu Gupta2015-01-152-8/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Some dynamic ids weren't created and resulted in ResourceNotFound exceptions. 2. Prevent NPE if a style attribute (eg. style="?attr/foo"), which cannot be resolved, is resolved. This effectively, also results in making it harder to catch misconfigured themes. However, support library does it, and we don't want to throw errors when the library is working as intended. Change-Id: I731d8fb9209eb72b464d235d1072d416e132970b
* | | AAPT: Use the right enum when checking for density configurationsAdam Lesinski2015-01-221-1/+1
| | | | | | | | | | | | | | | Bug:19116675 Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
* | | Process base APKAdam Lesinski2015-01-165-88/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | The base APK may have resources with configurations that compete against some splits. The base APK must be involved in the selection of splits. Bug:18982001 Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
* | | AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
| | | | | | | | | | | | | | | | | | | | | | | | All references to attributes defined in pre-LOLLIPOP_MR1 SDK are moved to version qualified resource entries. Bug:18221682 Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
* | | am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special ↵Deepanshu Gupta2015-01-101-13/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | case AppCompat to show action bar. * commit 'c598047d67f64e690f682d82c0e77989c79ae465': Special case AppCompat to show action bar.
| * | am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat ↵Deepanshu Gupta2015-01-101-13/+23
| |\ \ | | |/ | | | | | | | | | | | | | | | to show action bar. * commit 'ca67a249293d021808f349fa2e2f799451aeafe8': Special case AppCompat to show action bar.
| | * am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ↵Deepanshu Gupta2015-01-101-13/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | bar. * commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213': Special case AppCompat to show action bar.
| | | * am 74147527: am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '74147527357b9abd9d30b3a2dbd72a5172a35625': Special case AppCompat to show action bar.
generated by cgit v1.1 at 2025-01-08 16:38:28 +0000