• Home
  • History
  • Annotate
  • only in /frameworks/base/tools/layoutlib/bridge/src/android/content/res/
History log of /frameworks/base/tools/layoutlib/bridge/src/android/content/res/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ceb1ab1d2a71c6d4e0cccf110a198ff83cb97e5a 24-Mar-2016 Deepanshu Gupta <deepanshu@google.com> Add tests for getResource*Name()

Change-Id: I02170b2b68c76f817aa0771a5333abf2aee456c0
esources_Delegate.java
618ca261f370c257723a3c7a5871bb6f6b4d7f3a 19-Mar-2016 Deepanshu Gupta <deepanshu@google.com> Support getResource*Name() methods for Resources

The following methods are now supported:
getResourceEntryName
getResourcePackageName
getResourceTypeName
getResourceName

Bug: http://b.android.com/181872
Change-Id: If06b5e0687ab6f8cb20ab77f339870dd08a84ce1
esources_Delegate.java
7ba6dc0fcc66c96383aabd8db40adf1bac66ce7f 07-Mar-2016 Xavier Ducrohet <xav@google.com> Merge "Change BridgeResources to Resources_Delegate" into nyc-dev
566b303365078fac9a454f1595add19e02631db3 01-Mar-2016 Diego Perez <diegoperez@google.com> Add support for GradientColor in layoutlib

Change-Id: Ia9a55a9e00d7ddb5263f3dbe46b5da8dde457526
ridgeTypedArray.java
omplexColor_Accessor.java
e05f1c4684fcc7e3f6a429ff01b210aa19f75304 04-Mar-2016 Deepanshu Gupta <deepanshu@google.com> Change BridgeResources to Resources_Delegate

This is a very hacky fix to make layoutlib work with the latest support
lib. Inject a couple of fields in android.content.res.Resources to
allow using most of the earlier code as is.

Bug: 27403642
Bug: http://b.android.com/201934
Change-Id: Ia96a1b4642a1907a77d9ca7a2392f78809b92e38
ridgeResources.java
ridgeTypedArray.java
esources_Delegate.java
5d1013cf13e59b7f8dc8f16b5811cb29982e0ef3 23-Feb-2016 Diego Perez <diegoperez@google.com> Implement native methods in VectorDrawable

Most of the VectorDrawable implementation has been moved to native code.
This CL implements most of the required functionality that existed in
Marshmallow.

Change-Id: I009bcd5c166f2bfa0795d2718fabab4a549eba9f
ridgeTypedArray.java
491523d52cd8368ef9a92e95fb3e9332bf86a996 07-Oct-2015 Deepanshu Gupta <deepanshu@google.com> LayoutLib fixes for N

Moves LayoutLib to Java 8 - YAY!
Fix delegates

Change-Id: I098996e43e330e995d33f12df1c16355bbc02f0f
ridgeResources.java
b63da06a7ab9ad06184b0359abddd9137742ea4a 14-Dec-2015 Jerome Gaillard <jgaillard@google.com> Get color state list file content from PSI instead of disk

Use new functionality from callback to get the content of state list files
from PSI instead of disks.

Bug: http://b.android.com/183767
Change-Id: Ic256d1e7787209d772ccd42c2e3c7f409cac2964
ridgeTypedArray.java
e5d3baf22f046d0a579128fc258f6b92e700ca02 05-Oct-2015 Deepanshu Gupta <deepanshu@google.com> LayoutLib: Fix bitmap scaling.

Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
ridgeResources.java
4e27221d49151ba91af59029659e666fa756b645 30-Sep-2015 Deepanshu Gupta <deepanshu@google.com> Merge "Support databinding in listitem layouts." into mnc-ub-dev
e91096c03dda225240b1487f019bf3d082854587 29-Sep-2015 Deepanshu Gupta <deepanshu@google.com> Support databinding in listitem layouts.

Add a wrapper around the PullParser to support stripping out databinding
parts.

Bug: http://b.android.com/187428
Change-Id: I88080d8f4108cb5ae27a137ad20c5dd7d516f3ea
ridgeResources.java
6649ca371139831369e063b937e25d7d6e97b9e6 24-Sep-2015 Deepanshu Gupta <deepanshu@google.com> Fix TypedArray.getTextArray()

