Commit Graph

4502 Commits

Author SHA1 Message Date
Adam Lesinski
e4c16f8cc2 Merge "AAPT2: Clean up R JavaDoc generation" into nyc-dev
am: d3caf46

* commit 'd3caf46a850fb3191562fc5e05c2aa8b5912b598':
  AAPT2: Clean up R JavaDoc generation

Change-Id: I4e83f950621c8be80600c3dc11a0cd9081477549
2016-04-08 01:29:37 +00:00
Adam Lesinski
d3caf46a85 Merge "AAPT2: Clean up R JavaDoc generation" into nyc-dev 2016-04-08 01:23:29 +00:00
Adam Lesinski
626b3dbf74 AAPT2: Clean up R JavaDoc generation
- Don't generate private attributes in public R.java
- Strip out @SystemApi from comment when generating @android.annotation.SystemApi
- Only emit a single line (up to the first period) of an attribute's comment within
  a styleable's attribute table.

Change-Id: Id6316a6861540325934133958939a12074ad4428
2016-04-07 16:26:14 -07:00
Diego Perez
d1acd13cb0 Merge "Fix NPE when runnin testActivity" into nyc-dev
am: 2155ad8

* commit '2155ad82042eb2f69b9c9d2a9ecf3884d265ad7b':
  Fix NPE when runnin testActivity

Change-Id: I5b0c4b2686ebee6814866edf0c9e30e12ea14d26
2016-04-07 19:06:38 +00:00
Diego Perez
2155ad8204 Merge "Fix NPE when runnin testActivity" into nyc-dev 2016-04-07 19:02:34 +00:00
Adam Lesinski
1f337234d0 Merge "AAPT2: Enable windows build and make sure it builds" into nyc-dev
am: f22df48

* commit 'f22df48067ec8f0a2c609c40ba842a0e5a0812b0':
  AAPT2: Enable windows build and make sure it builds

Change-Id: I4a576df3e8d90546bb9d510821bcf1fbc349bdca
2016-04-07 17:08:32 +00:00
Adam Lesinski
c02d20bdfe Merge "AAPT: Dump uses-feature version in dump badging" into nyc-dev
am: c399df7

* commit 'c399df7a683d831f55b5afdb6945ef86bfe0e181':
  AAPT: Dump uses-feature version in dump badging

Change-Id: I9fc30542458cd4a94ac6b00fb8dc943271961516
2016-04-07 17:08:30 +00:00
Adam Lesinski
f22df48067 Merge "AAPT2: Enable windows build and make sure it builds" into nyc-dev 2016-04-07 17:03:55 +00:00
Adam Lesinski
c399df7a68 Merge "AAPT: Dump uses-feature version in dump badging" into nyc-dev 2016-04-07 17:03:23 +00:00
Diego Perez
8cdf61a02e Fix NPE when runnin testActivity
Change-Id: I7ac81cb286b8d5593ae7f5fedb99bfd0fda791c5
2016-04-07 18:00:17 +01:00
Diego Perez
cdd194704b Merge "Fix rect shadow detection" into nyc-dev
am: 8d35506

* commit '8d35506e512cbbce09cedfe8e1d76653440ca3a5':
  Fix rect shadow detection

Change-Id: I499e845d9f28f094f15284f3450c2852a2046713
2016-04-07 16:34:41 +00:00
Diego Perez
8d35506e51 Merge "Fix rect shadow detection" into nyc-dev 2016-04-07 16:27:00 +00:00
Adam Lesinski
92a14b851f Merge "AAPT2: Allow <protected-broadcast> and <eat-comment> in AndroidManifest.xml" into nyc-dev
am: 450ae41

* commit '450ae41c54a39495c2e3421a73ebb38735880b58':
  AAPT2: Allow <protected-broadcast> and <eat-comment> in AndroidManifest.xml

