1727 Commits

Author SHA1 Message Date
Deepanshu Gupta
a556d7566b am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]
* commit '8bfc5a9d14000a436e54350099bd460f55418f27':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]
2015-08-26 20:20:30 +00:00
Jens Ole Lauridsen
413d41aac4 am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]
* commit '67b73b60bf9c9f433ed282abdc3691ee0cc6dda0':
  Support AppBar from Material Design. [DO NOT MERGE]
2015-08-26 20:20:24 +00:00
Deepanshu Gupta
7a92c26e20 am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]
* commit '6f5709ca97b27db9877c2fc65b083783d3f41e02':
  Update tests per new layoutlib_api [DO NOT MERGE]
2015-08-26 20:20:17 +00:00
Deepanshu Gupta
c5c2ea0478 am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
* commit '9a13b1e7502734fbe54d6f0e1c386f5382dfa662':
  Add missing resolveResValue call. [DO NOT MERGE]
2015-08-26 20:20:11 +00:00
Deepanshu Gupta
e4acf0ad4a am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
* commit 'ad16968d506840a1c1824c4ab6b5c181c8e04086':
  LayoutLib: Skip classes from java package. [DO NOT MERGE]
2015-08-26 20:20:05 +00:00
Deepanshu Gupta
7911c8b97d am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
* commit '15e549a81f59daf016f29c6ed6f1aa3d5f65d41c':
  Skip warnings for some unresolved references. [DO NOT MERGE]
2015-08-26 20:19:58 +00:00
Deepanshu Gupta
13670bc6de am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
* commit '669e4969a7245cf9d1febc5d4e67a0f2063e87fb':
  Fix import order. [DO NOT MERGE]
2015-08-26 20:19:52 +00:00
Deepanshu Gupta
6dc8bab993 am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit 'c0fd131642f21eabec570147cf9f4116c900e8a0':
  Fix ParserFactory not initialized error. [DO NOT MERGE]
2015-08-26 20:19:39 +00:00
Deepanshu Gupta
bf7907bfc8 am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '6b836cd06b1a2ebe5d31336486bb1b54e42439df':
  Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
2015-08-26 20:19:32 +00:00
Deepanshu Gupta
f2bf5470a3 am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '91e456d235256c385a7da1e45f098386bc68e86a':
  Fix BridgeTypedArray.getType() [DO NOT MERGE]
2015-08-26 20:19:23 +00:00
Deepanshu Gupta
7ec7805a50 am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
  Include Shapes in LayoutLib. [DO NOT MERGE]
2015-08-26 20:19:13 +00:00
Deepanshu Gupta
594939fc07 am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '66d5f24df0c3627028812ee23da8d4f08cc83e5c':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]
2015-08-26 20:19:05 +00:00
Deepanshu Gupta
bd343c1fbf am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit 'b32e44ff0c5fd410720bb28c87bc9cea83556edf':
  LayoutLib: Change nullity annotations. [DO NOT MERGE]
2015-08-26 20:18:54 +00:00
Deepanshu Gupta
9b1ac26921 am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
* commit '1754824c2835d6f3a17c4a2c0ab668991797fcf9':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
2015-08-26 20:18:47 +00:00
Deepanshu Gupta
6b7f9ae6f5 am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '678f0ea2ba47f06387670e9f75b13637a6446899':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
2015-08-26 20:18:34 +00:00
Deepanshu Gupta
d6363d8606 am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '2e57c1e23f43bb0ede6280720559ccc1e866024b':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
2015-08-26 20:18:27 +00:00
Deepanshu Gupta
5b886bb08f am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
  Update platformDir search in tests. [DO NOT MERGE]
2015-08-26 20:18:15 +00:00
Deepanshu Gupta
aae9c9309c am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '2f50403fe0a8a035757b047af00c7520fadb9015':
  Make Context.getClassLoader() work. [DO NOT MERGE]
