summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | 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
* | | | | resolved conflicts for merge of ef1741d2 to masterAndreas Gampe2015-03-121-7/+23
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751
| * | | am 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." ↵Deepanshu Gupta2015-03-121-7/+23
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '05cba2f8acd88d40e1bb149915fe590d4a21b74d': Add RecyclerView support.
| | * | Add RecyclerView support.Deepanshu Gupta2015-03-101-7/+23
| | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/72117 Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
* | | | Add support for the new native Builder class on StaticLayout.Diego Perez2015-03-101-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates StaticLayout_Delegate to support the new Builder class introduced in ag/646289. Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
* | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | | | Merge "Fix crash when shadowSize is 0"Diego Perez2015-03-051-0/+3
|\ \ \ \
| * | | | Fix crash when shadowSize is 0Diego Perez2015-03-041-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
* | | | | am 70775bed: am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am ↵Deepanshu Gupta2015-03-022-517/+37
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev * commit '70775beddd3773a942084f5ef939da0a70065475': Correct PorterDuff filters.
| * | | | am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge ↵Deepanshu Gupta2015-03-022-517/+37
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | "Correct PorterDuff filters." into lmp-dev * commit 'fb96187bb6004e5d0b22e4d942aa236a08d8913b': Correct PorterDuff filters.
| | * | | am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863': 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 1fe1022d: am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am ↵Deepanshu Gupta2015-03-021-3/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev * commit '1fe1022dbd7642373e0e2d465d29ad3e1226a8b2': Better error msg for StateList/Hexadecimal Color.
| * | | | am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge ↵Deepanshu Gupta2015-03-021-3/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | "Better error msg for StateList/Hexadecimal Color." into lmp-dev * commit '4a194d3b7f3ea4aebc5a1a8f95ccaac248c1b89d': Better error msg for StateList/Hexadecimal Color.
| | * | | 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.
| | | * | 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
* | | | | am 01d5286f: am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am ↵Deepanshu Gupta2015-02-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev * commit '01d5286f388303551a2eb8f57e210f6d7a690cb5': Set forceFramework correctly for included layouts.
| * | | | am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set ↵Deepanshu Gupta2015-02-231-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | forceFramework correctly for included layouts." into lmp-dev * commit '8f022fd323063f9cebb481be650db40cf5e486f3': Set forceFramework correctly for included layouts.
| | * | | 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.
| | | * | Set forceFramework correctly for included layouts.Deepanshu Gupta2015-02-231-1/+1
| | | |/ | | | | | | | | | | | | | | | | Bug: http://b.android.com/151326 Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
* | | | am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." ↵Deepanshu Gupta2015-02-172-8/+108
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev automerge: 0684991 automerge: c2fa5e2 automerge: 7bf58d0 * commit '7bf58d0c5523a9b76ab1d570acb92514e8fff8ba': Add Asset management support for fonts.
| * | | am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." ↵Deepanshu Gupta2015-02-172-8/+108
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev automerge: 0684991 automerge: c2fa5e2 * commit 'c2fa5e205e617df6b622cb54fac77738e82e6320': Add Asset management support for fonts.
| | * | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-172-8/+108
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | automerge: 0684991 * commit '068499111c173fdd9869e7dbe5b9de857aca1c2d': Add Asset management support for fonts.
| | | * Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-132-8/+108
| | | |\
| | | | * Add Asset management support for fonts.Deepanshu Gupta2015-02-032-8/+108
| | | | | | | | | | | | | | | | | | | | Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50
* | | | | am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip ↵Diego Perez2015-02-171-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | area" into lmp-dev automerge: a912fed automerge: d66f2eb automerge: 412e643 * commit '412e6439b2d372565f14cc1dce0ff25f106975af': Do not paint shadow if outside of the clip area
| * | | | am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip ↵Diego Perez2015-02-171-2/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | area" into lmp-dev automerge: a912fed automerge: d66f2eb * commit 'd66f2eb241ba8676ef01f4efd23be5ae62d3a7aa': 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-171-2/+7
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev automerge: a912fed * commit 'a912fedbc5fba99fb75884a1941d58170822ceb4': Do not paint shadow if outside of the clip area
| | | * | Do not paint shadow if outside of the clip areaDiego Perez2015-02-041-2/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca
* | | | | Add ClipReveal window transition for application launchChet Haase2015-02-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #19362772 Better material launch animations Change-Id: Ic94fde910b6b5554ee954dfbbf374949f9eb189d
* | | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: ↵Deepanshu Gupta2015-01-311-7/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e683bd automerge: 1575ca6 automerge: 862cdd6 automerge: 6a43990 * commit '6a439908fcc103696dd90bc42494231b54b7a10b': Resource resolution fixes.
| * | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: ↵Deepanshu Gupta2015-01-311-7/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e683bd automerge: 1575ca6 automerge: 862cdd6 * commit '862cdd6f11490c060842599a58a400e284c937d9': Resource resolution fixes.
| | * | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-311-7/+19
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7e683bd * commit '7e683bdaddff77a24a36d420c5782b47795c5ccb': Resource resolution fixes.
| | | * | Resource resolution fixes.Deepanshu Gupta2015-01-151-7/+19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Eliminate groupId and add task to AppWindowTokenCraig Mautner2015-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies access by eliminating indirect referencing. Fixes bug 18088522 item #15. Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
* | | | am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into ↵Deepanshu Gupta2015-01-081-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 33b2de7 * commit 'f0da92bfda9a7b393cac87436173c1284c7d48be': Add missing DateFormat method.
| * | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | automerge: 33b2de7 * commit '33b2de7f34180983fe596ff9faa6955b032fa157': Add missing DateFormat method.
| | * | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
| | | | | | | | | | | | | | | | Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
* | | | am adcd2241: am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make ↵Deepanshu Gupta2015-01-072-25/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Preference-cookie map non static." into lmp-dev * commit 'adcd224135e3c12f483547ffa8bb2cb0250ba923': Make Preference-cookie map non static.
| * | | am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make ↵Deepanshu Gupta2015-01-062-25/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Preference-cookie map non static." into lmp-dev * commit 'c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2': Make Preference-cookie map non static.
| | * | am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." ↵Deepanshu Gupta2015-01-062-25/+20
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716': Make Preference-cookie map non static.
| | | * Make Preference-cookie map non static.Deepanshu Gupta2014-12-232-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the map from Preference to View Cookie to BridgeContext. This means the map need not be static anymore. NO_SQ: Depends on unsubmitted changes. Change-Id: I662513def17bd6ec3a2646c3bec9bf4f9f89fc15
* | | | am d050df72: am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix ↵Deepanshu Gupta2015-01-071-5/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | default initial value for preferences" into lmp-dev * commit 'd050df7275137f9c57ce79a7b46d51e2d1fb9290': Fix default initial value for preferences
| * | | am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default ↵Deepanshu Gupta2015-01-061-5/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | initial value for preferences" into lmp-dev * commit 'addaeff9b28d833616376f802b7a38e32397edd1': Fix default initial value for preferences
| | * | am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" ↵Deepanshu Gupta2015-01-061-5/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'cec8e5a10de413c733223b8b1cc11b70c6254647': Fix default initial value for preferences
| | | * Fix default initial value for preferencesDeepanshu Gupta2014-12-231-5/+0
| | | | | | | | | | | | | | | | | | | | NO_SQ: Depends on unsubmitted changes. Change-Id: I061cf71f6167d382e9ef060abeb4d5cff83c4104
* | | | resolved conflicts for merge of 20db8770 to masterDeepanshu Gupta2015-01-063-2/+148
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc
| * | | am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences ↵Deepanshu Gupta2015-01-063-2/+147
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | rendering." into lmp-dev * commit 'e15f580b9d7a555bff96efd3cec195b39637e679': Add preferences rendering.
generated by cgit v1.1 at 2025-08-16 02:23:28 +0000