Change-Id: Ic55b52840892fbf2a4258ba97ed31ca0283da8ed
ridgeResources.java
ridgeTypedArray.java
0437cac76c24dc6cac7b530e6d80f789565550ec 04-Aug-2015 Deepanshu Gupta <deepanshu@google.com> Make getInt in BridgeTypedArray accept empty String.

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
ridgeTypedArray.java
5779ad71eabed3aabaefef1e4749693f8320816e 28-May-2015 Deepanshu Gupta <deepanshu@google.com> Fix BridgeTypedArray.getType()

Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
ridgeTypedArray.java
642cff50f8f7a67eed09eac1e56d7133b26a192c 23-May-2015 Deepanshu Gupta <deepanshu@google.com> LayoutLib: Support getting resource arrays.

- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
custom theme attributes. The AppTheme now inherits from
Material.Light.DarkActionBar, so other tests should be unaffected.

Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.

Bug: 12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
ridgeResources.java
476e582d2ffdf25102d4c55f8c242baa3d21d37f 22-May-2015 Deepanshu Gupta <deepanshu@google.com> LayoutLib: Change nullity annotations.

Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
ridgeTypedArray.java
esources_Theme_Delegate.java
4d8e078c7c9c9f8407ebc7e88673e53b67723e18 21-May-2015 Deepanshu Gupta <deepanshu@google.com> Fix overrides for BridgeResources.

New method overloads have been introduces in android.content.Resources.
Change BridgeResources to overrides the appropriate ones. Also, fix the
implementation to the new behaviour.

Change-Id: I7b83b329f04286512f223c0fafc3f989f1b9a244
ridgeResources.java
10dff451f3998728f4bb54585e4c5402edca06ba 21-May-2015 Deepanshu Gupta <deepanshu@google.com> Use non deprecated method for creating ColorStateList

Change-Id: I9fce928276c8a2af55eb0615a4895abb6a973be5
ridgeTypedArray.java
21b564573327b1ed2f7e06146b8a01c47ede3089 19-May-2015 Deepanshu Gupta <deepanshu@google.com> Fix include tag rendering.

A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.

Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
ridgeTypedArray.java
d77b9ed7dcc42efca33b225c4594a30aab9e709c 12-May-2015 Deepanshu Gupta <deepanshu@google.com> Add missing delegates for M preview.

- Remove ICU dependency (use the version bundled with platform).
- Restructure intelliJ project to move dependencies to module.
- Minor fixes to layoutlib tests.

TODO:
- Load ICU data.
- Hyphenator doesn't work.
- High quality line breaker not present.

Change-Id: I965e096e17bfc97ee995a649c3f4f6f64bb4f70d
ridgeTypedArray.java
78f12e43f08a1b2acda7b565a310c48e507f5e47 08-May-2015 Alan Viverette <alanv@google.com> Update LayoutLib for theme key changes to fix build

Change-Id: I47b400b320f16688cd32c1d8955a660637d93f4d
esources_Theme_Delegate.java
37dbb8b7f3c069196040eed3a03006647db7fa5b 15-Apr-2015 Deepanshu Gupta <deepanshu@google.com> Update to using LayoutlibCallback.

Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
ridgeResources.java
ridgeTypedArray.java
49ce36e1754243eedc124b4f7e68af1b458c821c 15-Apr-2015 Deepanshu Gupta <deepanshu@google.com> Remove implementation of deprecated method.

BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.

Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
ridgeResources.java
9ca97747260b9906fc3a159ce3930109022cf2dd 30-Mar-2015 Deepanshu Gupta <deepanshu@google.com> Add @empty support.

Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
ridgeTypedArray.java
68501b87d2891ae9bf65d400f9cd755e197fda0c 23-Feb-2015 Deepanshu Gupta <deepanshu@google.com> Better error msg for StateList/Hexadecimal Color.

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
ridgeResources.java
ad879adb65ffa577844738522ab6d7d30aba2ead 13-Feb-2015 Deepanshu Gupta <deepanshu@google.com> Merge "Add Asset management support for fonts." into lmp-dev
d51834bdfad0cd3142ac464ab3a3b0db14f884c3 28-Jan-2015 Deepanshu Gupta <deepanshu@google.com> Add Asset management support for fonts.

Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50
ridgeAssetManager.java
b6864ac6cde109be320e18188209eb8420c585f1 16-Jan-2015 Deepanshu Gupta <deepanshu@google.com> Resource resolution fixes.

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
ridgeTypedArray.java
17a6170c62e6f74f2881623a9c16f0b6fea54721 21-Nov-2014 Deepanshu Gupta <deepanshu@google.com> Fix AnalogClock rendering

