4073 Commits

Author SHA1 Message Date
Deepanshu Gupta
760a214168 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465 am: 4d9df358ec
am: 138a901db4

* commit '138a901db492989ae7db53d664cac698cc5bfdc7':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-20 03:53:45 +00:00
Deepanshu Gupta
138a901db4 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465
am: 4d9df358ec

* commit '4d9df358ec847262872c09962105537be350f8fd':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-20 01:53:43 +00:00
Adam Lesinski
78de1bcbbd Merge "AAPT2: Fail compiling when private symbols are referenced" 2015-11-19 23:43:08 +00:00
Vladislav Kaznacheev
dd311b2598 Merge "Revert "Fix broken build"" 2015-11-19 22:50:49 +00:00
Vladislav Kaznacheev
4a13b87092 Revert "Fix broken build"
This reverts commit 88d753291c834c41ad6c9229082146be72cf8014.

Revert required because the base class change
has been reverted in http://ag/816441

Change-Id: Iee8a8272bda0a92aed8ae46af8439910d8f1ecdc
2015-11-19 22:50:33 +00:00
Adam Lesinski
467f171315 AAPT2: Fail compiling when private symbols are referenced
Also moved some XML specific stuff into its own directory,
and refactored ReferenceLinker a bit.

Change-Id: I912247a82023c1bbf72dc191fbdaf62858cbec0c
2015-11-19 14:46:53 -08:00
Deepanshu Gupta
4d9df358ec Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0
am: 867c370465

* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-19 21:09:24 +00:00
Deepanshu Gupta
8c971ae5a0 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev 2015-11-19 20:48:52 +00:00
Deepanshu Gupta
65a834980c Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This reverts commit 631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.

The revert is only for cherry-pick back to mnc-sdk-release.

Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
2015-11-19 20:47:26 +00:00
Diego Perez
865ad592fe Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 am: 14a826380d am: 0b76d094c6
am: f9281b6dfe

* commit 'f9281b6dfe94f1df0fac3ddbad846012b0a6fb7d':
  Fix delegation of methods within inner static classes
2015-11-19 03:19:00 +00:00
Vladislav Kaznacheev
88d753291c Fix broken build
Followup to ag/808050

Change-Id: I9912eae6a8c09b90685e19b3a9080b2d557c857b
2015-11-18 12:53:45 -08:00
Alex Deymo
8d31b08904 Merge "Remove the aidl tool" into mnc-dr2-dev 2015-11-18 16:39:09 +00:00
Diego Perez
f9281b6dfe Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 am: 14a826380d
am: 0b76d094c6

* commit '0b76d094c6e121f21135d851e4ee6ce8b6ee625f':
  Fix delegation of methods within inner static classes
2015-11-18 00:13:20 +00:00
Deepanshu Gupta
ae03bc0be3 Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
am: 377cc4887d

* commit '377cc4887d3557377f63bfe9d179623985c9484e':
  Revert "LayoutLib: Fix true transparency in status bar."
2015-11-17 23:34:24 +00:00
Deepanshu Gupta
71daca031e Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b
am: dd97829cf2

* commit 'dd97829cf2b8599058f0410ea45bc84cd86e839b':
  AppCompatActionBar: use findClass to test presence
2015-11-17 23:33:02 +00:00
Diego Perez
603544d4c4 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev 2015-11-17 22:34:08 +00:00
Deepanshu Gupta
377cc4887d Revert "LayoutLib: Fix true transparency in status bar."
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."
2015-11-17 20:50:07 +00:00
Deepanshu Gupta
e4826981f2 LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 am: e45abdb126
am: 606e5a0c56

* commit '606e5a0c562a461919e90ddf1e41036d926c9716':
  LayoutLib: IntelliJ changed project files.