Change-Id: Ic176a1179810ed6445825dff073c0cd55b478724
2016-04-07 00:50:38 +00:00
Adam Lesinski
c728c3daba AAPT2: Allow <protected-broadcast> and <eat-comment> in AndroidManifest.xml
Change-Id: I38c49a2a31e560dec963d44d94e067035fd59150
2016-04-06 17:40:25 -07:00
Adam Lesinski
694d0a7dfd AAPT: Dump uses-feature version in dump badging
Bug:27162500
Change-Id: I4f82cdd8ef1801c92d4ea6b4bb982c6e7d91edb5
2016-04-06 16:40:23 -07:00
Adam Lesinski
803c7c8079 AAPT2: Enable windows build and make sure it builds
Mingw32 4.8 is kind of picky with macros and some complicated template
stuff. Luckily there was another way to represent the
SFINAE code that works on all platforms. Yay!

Change-Id: Idc2e38f47bfdc57b394550bfa0f53cc0b825df25
2016-04-06 16:24:02 -07:00
Adam Lesinski
3815795263 Merge "AAPT2: Implement XmlActionExecutor to verify manifest" into nyc-dev
am: ae3622a

* commit 'ae3622a2f75c1082aec1240b365bf834e986379a':
  AAPT2: Implement XmlActionExecutor to verify manifest

Change-Id: I1f44b84672bc6a5908f4405b0202c85360b1e1a3
2016-04-06 20:51:35 +00:00
Adam Lesinski
ae3622a2f7 Merge "AAPT2: Implement XmlActionExecutor to verify manifest" into nyc-dev 2016-04-06 20:43:25 +00:00
Deepanshu Gupta
11bd8bd2e2 Merge "Add missing setAccessible to Choreographer\'s threadInstance" into nyc-dev
am: 5b758bf

* commit '5b758bf272e3e24c8822523c2a3c3f38ba6f8025':
  Add missing setAccessible to Choreographer's threadInstance

Change-Id: I276f1450023cb31b2c6cfd2e0033c4fd1db5a6fc
2016-04-06 19:36:02 +00:00
Deepanshu Gupta
5b758bf272 Merge "Add missing setAccessible to Choreographer's threadInstance" into nyc-dev 2016-04-06 19:32:02 +00:00
Deepanshu Gupta
42c8bd1b4a Add missing setAccessible to Choreographer's threadInstance
Change-Id: I753660cf68ba5a9c375942222e32059d952739bb
2016-04-06 12:29:55 -07:00
Deepanshu Gupta
bc468db47d Merge "Clear ThreadLocal storage from Choreographer" into nyc-dev
am: 39f1311b

* commit '39f1311b545f1f8732ee3a8b565018dcd0da7323':
  Clear ThreadLocal storage from Choreographer

Change-Id: I6245cf707bc5449df2d729af4f89923223aeae93
2016-04-06 19:15:11 +00:00
Deepanshu Gupta
39f1311b54 Merge "Clear ThreadLocal storage from Choreographer" into nyc-dev 2016-04-06 19:04:00 +00:00
Adam Lesinski
cc5609d8e4 AAPT2: Implement XmlActionExecutor to verify manifest
Defines a set of actions to perform on XML elements defined by their
hierarchy, eg: manifest -> application -> activity.

This can be used to easily add rules to check more tags in AndroidManifest.xml

Change-Id: I76c6916a98b6403075a7e56e16230979dc6cbee1
2016-04-06 11:37:05 -07:00
Deepanshu Gupta
61ccc9198a Clear ThreadLocal storage from Choreographer
Change-Id: I5abb5c68a635e7808b0a036ba4d9971cd0139aa3
2016-04-06 11:32:36 -07:00
Diego Perez
a4d7ad8663 Fix rect shadow detection
ViewGroup_Delegate was trying to use a rect shadow even in cases where
we needed to use a path. This caused that using a ToggleButton would
throw an exception with radius < 0.
Also, changed the tests so we can detect certain render errors and
ignore other (like known fidelity warnings).

