3408 Commits

Author SHA1 Message Date
Elliott Hughes
644cb09275 am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."
* commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5':
  Remove unused printapk.cpp.
2015-03-19 18:27:04 +00:00
Elliott Hughes
0634fba591 am 89da4ca6: Merge "Remove unused printapk.cpp."
* commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e':
  Remove unused printapk.cpp.
2015-03-19 18:19:54 +00:00
Elliott Hughes
e519c81f35 Remove unused printapk.cpp.
This is one of the few remaining users of libzipfile, but doesn't get built.
Not worth porting to libziparchive.

Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
2015-03-19 09:03:41 -07:00
Diego Perez
1599a4a0dc Merge "Make sure shaders use a color model compatible with the destination." 2015-03-19 09:22:27 +00:00
Deepanshu Gupta
4f3b8527e3 Update JRE for runConfigurations.
The intensive bridge tests use some libraries that are compiled with
1.7. All other tests are capable of running on JRE 1.6. Thus, change the
run configurations appropriately.

Change-Id: Iaea0fef2e58877578b36ac2ffe0b20b3a55f572c
2015-03-18 17:03:15 -07:00
Deepanshu Gupta
6092c044aa Fix project settings. [DO NOT MERGE]
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
(cherry picked from commit 7b2cae5072321da5d67f9d12dea10871326f3477)
2015-03-18 16:59:49 -07:00
George Mount
230ecdbf05 Use abstract base class instead of interfaces for Binding objects.
Bug 19627511
Bug 19709604

Changed generated classes to end with "Binding" instead of "Binder"
to avoid confusion with Android Binders.

Removed DataBinder class and moved the important aspects of its
contents to ViewDataBinding.

Improved mapping of Views in included layouts. Avoid traversing
included layouts while looking for bound expressions.

Change-Id: I1f28093b0792d5428d07192f1fc458a5b4b788b2
2015-03-17 18:26:54 -07:00
Dianne Hackborn
4025c96fac Fix build.
Change-Id: I6797bb2b5c85961c3bcb3fa8950bae121232f592
2015-03-17 17:22:33 -07:00
Deepanshu Gupta
84e550f5e6 Fix layoutlib tests.
The date picker and calendar widgets show the current date. Comparing
widgets showing current date with a static golden image wasn't the best
idea.

- Change the widgets to custom widgets that set a predefined date/time
  so that the rendering is independent of the system date.
- Change the layout slightly to make it look nicer.
- Update gradle plugin version.

Change-Id: Ia3fb4965a372a28087a0d8c9df40fd6779df6050
2015-03-17 17:17:42 -07:00
Deepanshu Gupta
74bf54037c am 199a70f1: am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
* commit '199a70f1820c38a9f1db1697ad91c4f5f07d00aa':
  Fix AppCompat action bar theming.
2015-03-17 14:53:17 +00:00
Deepanshu Gupta
a0c3191b74 am 0f8c9d1d: am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
* commit '0f8c9d1df28ed10b1c9013ddd315b306868e349d':
  Fix NoActionBar themes rendering.
2015-03-17 14:53:10 +00:00
Deepanshu Gupta
199a70f182 am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
* commit '576801ff82a85c4de19404dfe364eef7184b84e0':
  Fix AppCompat action bar theming.
2015-03-17 14:44:52 +00:00
Deepanshu Gupta
0f8c9d1df2 am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
* commit 'a5be9a7d2d2cbcd3892fc916c9a944745024881d':
  Fix NoActionBar themes rendering.
2015-03-17 14:44:46 +00:00
Deepanshu Gupta
576801ff82 am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
* commit '842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
  Fix AppCompat action bar theming.
2015-03-17 14:36:05 +00:00
Deepanshu Gupta
a5be9a7d2d am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
* commit '38467b5fbbc09ad05624454f735d27ada25565c8':
  Fix NoActionBar themes rendering.
2015-03-17 14:35:58 +00:00
Deepanshu Gupta
1f9a26af95 am 158c08bc: am ada85905: Fix AppCompat action bar theming.
* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.
2015-03-17 14:16:50 +00:00
Deepanshu Gupta
9a00f1c84b am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.
2015-03-17 14:16:42 +00:00
Vishwath Mohan
0ef152ad75 Merge "Handle malformed manifests in printXMLBlock" 2015-03-17 01:52:25 +00:00
Deepanshu Gupta
158c08bcf1 am ada85905: Fix AppCompat action bar theming.
* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.
2015-03-17 00:21:02 +00:00
Deepanshu Gupta
79f7fce7a4 am 2e4d9324: Fix NoActionBar themes rendering.
* commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e':
  Fix NoActionBar themes rendering.