1. Change calls to java.lang.System.log* since they don't exist on the
host.
2. Clean up method rewrite mechanism in ReplaceMethodCallsAdapter.
3. Stub out creation of uninitialized GregorianCalendar.
4. Memory map the time zone data base file and provide a custom
implementation of BufferIterator for use by ZoneInfoDB
5. Delete unused Time_Delegate

Also fixed a comment in BridgeAssetManager and an error message in
FontFamily_Delegate.

Bug: http://b.android.com/79160
Change-Id: Iae5ef65678f0e6c7c5af520c45bd15980ce3fa55
ridgeAssetManager.java
b6444c43094353065f083d1ae6e4617f098a8b2b 28-Oct-2014 Deepanshu Gupta <deepanshu@google.com> Fix multiple styles case in resource resolution.

When multiple styles are applied to a theme, we only remembered the last
one. This change fixes the issue.

Change-Id: I46490e882edc3eabe522a641c83366234b5bb25d
ssetManager_Delegate.java
esources_Theme_Delegate.java
4a605c6fa0027ee116beb29fbc9625721f0441f0 28-Oct-2014 Deepanshu Gupta <deepanshu@google.com> Use right theme for drawable inflation.

The theme information was lost when inflating drawables. As a result,
drawables inflated in the ActionBar did not have the right tint.

Change-Id: I13d5c78039e35085ed4902289fcb735bb15d972e
ridgeResources.java
ridgeTypedArray.java
esources_Theme_Delegate.java
3c8140ab4b39922f92682910ce24de77fd512db4 02-Oct-2014 Deepanshu Gupta <deepanshu@google.com> Minor style changes.

Addressing code review comments on previous change: 171804201dd

Change-Id: I2c9e0ce35e755c23d8292749828d15a87109d6dc
ridgeTypedArray.java
171804201dd556f8ce7ee7618661a5c8ee71507a 29-Sep-2014 Deepanshu Gupta <deepanshu@google.com> Always resolve enum when resolving resources.

Enums were resolved only for integers and dimensions. This change
resolves enums for all resource types. Well, almost all. For color and
colorStateList, enums are still not referenced.

Bug: http://b.android.com/76091
Change-Id: Ie43bd1b54fb9877655d31773bdf71d9a6a65c473
ridgeTypedArray.java
cd0bb17d30e360c44e03b33bae3d42114b8cc2fb 04-Sep-2014 Deepanshu Gupta <deepanshu@google.com> Remove warning for null entries in resource array.

Change-Id: I32e0b8129e29f3e1e5a472b26e16f3fd06d4b91b
ridgeTypedArray.java
bc34eb11f67c46b0808d2a65628077faed0eefb0 26-Aug-2014 Deepanshu Gupta <deepanshu@google.com> enums in dimension attributes.

enums in resources were only read for integer attributes. This change
parses the enums for dimension resources also. This also means that we
don't have to hardcode the resolution for match_parent and wrap_content.

TODO: Fix this for all resource types.

Bug: http://b.android.com/75285
Change-Id: I86752b2322ea017499942a87568ba5c54b8654e4
ridgeTypedArray.java
d4cf391c618e5f370f2cfd9f344baa895d5d3242 26-Aug-2014 Deepanshu Gupta <deepanshu@google.com> Null out "@null" attributes.

Remove references to the resourceValue for "@null". This saves needless
checking for "@null" every time an attribute is requested.