2015-11-17 20:43:02 +00:00
Deepanshu Gupta
dd97829cf2 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence
2015-11-17 20:32:31 +00:00
Deepanshu Gupta
4ea74d2960 Revert "LayoutLib: Fix true transparency in status bar."
This reverts commit 4eb298a941c3f465944b63f1a06518e911681c89.

Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.

Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
2015-11-17 12:25:25 -08:00
Deepanshu Gupta
42a893b50b Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 2015-11-17 20:22:43 +00:00
Deepanshu Gupta
ab45fc1a4f LayoutLib: IntelliJ changed project files.
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
2015-11-17 19:54:06 +00:00
Deepanshu Gupta
22931224d9 LayoutLib: IntelliJ changed project files.
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
2015-11-17 11:37:35 -08:00
Deepanshu Gupta
99b54b364b AppCompatActionBar: use findClass to test presence
To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.

Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
2015-11-17 11:34:32 -08:00
Christopher Wiley
e5c5d995e4 Remove the aidl tool
This has been moved into its own repository at

//system/tools/aidl

Test: Built aosp_arm-eng from scratch.
Bug: 23691099

(cherry-pick of commit 73ea1230fc2a4007973efe3730d482d7bc6cf87a)

Change-Id: I993f2f08ed476e1cce6f39b58fed8eca2f2ce979
2015-11-17 14:52:31 +00:00
Deepanshu Gupta
efc90e4f60 Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7 am: 9f275ec3fd
am: d00380a560

* commit 'd00380a560dff6a2237086f2f4c96313785ce93f':
  WindowDecorActionBar name change fix.
2015-11-17 03:59:41 +00:00
Deepanshu Gupta
ce400cd75e Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
am: 62302bd72a

* commit '62302bd72aaa6b0f934257447e8dcd636799180e':
  WindowDecorActionBar name change fix.
2015-11-17 01:17:27 +00:00
Adam Lesinski
abf83cbe4f AAPT2: Prevent duplicate enums/flags
Change-Id: I998cba12ac194000e9c778cb620ed7ab33003e7d
2015-11-16 15:59:10 -08:00
Deepanshu Gupta
2b0551175d WindowDecorActionBar name change fix.
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.

Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
2015-11-16 15:46:12 -08:00
Adam Lesinski
cf95a58014 AAPT2: Fix tokenizer to deal with the separator as last char
When the separator was the last character, the tokenizer would skip
the empty string, which is wrong.

Change-Id: I64ceb4e8d4ac48ee41d40781ab5785a3bc61b24d
2015-11-16 15:44:08 -08:00
Adam Lesinski
fc9570e6b0 AAPT2: Fix a bug where files would only show up for one config
The set of files to build was only comparing resource name and
not configuration.

Also support --extra-packages as a colon separated list of packages.

Change-Id: I36b65cd15299cdc722b785a7891a24ca1bc4fb45
2015-11-16 15:09:15 -08:00
Adam Lesinski
2c23271c75 Merge "AAPT2: Be more strict parsing references" 2015-11-16 21:36:54 +00:00
Adam Lesinski
dcdf08ff4c Merge "AAPT2: Minor fixes to SymbolTable and diagnostic output" 2015-11-16 21:36:14 +00:00
Adam Lesinski
7298bc9c85 AAPT2: Be more strict parsing references
Change-Id: I3d54a519687fff1e66acb8e395ef99ba01a1b845
2015-11-16 12:31:52 -08:00
Adam Lesinski
e352b990e1 AAPT2: Minor fixes to SymbolTable and diagnostic output
The SymbolTable lookup relied on the configuration, which we NEVER
want. Now we rely solely on the symbols defined in the ResTable
and no specific configuration or value of that symbol.

Also added some better source logging.

Change-Id: I983855c283493e924b2e92a9fd8e4cb841769349
2015-11-16 11:59:14 -08:00
Adam Lesinski
51c2892768 Merge "AAPT2: Add support for overlays when merging resources" 2015-11-13 18:40:36 +00:00
Diego Perez
6777f54fa4 Fix delegation of methods within inner static classes
Currently, delegation of inner static classes methods is broken since
the rewritten method tries to pass an instance to the outer class. This
updates the method generation to only pass the reference if the inner
class is not static.

