Commit Graph

4347 Commits

Author SHA1 Message Date
Siva Velusamy
48c7904a44 BridgeContext: Fix typo in attr name (toLeft -> toLeftOf) am: af0f3bda17
am: f1c6e0bd7b

* commit 'f1c6e0bd7bb2f7683207048978af4fb87ee3f7c1':
  BridgeContext: Fix typo in attr name (toLeft -> toLeftOf)
2016-03-08 14:01:04 +00:00
Siva Velusamy
f1c6e0bd7b BridgeContext: Fix typo in attr name (toLeft -> toLeftOf)
am: af0f3bda17

* commit 'af0f3bda17ee3de4ad3560c9a675527b20e2af5f':
  BridgeContext: Fix typo in attr name (toLeft -> toLeftOf)
2016-03-08 13:58:52 +00:00
Siva Velusamy
af0f3bda17 BridgeContext: Fix typo in attr name (toLeft -> toLeftOf)
Change-Id: I214ddf066bd69d56275477712419745cf781cee3
2016-03-08 13:52:02 +00:00
Diego Perez
b99f8aa7d0 Merge "Add missing references to VNativeObject" into nyc-dev
am: f84d7bfb81

* commit 'f84d7bfb81e1ee1b88555e97c67b48bb4b446939':
  Add missing references to VNativeObject
2016-03-07 22:20:36 +00:00
Diego Perez
39b205cc92 Add missing references to VNativeObject
Change-Id: I2db4ad94009c0daff4649da6f85e5c084f4c01ea
2016-03-07 22:12:01 +00:00
Deepanshu Gupta
0a89e933be Merge "Change BridgeResources to Resources_Delegate" into nyc-dev
am: 7ba6dc0fcc

* commit '7ba6dc0fcc66c96383aabd8db40adf1bac66ce7f':
  Change BridgeResources to Resources_Delegate
2016-03-07 21:49:58 +00:00
Diego Perez
61c3cc2647 Merge "Animated vector drawable support" into nyc-dev
am: 5b5b1c0c5d

* commit '5b5b1c0c5debd7a90c086f36cbafa688c857a673':
  Animated vector drawable support
2016-03-07 21:47:58 +00:00
Xavier Ducrohet
7ba6dc0fcc Merge "Change BridgeResources to Resources_Delegate" into nyc-dev 2016-03-07 20:28:14 +00:00
Xavier Ducrohet
5b5b1c0c5d Merge "Animated vector drawable support" into nyc-dev 2016-03-07 20:26:56 +00:00
Diego Perez
d1c05c50ba Add support for GradientColor in layoutlib
am: 566b303365

* commit '566b303365078fac9a454f1595add19e02631db3':
  Add support for GradientColor in layoutlib
2016-03-07 09:19:28 +00:00
Diego Perez
566b303365 Add support for GradientColor in layoutlib
Change-Id: Ia9a55a9e00d7ddb5263f3dbe46b5da8dde457526
2016-03-07 09:11:11 +00:00
Deepanshu Gupta
e05f1c4684 Change BridgeResources to Resources_Delegate
This is a very hacky fix to make layoutlib work with the latest support
lib. Inject a couple of fields in android.content.res.Resources to
allow using most of the earlier code as is.

Bug: 27403642
Bug: http://b.android.com/201934
Change-Id: Ia96a1b4642a1907a77d9ca7a2392f78809b92e38
2016-03-07 09:09:02 +00:00
Adam Lesinski
838917a010 Remove accidentally committed core dump file
am: c53244db5e

* commit 'c53244db5efb791d42b9b70c05ae8ed89b62c530':
  Remove accidentally committed core dump file
2016-03-05 07:46:55 +00:00
Adam Lesinski
c53244db5e Remove accidentally committed core dump file
Change-Id: I610abfbce62585c25e98b5c36ac9f496861e66e7
2016-03-04 22:30:32 -08:00
Adam Lesinski
27b3d553c6 Merge "AAPT2: Emit proper doclava comments in R.java" into nyc-dev
am: 5b37ef489a

* commit '5b37ef489a4090da3643041c8d0e6efa282ad8b6':
  AAPT2: Emit proper doclava comments in R.java
2016-03-05 05:44:02 +00:00
Adam Lesinski
3535da2076 Merge "AAPT2: Support --no-version-vectors" into nyc-dev
am: c7f8f45c69

* commit 'c7f8f45c69323228cc2ebf6a02028c0397f512ca':
  AAPT2: Support --no-version-vectors
2016-03-05 05:42:04 +00:00
Adam Lesinski
74605cd402 AAPT2: Emit proper doclava comments in R.java
Bug:25958912
Change-Id: I663f2eb5bd54e3c3288ce9bc186c928f0a014f93
2016-03-04 20:06:05 -08:00
Adam Lesinski
626a69f345 AAPT2: Support --no-version-vectors
Change-Id: I8029b2f9e2f7ab8e37a49565f95210f47a7be609
2016-03-04 17:02:42 -08:00
Adam Lesinski
739b9f7b0f Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev
am: 8b030cce34