2015-08-26 20:18:09 +00:00
Deepanshu Gupta
522e67e4ac am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit 'de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
  Fix include tag rendering. [DO NOT MERGE]
2015-08-26 20:18:04 +00:00
Deepanshu Gupta
8df6131ac1 am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '50e1406a4ad668179a9a3d28c58d68c0eee44237':
  Show better error message for color attr not found. [DO NOT MERGE]
2015-08-26 20:17:51 +00:00
Deepanshu Gupta
59f026e937 am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '81990c3f988369c755590288b93508e30024c56c':
  Fix build: udpate parser factory method [DO NOT MERGE]
2015-08-26 20:17:46 +00:00
Deepanshu Gupta
b44f7fda75 am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '0a07bb95a1dd94c3457860a934d3ee546919cff2':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
2015-08-26 20:17:40 +00:00
Deepanshu Gupta
78d77bc379 am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit 'bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
  Remove kxml dependency [DO NOT MERGE]
2015-08-26 20:17:34 +00:00
Deepanshu Gupta
b1e21330f8 Implement tools:list_item for RecyclerView. [DO NOT MERGE]
It's now possible to use tools:list_item attribute for RecyclerView to
point to a default layout, rather than always using a TextView.

Change-Id: I5d522b2f0ca38b420fddfcb0f73a26d95707da79
(cherry picked from commit 61f23e9bf7d784e7a52168196758c4f6c6853e77)
2015-08-25 12:06:50 -07:00
Jens Ole Lauridsen
cd4d5b3f38 Support AppBar from Material Design. [DO NOT MERGE]
This CL is a start for making the design able to render the AppBar.
We are still missing support for: system menu and the app icon.

Change-Id: I19600f8ee1e7e6492186a0b7ae7fb38c82e15c02
(cherry picked from commit 4dfe4d43ce5634f059a3ba669e3cac4551c3a3ee)
2015-08-25 12:06:50 -07:00
Deepanshu Gupta
de13095d5d Update tests per new layoutlib_api [DO NOT MERGE]
Change-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210
(cherry picked from commit d7b846c1814de34f2cea8507907f70618ec7cae0)
2015-08-25 12:06:50 -07:00
Deepanshu Gupta
db67caa60c Add missing resolveResValue call. [DO NOT MERGE]
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
(cherry picked from commit 5d1eaf4a197130f561b16c4ed083cf016b20ab92)
2015-08-25 12:06:49 -07:00
Deepanshu Gupta
6eef124657 LayoutLib: Skip classes from java package. [DO NOT MERGE]
Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.

Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
(cherry picked from commit 86caef1892e1ce063e0e880396c8deaa3a6a171d)
2015-08-25 12:06:49 -07:00
Deepanshu Gupta
4f5e6c6315 Skip warnings for some unresolved references. [DO NOT MERGE]
Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.

Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.

Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
(cherry picked from commit b3e872be9e634c8d1f34d07778ea753880bbf2d9)
2015-08-25 12:06:48 -07:00
Deepanshu Gupta
3e875dbb38 Fix import order. [DO NOT MERGE]
Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
(cherry picked from commit b9b8aef94e5bad8f5f03f686a2d3d8a09c045a7b)
2015-08-25 12:06:48 -07:00
Deepanshu Gupta
e5fa12ad78 Fix ParserFactory not initialized error. [DO NOT MERGE]
Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
(cherry picked from commit 996458b76c944f78eee26d7bd8cb4d39303b9119)
2015-08-25 12:06:47 -07:00
Deepanshu Gupta
a287b8428a Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
(cherry picked from commit d758e042ce08c46712db3db2d63fc84795028dfe)
2015-08-25 12:06:47 -07:00
Deepanshu Gupta
e698bb27f3 Fix BridgeTypedArray.getType() [DO NOT MERGE]
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
(cherry picked from commit 5779ad71eabed3aabaefef1e4749693f8320816e)
2015-08-25 12:06:46 -07:00
Deepanshu Gupta
e481e713f2 Include Shapes in LayoutLib. [DO NOT MERGE]
Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit 59164ec0551aa49f497acca81222f304cf4f344b)
2015-08-25 12:06:46 -07:00
Deepanshu Gupta
ba5a02c5aa LayoutLib: Support getting resource arrays. [DO NOT MERGE]
- 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
(cherry picked from commit 642cff50f8f7a67eed09eac1e56d7133b26a192c)
2015-08-25 12:06:45 -07:00
Deepanshu Gupta
a5ffed0b69 LayoutLib: Change nullity annotations. [DO NOT MERGE]
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
(cherry picked from commit 476e582d2ffdf25102d4c55f8c242baa3d21d37f)
2015-08-25 12:06:45 -07:00
Deepanshu Gupta
c96ef95285 Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit 6330971ed293a2777bbdab09288f90ea4b2d0255)
2015-08-25 12:06:44 -07:00
Deepanshu Gupta
b318ff54fc Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Only cherry picked for the style not found fix.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit d5b82845450beac2d3c7db9cd80e9fc34d43a297)
2015-08-25 12:06:44 -07:00
Deepanshu Gupta
cc5e69e4fe Inject anonymous inner classes of injected classes [DO NOT MERGE]
When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit bfc9c3bcbe3b7056d3330f754811c1506f181b88)
2015-08-25 12:06:44 -07:00
Deepanshu Gupta
d7e89906a4 Update platformDir search in tests. [DO NOT MERGE]
When trying to find the SDK Platform Dir for LayoutLib tests, also
test if the dir from which the tests are run is module dir.

Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
(cherry picked from commit 612a05e7e15184b21437731b9aa5db2d1d4fc54c)
2015-08-25 12:06:43 -07:00
Deepanshu Gupta
afedbc47b3 Make Context.getClassLoader() work. [DO NOT MERGE]
Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.