2015-03-17 00:20:58 +00:00
Adam Lesinski
8a9355a98e Output modified bcp47 tag in ResTable_config::toString()
We expect to be able to parse the output of ResTable_config::toString(),
so it should use modified bcp47 (b+en+Latn+US).

Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722
2015-03-16 22:25:26 +00:00
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
2015-03-16 11:45:00 -07:00
Deepanshu Gupta
b9b8aef94e Fix import order.
Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
2015-03-13 15:24:59 -07:00
Deepanshu Gupta
2e4d932457 Fix NoActionBar themes rendering.
Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
2015-03-13 14:28:14 -07:00
Yigit Boyar
f5140a1529 Move configuration values into a config file
Change-Id: I7055c109cb04ae2ae375c2126c2a70fa52e85e31
2015-03-13 12:57:48 -07:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls.
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
2015-03-13 10:51:51 +00:00
Deepanshu Gupta
28070f43a6 am a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
* commit 'a4277e149355c53fde73a4e1ef44aa665af31cf0':
  Tools attribute improvements for RecyclerView LayoutManager.
2015-03-13 06:33:44 +00:00
Deepanshu Gupta
a53f76dcce am 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '3d024d4c22b896c95ef4c98610c3db7c58a639ed':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-13 06:33:17 +00:00
Deepanshu Gupta
1bbb9e1d5d am fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit 'fceec0e124a55b25d59f2af5279c70ac045d6771':
  Fix rare NPE in BridgeContext.
2015-03-13 06:32:49 +00:00
Deepanshu Gupta
cfed1b5222 am ca9264ea: am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit 'ca9264eab03cf787fb4dfc62a2313d9c3b45a05e':
  Fix project settings.
2015-03-13 06:32:40 +00:00
Andreas Gampe
d88a9bc821 resolved conflicts for merge of ef1741d2 to master
Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751
2015-03-12 23:25:27 -07:00
Yigit Boyar
1ec5cb0729 Restructure project for test apps
This CL updates project to use a local maven repo.
(local as in near source code w/ relative path).
This is necessary to have multiple versions of the
project on the same computer also provides better
separation.

I also moved integration tests to depend on these
because we cannot build the compiler and test app at
the same project.

I've changed library plugin's jar to be a separate
upload task to avoid some build issues in TestApp
when we release a @jar and @aar with same group and
artifact ids.

This CL also adds some convenience methods to
gradle build script to run all tests, prepare maven
repo, run integration tests etc. These were needed
to do CI.

Bug: 19718690
Change-Id: I3c80e09fe7c8c2780ca00c3e9b9ba99a162531cf
2015-03-12 19:27:20 -07:00
Michal Bendowski
0710ff5b59 Merge "Add a unit test to the sample project." 2015-03-12 18:30:23 +00:00
Vishwath Mohan
9b754a1bb8 Handle malformed manifests in printXMLBlock
Specially crafted manifest files can cause a segfault in printXMLBlock()
using improper tag nesting (without evaluating to
ResXMLTree::BAD_DOCUMENT). This fix checks and breaks when this
condition is detected.

Bug: 15549617
Change-Id: I27997fda86d228e993217a0c09993bff404cf317
2015-03-12 11:08:28 -07:00
Michal Bendowski
dd47168f3d Add a unit test to the sample project. 2015-03-12 09:34:11 -07:00
Yigit Boyar
20af2f0c5a Downgrade to java 1.6
This CL removes java 1.7 code so that we can easily integrate
w/ Idea.

It also partially removes dependency on ModelAnalyzer for
interface generation so that we can call it from the Idea
plugin.

Change-Id: Id7616987f5660911e951ddf20dacd4f407dacbd9
2015-03-12 09:17:11 -07:00
Diego Perez
158ac45407 Make sure shaders use a color model compatible with the destination.
Change-Id: Iaf6e14bb86835c36a5b0c37519ac2ee794d10081
2015-03-12 13:11:07 +00:00
Deepanshu Gupta
a4277e1493 am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
* commit 'a4ed5e94117a2c6c1734138faed09490245c602f':
  Tools attribute improvements for RecyclerView LayoutManager.
2015-03-12 02:01:57 +00:00
Deepanshu Gupta
a4ed5e9411 am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
  Tools attribute improvements for RecyclerView LayoutManager.
2015-03-12 01:55:16 +00:00
Deepanshu Gupta
c44430a368 Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 2015-03-12 01:16:45 +00:00
Deepanshu Gupta
3d024d4c22 am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '65215edd7acada70c2bcb060daec6ff718ae92ba':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 01:08:57 +00:00
Deepanshu Gupta
65215edd7a am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:59:39 +00:00
Deepanshu Gupta
fceec0e124 am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit 'c7fc094d319998572087e983e21c62de9f318139':
  Fix rare NPE in BridgeContext.
2015-03-12 00:56:52 +00:00
Deepanshu Gupta
ca9264eab0 am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
  Fix project settings.
2015-03-12 00:56:47 +00:00
Deepanshu Gupta
ef1741d27b am 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
* commit '05cba2f8acd88d40e1bb149915fe590d4a21b74d':
  Add RecyclerView support.
2015-03-12 00:56:41 +00:00
Deepanshu Gupta
71ba12308e am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:45:40 +00:00
Deepanshu Gupta
c7fc094d31 am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
  Fix rare NPE in BridgeContext.
2015-03-12 00:45:35 +00:00
Deepanshu Gupta
a695f87db7 am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.
2015-03-12 00:45:31 +00:00
Deepanshu Gupta
05cba2f8ac am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.
2015-03-12 00:45:27 +00:00
Deepanshu Gupta
efc09c644f am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:38:45 +00:00