Change-Id: I816e78619fa0b1ddcacd1ef5ac90765e30a9a44c
ridgeTypedArray.java
151b68ddc222d66b60b5447a60ab6e246a4d2ac0 20-Aug-2014 Deepanshu Gupta <deepanshu@google.com> Fix "@null" resource values in LayoutLib.

Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
ridgeTypedArray.java
4b8aa28ef2a3c2d0ef602a39262e82eb4134a82d 17-Jul-2014 Ying Wang <wangying@google.com> Fix sdk build.

Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
ridgeAssetManager.java
5cd9dde5a2a77c5095f985186d8f03147fd22870 15-Jul-2014 Deepanshu Gupta <deepanshu@google.com> Support Locale.toLanguageTag on Java 6

Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
esources_Delegate.java
26e32ea559da98dcdebaefb74d4f3c1a5ce705c3 10-Jul-2014 Deepanshu Gupta <deepanshu@google.com> Update delegates

Change-Id: Icd93c31b4e8c8ee5ea242fb8295578937f48ff2a
ridgeTypedArray.java
dc62340f18becf51f6f3c94d3994665bcd7dd537 23-May-2014 Deepanshu Gupta <deepanshu@google.com> Stopgap fix for layoutlib.

This is a temporary fix for changes made to TypedArray regrading theme
attributes.

Change-Id: I173fde6d8d3259479b0654ff331bc27bf2814fb0
ridgeTypedArray.java
ypedArray_Delegate.java
baef8c1ffe5c900fb0da9512654bf249b5fc9269 20-May-2014 Deepanshu Gupta <deepanshu@google.com> Layoutlib fixes for L [DO NOT MERGE]

This adds the new delegates that were missing. This starts the work on
changes related to Minikin Fonts.

There are some changes related to TypedArray that still need to be
fixed.

Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c
(cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)
esources_Theme_Delegate.java
ypedArray_Delegate.java
e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b 08-Apr-2014 Deepanshu Gupta <deepanshu@google.com> Merge "Fix theme/style resolution in Layoutlib"
bfec73c2db5a34ced248213edf5519c80727a65f 12-Mar-2014 Deepanshu Gupta <deepanshu@google.com> Fix theme/style resolution in Layoutlib

Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
ssetManager_Delegate.java
esources_Theme_Delegate.java
831f3ce9b5b330101b090daf3163a843e0c6317e 26-Mar-2014 Deepanshu Gupta <deepanshu@google.com> Add stub getThemeAttributeId() to BridgeTypedArray

The method is used to obtain theme attribute IDs for drawables for
caching.

The changeset also fixes some minor style issues found by code
inspection.

Change-Id: Ib5fe05511397b5ec7cb8e64f6b2769ec2c355f41
ridgeTypedArray.java
8250a825c39a2f1f63920669cf233db3d8944b51 19-Feb-2014 Deepanshu Gupta <deepanshu@google.com> Add ability to obtain themed Drawable from Context

This is to fix the rendering in layoutlib broken due to
8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3

Change-Id: I3da6691ad86502bd4fa4b302deb381a840b94655
ridgeResources.java
857ba4af8519479298a671461cd6f5cace35b99b 15-Feb-2014 Deepanshu Gupta <deepanshu@google.com> Fix layoutlib by avoiding Java7 calls

This change also fixes a NPE in TypedArray caused by changes in the
framework.

Change-Id: Ie64237c567fa16c35c807db22ce9a4b609ee411d
ridgeTypedArray.java
esources_Delegate.java
edc4664d60af1f124d05f0a2b6ba58b837630f51 01-Feb-2014 Alan Viverette <alanv@google.com> Fix broken build in BridgeResources

Change-Id: Iec58a2acda6b9538bcb5974d3d5c45ea6e53eac5
ridgeResources.java
282e181b58cf72b6ca770dc7ca5f91f135444502 24-Jan-2014 Adam Lesinski <adamlesinski@google.com> Revert "Move frameworks/base/tools/ to frameworks/tools/"

This reverts commit 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
ridgeAssetManager.java
ridgeResources.java
ridgeTypedArray.java
esources_Theme_Delegate.java
ypedArray_Delegate.java
9f6a119c8aa276432ece4fe2118bd8a3c9b1067e 28-Aug-2013 Mike Lockwood <lockwood@google.com> Move frameworks/base/tools/ to frameworks/tools/

Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
ridgeAssetManager.java
ridgeResources.java
ridgeTypedArray.java
esources_Theme_Delegate.java
ypedArray_Delegate.java
72c6137a7aa5e5ada6a4aeca52f33d060742beb6 05-Jan-2013 Tor Norbye <tnorbye@google.com> Handle empty flag attributes, such as gravity=""