* commit '8b030cce347dbfc5c2f33d96daf1de7eeb219c76':
  AAPT2: Support building, linking, and merging static libraries
2016-03-04 23:51:32 +00:00
Adam Lesinski
8b030cce34 Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev 2016-03-04 23:46:49 +00:00
Adam Lesinski
64587af817 AAPT2: Support building, linking, and merging static libraries
Android static libraries are like APKs but they contain much more debugging
and source information. We need to treat them differently in 3 ways:

1) When building a static library, we skip things like ID assignment and
   product/config stripping. Source information is emitted as well.
2) When building a static library and linking against another
   static library, we don't want to merge, we want to simply reference.
3) When building an app that uses static libraries, we want to merge
   the static library under the same package with or without mangling.

Bug:25958912
Change-Id: I425e032857936a3e83173c1edc2a6cdc6020b842
2016-03-04 14:39:01 -08:00
Deepanshu Gupta
9b137e27d3 Change BridgeResources to Resources_Delegate [DO NOT MERGE]
Do not merge because the resource implementation has changed in N and
the change is no longer valid there.

This is a very hacky fix to make layoutlib work with the latest support
lib. Inject a couple of fields in android.content.res.Resources to
allow using most of the earlier code as is.

Bug: 27403642
Bug: http://b.android.com/201934
Change-Id: I186cad32b1b4de64164fbad937d989e0110c6976
2016-03-04 20:18:23 +05:30
Wale Ogunwale
439381fdbc Clear app token mAppStopped when app resumes.
am: 8d5a542f66

* commit '8d5a542f66beae774354038f15dd1afe7fcf754b':
  Clear app token mAppStopped when app resumes.
2016-03-04 03:08:16 +00:00
Wale Ogunwale
8d5a542f66 Clear app token mAppStopped when app resumes.
It is possible for an activity to be in the stopped state without
setting it's visiblility to false in window manager.
For example, the home acitivty behind the lock screen. Since the
lock screen isn't an activity it doesn't affect the visiblity set
of the home activity, so AM doesn't tell WM to hide the app token.
However, AM uses another channel to detect that the device is locked
and moves the activity into stopped state. WM on the other hand also
detects that the device is locked and hides the window surfaces of
all windows behind the lock screen. So, at this point AM has also
told WM that the activity is stopped. Once you unlock the screen
AM resumes the activity but doesn't report any visiblility changes to WM
since it's internal state didn't change. So, if you go from the home
activity to another app the home activity window will be destroyed
before the activity is stopped because mAppStopped is set to true.
We now set mAppStopped to false when the activity is resumed.

Bug: 27286867
Change-Id: Ic75456d30abd582fa44f932f5aeeb449950157ee
2016-03-03 18:59:26 -08:00
Roozbeh Pournader
886f9c301d Merge "Fix script-related parts of locale resource matching" into nyc-dev
am: 950c9f2a95

* commit '950c9f2a95eabe3d9e50a58b11cdecb7ff857555':
  Fix script-related parts of locale resource matching
2016-03-03 23:52:55 +00:00
Roozbeh Pournader
7960898f6f Fix script-related parts of locale resource matching
Previously, a bit was kept to find if the script of a locale was
explicitly "provided" in a resource. This was not backward
compatible, and failed in some edge cases when the package was
created with older versions of AAPT that did not set the bit.

The cases would happen when the old resource had an explicit script
specified in its locale, but since the "provided" bit was not set in
the package, we would assume that the script was computed by us.

This CL replaces the "provided" bit with a "computed" bit, so the
default value of the bit (set to "false" for old packages) would be
correct.

Bug: 27156990
Change-Id: I99e7f1ad8f70c90e25ab3640ed34cc1a6f8d1d64
2016-03-03 15:19:37 -08:00
Diego Perez
c9a98fa219 Merge "Add missing translate if the drawable top is not 0,0" into nyc-dev
am: 9aa2362fe8

* commit '9aa2362fe8791751a696f67895de46da45fbb8c1':
  Add missing translate if the drawable top is not 0,0
2016-03-03 15:16:32 +00:00
Diego Perez
1b338cda4e Add missing translate if the drawable top is not 0,0
If the vector drawable coordinates are not 0,0 we need to translate the
canvas to that position.

Change-Id: I3a829c427ec98061da3295e3cba8655f693d390c
2016-03-03 15:06:46 +00:00
Diego Perez
8a9a824cd5 Animated vector drawable support
Change-Id: Iefd41d95503bb4f3b26020a519636a63d3da799b
2016-03-03 12:57:16 +00:00
Diego Perez
11c031ff0b Merge "Implement native methods in VectorDrawable" into nyc-dev
am: a38b7c180d

* commit 'a38b7c180df47f88904ad6a11fda605235f6c91c':
  Implement native methods in VectorDrawable
