Commit Graph

4547 Commits

Author SHA1 Message Date
Doug Felt
e13a3252f9 Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev
am: 398342f9b6

* commit '398342f9b66046582eff7d98e252d435475d6a92':
  Patch fontchain_lint to exclude modern_pentathlon.

Change-Id: I7bdd78e1fef0f3debdfd97d7c742a4d0987101e1
2016-04-29 21:30:45 +00:00
Raph Levien
398342f9b6 Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev 2016-04-29 21:25:20 +00:00
Doug Felt
ce51db00ec Patch fontchain_lint to exclude modern_pentathlon.
Fix build breakage.
Bug: 28426800

Change-Id: Idcc8f1b66014b25758c163d908d34f06011d9927
2016-04-29 14:17:57 -07:00
Deepanshu Gupta
5d76be778b Merge "Add namespace before attr name in defPropMap" into nyc-dev
am: 4c5e7a740a

* commit '4c5e7a740a632829b48b2324f80a43ab94ac7551':
  Add namespace before attr name in defPropMap

Change-Id: I93619d0e2a28ef30b43e1fe8361142da3122cdda
2016-04-29 20:10:34 +00:00
Deepanshu Gupta
ba4b9ab111 Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev
am: 2385e2184a

* commit '2385e2184a68318a582f075bcd483baa35c776b4':
  Revert "Switch LayoutLib to Java 8"

Change-Id: Ie231af95e2d2361419db0ffc03c3abff4c6f1cc3
2016-04-29 20:10:29 +00:00
Deepanshu Gupta
4c5e7a740a Merge "Add namespace before attr name in defPropMap" into nyc-dev 2016-04-29 20:06:01 +00:00
Deepanshu Gupta
2385e2184a Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev 2016-04-29 20:05:39 +00:00
Rohit Agrawal
ab45664130 Merge "AAPT: ProGuard config for components in main dex." into nyc-dev 2016-04-29 01:19:08 +00:00
Adam Lesinski
0d9f32da56 Merge "AAPT: ProGuard config for components in main dex." am: da66fa7526
am: 1d58c18081

* commit '1d58c18081a2f17afc964de2f261a699e11d6f02':
  AAPT: ProGuard config for components in main dex.

Change-Id: I156e1805ad64798be891747a81561589d9543424
2016-04-28 20:18:21 +00:00
Adam Lesinski
da66fa7526 Merge "AAPT: ProGuard config for components in main dex." 2016-04-28 20:06:19 +00:00
Adam Lesinski
461be97e30 Merge "AAPT2: Accept a file with arguments when argument list is too long" into nyc-dev
am: 28d6c1e493

* commit '28d6c1e49313bcb4823541d0114b2ff04f8cb446':
  AAPT2: Accept a file with arguments when argument list is too long

Change-Id: I85c1aaa9818e9331a458892898204617af453b02
2016-04-28 19:44:21 +00:00
Adam Lesinski
28d6c1e493 Merge "AAPT2: Accept a file with arguments when argument list is too long" into nyc-dev 2016-04-28 19:34:31 +00:00
Adam Lesinski
c51562cf5a AAPT2: Accept a file with arguments when argument list is too long
Bug:22775504
Change-Id: Ife73d4e4611016c9ee7b56264bc6a765c54beba3
2016-04-28 11:14:38 -07:00
Rohit Agrawal
682583c890 AAPT: ProGuard config for components in main dex.
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

Bug: 27383099
Bug: 28425556

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622)
2016-04-27 19:50:55 +00:00
Chih-Hung Hsieh
c6baf563ba Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
2016-04-27 11:38:12 -07:00
Rohit Agrawal
6ba873faec AAPT: ProGuard config for components in main dex.
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

BUG: 27383099

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622)
2016-04-27 11:26:55 -07:00
Deepanshu Gupta
a43c4fa09f Add namespace before attr name in defPropMap
Change-Id: I36d094fb69d5f5ce0aebde04960ffcd19c27a2eb
2016-04-26 15:19:31 -07:00
Svetoslav Ganov
599bf728de Merge "Disallow disable of the system shared libs." into nyc-dev
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I111c0285b73ffa64594c39b54d18d5d3ff670953
2016-04-22 21:07:11 +00:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Diego Perez
1de566b58b Merge "Separate measure so it can only run inflate if needed" into nyc-dev
am: 3874597

* commit '38745971c266f5fca692ef284e1e3b4d38af1a41':
  Separate measure so it can only run inflate if needed

Change-Id: Id52cf5e5c211d8c0f2363e0e349669a1c1f4ca40
2016-04-19 07:38:42 +00:00
Diego Perez
38745971c2 Merge "Separate measure so it can only run inflate if needed" into nyc-dev 2016-04-19 07:34:17 +00:00
Adam Lesinski
d699f726ce Merge "SettingsLib: Build with AAPT2" into nyc-dev
am: 0b1a203

* commit '0b1a203830f49b8998692873c161a8fb7c7ab9cb':
  SettingsLib: Build with AAPT2

Change-Id: Id8c103e38a78b13598bcf7d50d51239c08c22ca1
2016-04-16 07:06:09 +00:00
Adam Lesinski
0b1a203830 Merge "SettingsLib: Build with AAPT2" into nyc-dev 2016-04-16 07:01:08 +00:00
Diego Perez
39e540caff Separate measure so it can only run inflate if needed
This allows to only do inflate + measure and not to render.