Change-Id: I8493929cafdbd80968989b422af0f956fa65681a
2015-11-13 14:06:50 +00:00
Deepanshu Gupta
b39ca7fa47 Improve error reporting on Exceptions in fw views. am: d30c141a2d
am: e0c9dd1b4f

* commit 'e0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49':
  Improve error reporting on Exceptions in fw views.
2015-11-12 23:12:59 +00:00
Deepanshu Gupta
e0c9dd1b4f Improve error reporting on Exceptions in fw views.
am: d30c141a2d

* commit 'd30c141a2dee881fd83e1415a50161def1acf227':
  Improve error reporting on Exceptions in fw views.
2015-11-12 22:36:00 +00:00
Adam Lesinski
fb48d292d9 AAPT2: Add support for overlays when merging resources
Change-Id: Iea9e41123cf89e3cfba7eb6bea89def56dee8093
2015-11-12 14:26:29 -08:00
Deepanshu Gupta
d30c141a2d Improve error reporting on Exceptions in fw views.
When there's an exception during the inflation of a framework view (for
example invalid attributes), report the exception correctly. The earlier
behaviour assumed the exception to be a ClassNotFoundException and tried
to load it from the user's project. This is not longer the case.

Also, update the MockView class to a FrameLayout with a single TextView.
This means that the MockView is a ViewGroup and will not choke when
someone attempts to add a View to it (although, the view will be
silently dropped).

Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728
2015-11-12 13:56:14 -08:00
Robert Carr
64aadd0849 Clarify geometry management for SurfaceView
In the hardware accelerated case, RenderThread needs
to be the authority of information on the geometry of
the SurfaceView (this will occur via moving the
repositionWindow call to RenderThread). In order
to support this we have to enable calling relayoutWindow
without geometry (so that it will not fight with
repositionWindow). Add such a mode to relayoutWindow
and use it from SurfaceView. Add size to repositionChild
while we are here.

Bug: 22802885
Change-Id: Ie45132c22f34cc6ecfe2446912b30bd1df414406
2015-11-10 19:21:22 +00:00
Adam Lesinski
400136e06a Merge "AAPT2: Accept aliases defined for external resource types" 2015-11-07 22:11:00 +00:00
Adam Lesinski
caf4a89f18 Merge "AAPT2: Disambiguate merging of resources" 2015-11-07 22:09:37 +00:00
Adam Lesinski
fa10505cea AAPT2: Accept aliases defined for external resource types
Resource types that are typically stored outside of the resource table
(like layout, xml, drawable) can only have aliases (reference to another
resource).

Change-Id: Idb768801f02bb142e5be5e438904f221499bd756
2015-11-07 13:34:39 -08:00
Adam Lesinski
83f2255f69 AAPT2: Disambiguate merging of resources
Merging local app resources is slightly different than merging
resources from a static library.

Local app resources may not have a package name set, but we do take interest in the
ID set for the package (should be 0x0 or match the ID of the app we're building).

Static library resources have an explicit package name defined for them, so we
only merge resources from that package.

Change-Id: I95e559ae94cc1df6972e77a347b1b37a93674c4d
2015-11-07 11:51:23 -08:00
Adam Lesinski
b444afc0f4 Merge "AAPT2: Add support for clearer in-progress public attributes" 2015-11-07 18:07:01 +00:00
Jeff Sharkey
94d0b64d4f Merge "Initial file-based encryption public APIs." 2015-11-07 02:37:21 +00:00
Jeff Sharkey
15447798a3 Initial file-based encryption public APIs.
Define two explicit directories where device-encrypted and
credential-encrypted data will be stored.  Third-party apps only
need access to the device-encrypted directory, so that's the only
API exposed for now.

General cleanup in how ApplicationInfo details are derived.

Bug: 22358539
Change-Id: If0a0108721a4aa1c3052b4912e08604bbf24e1ae
2015-11-06 18:35:27 -08:00
Adam Lesinski
6a85b54d50 Merge "AAPT2: Fix inclusion of comments in R.java javadoc" 2015-11-07 02:31:20 +00:00