Without this, an empty string will be passed into
XmlUtils.convertValueToInt, which throws an
index out of range exception.

Change-Id: Ibd1a140e207653b205852087f33ccb87fbbb9bbc
ridgeTypedArray.java
330dd534848562515c6c67cb3de13067e86866a1 18-Dec-2012 John Spurlock <jspurlock@google.com> Remove remaining doc references to StyledAttributes.

It appears StyledAttributes was renamed to TypedArray
prior to fw 1.0. Leaving references to the old name
around in the public docs is confusing.

Deliberating leaving...
tests/coretests/src/android/widget/LabelView.java
... as is - it's clearly unused.

Change-Id: I3f66e5f9cbe945d9d86530d37b88369b401f054d
ridgeTypedArray.java
5d701eddcf7f4abd5867ec3bf2091916d5ebbdf1 16-Mar-2012 Xavier Ducrohet <xav@android.com> LayoutLib: Properly support attr ns when used in styles.

Change-Id: I885864588928589d7c9a34b94339917c5be47fa5
ridgeResources.java
ridgeTypedArray.java
f1dee199a009fec5e3a5d1469f654098261f8b06 01-Oct-2011 Xavier Ducrohet <xav@android.com> Layoutlib: add support for ITextServicesManager.

This include a fix in layoutlib_create to properly handle
delegating a static method of an inner class (was broken and
only worked on non static method).

Added a few comments here and there to *_Accessor classes so
that it's a bit more obvious what they are for and how they are
used.

Change-Id: Ifc31dd1a006393bb0c08e22b6a17f500dd62e090
esources_Theme_Delegate.java
7f9f99ea11051614a7727dfb9f9578b518e76e3c 11-Aug-2011 Xavier Ducrohet <xav@android.com> Make some methods/fields package private so that layoutlib can access them.

Change-Id: I4aeadfbaf8a4f6a459fa19937c21ac23d9e5fb64
ridgeAssetManager.java
ridgeResources.java
ridgeTypedArray.java
ypedArray_Delegate.java
162c1dcd5e635d17d8425936d7729d0ae5ed1a62 04-Aug-2011 Xavier Ducrohet <xav@android.com> Layoutlib: implement Resources.getBoolean(int).

Change-Id: I44cee203bb9a8fabaebfd689fc20ec2f2a9b3561
ridgeResources.java
569ed054042f0350e898b4352694b792b0fdef9b 02-Aug-2011 Xavier Ducrohet <xav@android.com> Layoutlib: simple comment fix.

Change-Id: I402f6b465706e8edd14e512a973d087a14abbfe3
ridgeResources.java
d2f664d42cc29507b01a98622298b69131463825 30-Jul-2011 Xavier Ducrohet <xav@android.com> Misc layoutlib fix in preparation of the access change in framework code.

Change-Id: I873adb7345514be6daa5c4fea4ebabb515f203e2
ridgeResources.java
ridgeTypedArray.java
9a4fe29c8d92014d2d9a848e9116b8cc9d0842f9 10-Feb-2011 Xavier Ducrohet <xav@android.com> LayoutLib: Annotate the custom delegate methods.

Every method implementing a delegate needed by the
layoutlib_create bytecode modification must now be
annotated with LayoutlibDelegate.

The methods in the original source code that are delegated
are already automatically annotated. Now with the implementations
being annotated we can do bi-directional tests and find not
only missing implementations but also dead obsolete code.

This will be useful when backporting to earlier versions of
Android, or when native (non public) method disappear. In fact,
the new test detected one such method in Shader.

Change-Id: I491708b68ac2736ca5669aa86cd5e930a00f9db3
esources_Theme_Delegate.java
345f866bfd09476fd62aa10345a0670cc110b63c 02-Feb-2011 Xavier Ducrohet <xav@android.com> Make TimePicker/DatePicker/CalendarView render in Eclipse.

Change-Id: Id5313a6f0f53bf45f6eaabc0e10fcf0660eeac08
esources_Theme_Delegate.java