Change-Id: I4be08513728b656f699e9115e14cf618d95b538a
2016-04-15 11:38:19 +01:00
Adam Lesinski
5ff3ad6312 SettingsLib: Build with AAPT2
Bug:22775504
Change-Id: I2e5015235384d124418d32186daa190f38e1c5b3
2016-04-14 14:45:21 -07:00
Deepanshu Gupta
21e1f3c5ad Merge "Return complete properties map instead of per view" into nyc-dev
am: e70464e

* commit 'e70464e11694712d62092ac3a623c32fe6d5e8a5':
  Return complete properties map instead of per view

Change-Id: I40f801e0f1daa9240af11d93dbe52cc17bd29ac8
2016-04-14 19:48:58 +00:00
Deepanshu Gupta
e70464e116 Merge "Return complete properties map instead of per view" into nyc-dev 2016-04-14 19:42:16 +00:00
Deepanshu Gupta
eaf1853b98 Return complete properties map instead of per view
Change-Id: Ib7c71606d1bf43bbaa80f5601a8508d7aa49d953
2016-04-14 12:38:23 -07:00
Svetoslav Ganov
a9c2500a68 Disallow disable of the system shared libs.
bug:28173410

Change-Id: If731f2d90312a083bb940f83431ba3eccf213947
2016-04-13 19:31:40 -07:00
Jerome Gaillard
e4e690b655 Merge "Change method name in VectorDrawable_Delegate" into nyc-dev
am: ff9e0de

* commit 'ff9e0dede85d12576227013feeb3a1e7fd5a4774':
  Change method name in VectorDrawable_Delegate

Change-Id: I9b706ab3297c69f58a948282250ae1ed40cd3c0b
2016-04-13 12:21:28 +00:00
Jerome Gaillard
8c0ab16494 Change method name in VectorDrawable_Delegate
Following change in VectorDrawable from commit cdedc9a80d.

Change-Id: I5d17b2e77c9600fe3da981c77a3e39dcd4df1d1f
2016-04-13 11:48:28 +01:00
Diego Perez
dea620e428 Merge "Synchronize access to the main looper" into nyc-dev
am: 49a5436

* commit '49a54366c11ed5ac887e6f897aa6ee5e4b86489c':
  Synchronize access to the main looper

Change-Id: Ife3e869aea8c257c1a3e2dd38fc81f83ec747735
2016-04-13 08:23:09 +00:00
Diego Perez
49a54366c1 Merge "Synchronize access to the main looper" into nyc-dev 2016-04-13 08:14:57 +00:00
Suprabh Shukla
7b13098b62 Merge "Added api to delete cache files for a given user" into nyc-dev
am: 0a6a6db

* commit '0a6a6dbe9107a3e31d74293f853b46ae0e5b9e7b':
  Added api to delete cache files for a given user

Change-Id: If8bc5327e76680d3d30127b1129e7c4c36928421
2016-04-13 03:17:24 +00:00
TreeHugger Robot
0a6a6dbe91 Merge "Added api to delete cache files for a given user" into nyc-dev 2016-04-13 03:13:49 +00:00
Roozbeh Pournader
eae7a2de74 Merge "Add many more emoji tests" into nyc-dev
am: a51a12c

* commit 'a51a12cfe73c3f578a013543fddd9d913b46c143':
  Add many more emoji tests

Change-Id: I07fdc9040cec1a6be7fe7fa09fb56b6ea724e8d1
2016-04-13 02:09:00 +00:00
Roozbeh Pournader
a51a12cfe7 Merge "Add many more emoji tests" into nyc-dev 2016-04-13 02:01:19 +00:00
Suprabh Shukla
78c9eb8947 Added api to delete cache files for a given user
Added an api to delete application cache files for a specific user. This
allows settings to clear cache files for work profile apps as well.

Bug: b/25338468
Change-Id: I52d4944a7a03b6d63ad44dd6bb868aec62815eab
2016-04-12 18:23:56 -07:00
Deepanshu Gupta
e69268012d Merge "Add post resolve property values" into nyc-dev
am: a8d21a0

* commit 'a8d21a0facb415ed085059298c50eaa58544129a':
  Add post resolve property values

Change-Id: I6f2c2f086a680dc82a02450b891e1d9de8885004
2016-04-12 22:21:33 +00:00
Deepanshu Gupta
79c59fe4a8 Add post resolve property values
Change-Id: Ia86b7dfc479cc5313cce36b6b3066fbb1d00c292
2016-04-12 12:46:09 -07:00
Diego Perez
8d25697bf0 Synchronize access to the main looper
Change-Id: I4b9375d07c4191393c04f8b40905e63742b3baad
2016-04-12 18:27:31 +01:00
Diego Perez
aa1f2e6750 Merge "Fix broken delegates for FontFamily and PathParser" into nyc-dev
am: 37e16f8

* commit '37e16f8e3bc3b3e3d3a4c37b5b7ccda953c78ac9':
  Fix broken delegates for FontFamily and PathParser

Change-Id: Id418eaa3ccf69a4a757f8410f152718e4088f373
2016-04-12 16:34:51 +00:00
Diego Perez
a0a51b6fb6 Fix broken delegates for FontFamily and PathParser
The theme editor is throwing an exception with the last embedded
layoutlib because a missing method. Added also another missing method in
FontFamily.

Change-Id: I710ba7618df6444a3185b581cdc5dc8400f7c604
2016-04-12 17:21:00 +01:00
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