Change-Id: I900d45f9efa892ad0aebc8f4ef73fc9f21ab9d92
2016-04-06 12:33:26 +01:00
Deepanshu Gupta
168f4185fa Merge "Add properties from textAppearance to property map" into nyc-dev
am: bad02b0

* commit 'bad02b0ec9fb977f588db405a878ade9535bf240':
  Add properties from textAppearance to property map

Change-Id: I9cdbaedb061cff1a31a2ba5ceb8e92624d22c33f
2016-04-06 00:07:22 +00:00
Deepanshu Gupta
bad02b0ec9 Merge "Add properties from textAppearance to property map" into nyc-dev 2016-04-05 23:59:02 +00:00
Deepanshu Gupta
91253ed046 Add properties from textAppearance to property map
The default property map is used to get the list of XML properties that
a view queried. For things like textAppearance, these are additional
attributes that the TextView queries, but wasn't added to  the property
map. Add them too.

Change-Id: I1e03fbeced224866de1dcc51b93d5aa5d5886ade
2016-04-05 16:58:00 -07:00
Diego Perez
eb4922b526 Merge "Separate inflate from render step" into nyc-dev
am: 4ce88b1

* commit '4ce88b10ab1c593d80643878cc6e90edc81b6aab':
  Separate inflate from render step

Change-Id: I1a65f91ce73a0137f6b24977520578ae246c5d59
2016-04-05 08:23:28 +00:00
Diego Perez
4ce88b10ab Merge "Separate inflate from render step" into nyc-dev 2016-04-05 08:17:46 +00:00
Adam Lesinski
934dfddfd4 Merge "AAPT2: Add option to add JavaDoc annotations to Java classes" into nyc-dev
am: b12c260

* commit 'b12c2601f475ee127d9ab333e5b8c6cd9a9967e4':
  AAPT2: Add option to add JavaDoc annotations to Java classes

Change-Id: I67b797ff2bdc05ef318796841b545812179a617c
2016-04-04 22:29:37 +00:00
Adam Lesinski
b12c2601f4 Merge "AAPT2: Add option to add JavaDoc annotations to Java classes" into nyc-dev 2016-04-04 22:25:56 +00:00
Adam Lesinski
3524a23edb AAPT2: Add option to add JavaDoc annotations to Java classes
Change-Id: I7ee8c20cdd91380927a65c41097ffd3a6ffa2df5
2016-04-04 12:42:05 -07:00
Diego Perez
2605f91f70 Separate inflate from render step
Up until now, createSession will always do a first render. With the new
embedded layoutlib we might want to actually call objects from the
inflated view before doing a render or even do it between renders.
This allows to avoid the first initial render unless needed.

This CL also fixes a bug that would only happen when multiple render
calls are issued. When scrolling, use scrollTo since we likely want
absolute positions, not relative.

Change-Id: I4b1d8388d7218a8de33e25cd546fd965fcb07dc7
2016-04-04 19:43:48 +01:00
Wonsik Kim
9a4ec086a2 Merge "Don\'t try to compress .mkv resources" into nyc-dev
am: e8c5480

* commit 'e8c5480ba660232097bcc928fd7a82138e1af188':
  Don't try to compress .mkv resources

Change-Id: Ifd8bd3c817e7a656c68dec8c1841d6cea2b9df32
2016-04-04 14:53:14 +00:00
Wonsik Kim
e8c5480ba6 Merge "Don't try to compress .mkv resources" into nyc-dev 2016-04-04 14:46:10 +00:00
Diego Perez
2e4231ba84 Merge "Update Path and RenderNode delegates to new API" into nyc-dev
am: 18e7e10

* commit '18e7e10f67384796282c913805b0124137bd13e5':
  Update Path and RenderNode delegates to new API