2016-03-03 09:57:15 +00:00
Diego Perez
a38b7c180d Merge "Implement native methods in VectorDrawable" into nyc-dev 2016-03-03 09:55:05 +00:00
Neil Fuller
6f5df889ac Merge "Change libraries needed by layoutlib to "host" libs" into nyc-dev
am: 44be5f0ed7

* commit '44be5f0ed70eb1643b49a492a78dd652613e2a95':
  Change libraries needed by layoutlib to "host" libs
2016-03-03 09:15:19 +00:00
Neil Fuller
44be5f0ed7 Merge "Change libraries needed by layoutlib to "host" libs" into nyc-dev 2016-03-03 09:11:09 +00:00
Vadim Tryshev
dfe2f7ce30 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev
am: c9f0a1103e

* commit 'c9f0a1103ea307e5e157e63e7915b38f83d27ca3':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
2016-03-03 01:31:18 +00:00
Vadim Tryshev
c9f0a1103e Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-03 00:28:17 +00:00
Vadim Tryshev
66ae66a7f7 Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
It allows badging an image regardless of of the user (no
user id parameter). The styling for managed users is applied.

This is useful for new cases where the existing functions
wouldn't badge the icon, but we need it.

Bug: 25192539
Change-Id: I2fd2f226f626fb2e6cda1cfe072013350e12b41c
2016-03-02 14:55:04 -08:00
Deepanshu Gupta
71281b53c8 Merge "Add StubMethodAdapterTest" into nyc-dev
am: 1aeb31bdbb

* commit '1aeb31bdbb86faef361567e37a71fe500a8f19ac':
  Add StubMethodAdapterTest
2016-03-02 13:55:32 +00:00
Deepanshu Gupta
e34ec294a0 LayoutLib: Reference android\'s junit in intellij project.
am: dbe8a0fe3b

* commit 'dbe8a0fe3b4f01f7457aafc30783e50b77c33ff3':
  LayoutLib: Reference android's junit in intellij project.
2016-03-02 13:52:22 +00:00
Deepanshu Gupta
1aeb31bdbb Merge "Add StubMethodAdapterTest" into nyc-dev 2016-03-02 13:32:18 +00:00
Deepanshu Gupta
a9de835c17 Add StubMethodAdapterTest
This tests the bugfix in StubMethodAdapter made in the change with id
I098996e43e330e995d33f12df1c16355bbc02f0f (commit 491523d)

Change-Id: I1ac897a49071dd9558bdc6b8abec29df913a6047
2016-03-02 13:30:31 +00:00
Deepanshu Gupta
dbe8a0fe3b LayoutLib: Reference android's junit in intellij project.
Prevents errors due to mismatch in junit version.

Change-Id: I2adf32efb16472aa5f5e51025b6bb75afc76a8b4
2016-03-02 13:26:18 +00:00
Neil Fuller
d34e33bc83 Change libraries needed by layoutlib to "host" libs
They are only used on host and are one of the few places
in the build that use LOCAL_JACK_ENABLED := disabled.

Bug: 27218410
Change-Id: Ida6e649ad33decc743e8190a86486e7c4f8e5c88
2016-03-02 11:40:44 +00:00
Diego Perez
151df69f5f Merge "Fix layoutlib expand unit test" into nyc-dev
am: e6423ee0ed

* commit 'e6423ee0eda00466172d86917d6d66112974f342':
  Fix layoutlib expand unit test
2016-03-02 09:15:36 +00:00
Diego Perez
5d1013cf13 Implement native methods in VectorDrawable
Most of the VectorDrawable implementation has been moved to native code.
This CL implements most of the required functionality that existed in
Marshmallow.

Change-Id: I009bcd5c166f2bfa0795d2718fabab4a549eba9f
2016-03-02 09:03:03 +00:00
Diego Perez
e6423ee0ed Merge "Fix layoutlib expand unit test" into nyc-dev 2016-03-02 08:57:26 +00:00
Todd Kennedy
d509acbf45 Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev
am: 4f858aaa5a

* commit '4f858aaa5a7ef493e79e6d35a8d526f5d8de97e9':
  Revert "Revert "Remove deprecated methods / classes""
2016-03-01 22:41:14 +00:00
Todd Kennedy
4f858aaa5a Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev 2016-03-01 20:39:59 +00:00
Adam Lesinski
0823cec3d2 Merge "AAPT2: Fix segfault when showing error in 9-patch" into nyc-dev
am: b7a3827ea8

* commit 'b7a3827ea8c9c558936d9ce61c6b0446e5c6735d':
  AAPT2: Fix segfault when showing error in 9-patch
2016-03-01 17:12:30 +00:00
Adam Lesinski
b7a3827ea8 Merge "AAPT2: Fix segfault when showing error in 9-patch" into nyc-dev 2016-03-01 17:07:15 +00:00
Adam Lesinski
144c5eabe5 AAPT2: Fix segfault when showing error in 9-patch
Change-Id: I8f457212efc27480758a7157455d98b5e316f772
2016-03-01 09:05:11 -08:00