To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().

Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.

Also, update the list of packages to search for Framework views.

Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
(cherry picked from commit f8ea750455eec81e4e6d877b3e18e29a86d4ec95)
2015-08-25 12:06:43 -07:00
Deepanshu Gupta
92480a9ad8 Fix include tag rendering. [DO NOT MERGE]
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
(cherry picked from commit 21b564573327b1ed2f7e06146b8a01c47ede3089)
2015-08-25 12:06:42 -07:00
Deepanshu Gupta
f6b0854745 Show better error message for color attr not found. [DO NOT MERGE]
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit 5f1bf496948fb6383ae17e5467a26a00489d7564)
2015-08-25 12:06:42 -07:00
Deepanshu Gupta
b1370c2687 Fix build: udpate parser factory method [DO NOT MERGE]
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit 3dc19883c571a829c36aa603c04a55c91b00dd57)
2015-08-25 12:06:41 -07:00
Deepanshu Gupta
aa72988955 Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51debadca830eefbf8131185ac55ce699)
2015-08-25 12:06:41 -07:00
Deepanshu Gupta
5c90c4f459 Remove kxml dependency [DO NOT MERGE]
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af25584633462e4ab8cf9bafe10f43e7cb2d83)
2015-08-25 12:06:30 -07:00
Diego Perez
112d8a3641 am d6f2a9ef: am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit 'd6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
  Render to measured size when using expand mode
2015-07-21 13:20:23 +00:00
Diego Perez
7720eb18c1 Merge "Render to measured size when using expand mode" into lmp-mr1-dev 2015-07-21 12:56:56 +00:00
Filip Gruszczynski
3ce79f6c0c am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '96496e2d17607a8bfa944461c2458b0dcdeee872':
  Build fix after changing IWindowSession.
2015-06-30 22:17:55 +00:00
Filip Gruszczynski
7e3b61e73d Build fix after changing IWindowSession.
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
2015-06-30 14:42:21 -07:00