Change-Id: I36c60108b20d123b4f76cc786a959d8672efa235
2016-04-04 12:28:40 +00:00
Diego Perez
18e7e10f67 Merge "Update Path and RenderNode delegates to new API" into nyc-dev 2016-04-04 12:22:21 +00:00
Diego Perez
8f43dfef2b Update Path and RenderNode delegates to new API
RenderNode_Delegate nCreate now takes a reference to this. In the
Path_Delegate, the native_offset call with a destination path has been
removed.

Change-Id: I6332bb4733974b817e8a29eab82e2218fcf942c4
2016-04-04 10:18:55 +01:00
Wonsik Kim
6e452f9e8a Don't try to compress .mkv resources
Bug: 27987970
Change-Id: I58e920e81d1e79b7fbba479d8fb34afb3911f97d
2016-04-04 15:39:40 +09:00
Chong Zhang
ec500bfb41 fix build break
am: d19342a

* commit 'd19342a83d130ba5456d6c2ed10b08391d4f40be':
  fix build break

Change-Id: I24dd1b474252ae1f19a987decfd0116061f936e3
2016-04-01 22:45:36 +00:00
Chong Zhang
d19342a83d fix build break
bug: 27834014
Change-Id: Ib5d03818d285c50d220c45ebace635faf6771ff3
2016-04-01 15:31:46 -07:00
Chong Zhang
47814b0829 Merge "Avoid extra relaunch when rotating side-by-side apps" into nyc-dev
am: fbe10f1

* commit 'fbe10f175fa3cb2083d15b4dbfb05c6f223d7f2c':
  Avoid extra relaunch when rotating side-by-side apps

Change-Id: I1f58f668a9593571b26d9c8c9692cd625e9679a8
2016-04-01 22:07:39 +00:00
Chong Zhang
fbe10f175f Merge "Avoid extra relaunch when rotating side-by-side apps" into nyc-dev 2016-04-01 21:56:45 +00:00
Chong Zhang
167bbfac24 Avoid extra relaunch when rotating side-by-side apps
Update configuration with WM first and check if the stacks need to be
resized due to the update. If so, let activity manager resize the stacks
inline, instead of letting WM schedule another pass of resizeStack. This
way the configuration will be updated to the latest before ensureActivity-
ConfigurationLocked, and we don't need another relaunch there.

bug: 27834014

Change-Id: Ib761a96cada0c3247b0480f18370670c593159da
2016-04-01 13:58:41 -07:00
Adam Lesinski
f2b0d53a95 Merge "AAPT2: Change how we generate Java classes" into nyc-dev
am: 30906ad

* commit '30906ad2d628ea341540e13ba488d11e23e745be':
  AAPT2: Change how we generate Java classes

Change-Id: I5f6e8dcbc6b9c97d6c1c0a31a0607daee9cff0d5
2016-04-01 00:51:08 +00:00
Adam Lesinski
30906ad2d6 Merge "AAPT2: Change how we generate Java classes" into nyc-dev 2016-04-01 00:44:21 +00:00
Adam Lesinski
6cbfb1de49 AAPT2: Change how we generate Java classes
Previously we would be writing out the Manifest.java file as we
processed the AndroidManifest.xml. This would lead to empty
Manifest classes if there were no permissions or permission groups
defined in the AndroidManifest.xml.

This would pose problems for processes that checked for public classes
and considered them part of the API (support lib).

Now we collect the structure of the Java class in memory before deciding
if a file should be created.

Change-Id: I6b909f28d74356414c6ef5ad005180d6ea5e44ca
2016-03-31 16:43:04 -07:00
Roozbeh Pournader
9da7bb7584 Merge "Re-enable emoji font tests" into nyc-dev
am: 2159f70

* commit '2159f7017dddaa376dd30786c7e6dcc0ecdf4cfb':
  Re-enable emoji font tests

Change-Id: I0091484be93861086200c01d44c3fb66b814b204
2016-03-31 22:28:30 +00:00