Commit Graph

4574 Commits

Author SHA1 Message Date
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
Roozbeh Pournader
5dde087811 Add many more emoji tests
This creates an exact map of the emoji font and adds the following
tests:
* Test that all 'emoji style' variation sequences exist in the color
  emoji font.
* Test that the emoji font contains the exact same character set that
  we expect.
* Test that all unsupported flags map to the same flag tofu glyph.
* Test that the reverse of ZWJ sequences exist in the font and map to
  the same glyph.
* Test that legacy PUA Android emoji are supported.
* Test that all emoji sequences that should map to the same glyph do
  so, but no other sequences map to the same glyph.

Bug: 26187231
Change-Id: I64ef17862df2d91879bf7904055c77c24abb7d88
2016-04-04 11:37:49 -07: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
Roozbeh Pournader
27ec3ace18 Re-enable emoji font tests
This re-enables the emoji font tests, but doesn't run the tests if
SMALLER_FONT_FOOTPRINT is set.

Additionally, we test that there's one and only one emoji font in the
fallback chain.

Bug: 26187231
Bug: 27785690
Change-Id: I2e6d467e3f54ee3d41737170d7c2492a0f6b30f0
2016-03-31 13:23:15 -07:00
Vladislav Kaznacheev
72e7feb221 Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev
am: b7d08c3

* commit 'b7d08c3f3cee0e1575739250c12923930a9a5dbe':
  Add wallpaper input consumer to WindowManagerService

Change-Id: I0a80ffe5fcd4f12dbe295b81b4f357b9b119319c
2016-03-31 18:46:34 +00:00
Vladislav Kaznacheev
0d50d8660d Add wallpaper input consumer to WindowManagerService
This is an input consumer similar to the one used when hiding the navbar,
but placed above wallpapers. It might be useful for processing touch
events over "desktop" in freeform MW mode.

Re-landing I9d6d28a624f750ad48fc39f9b149dd1f989cceba after fixing build.

Bug:26688904
Change-Id: I89fdabd9c72cdd4a1d7ca626c33ddc99ddea97f9
2016-03-31 18:42:22 +00:00
Andrew Johnson
8b29f251c5 Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev
am: 08a3fa7

* commit '08a3fa7dea522112cbeab954a396845f7d638779':
  Removing assignments to localeScriptWasComputed in aapt.

Change-Id: I12341b7428d320a6bddb5527c993cee1ddcb5b28
2016-03-31 15:37:22 +00:00
Andrew Johnson
08a3fa7dea Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev 2016-03-31 13:52:10 +00:00
Diego Perez
1478696b1c Merge "Implement VirtualRefBasePtr native methods" into nyc-dev
am: 9d1a69f

* commit '9d1a69ff558be7f29862b62937b4ef9544db0d3c':
  Implement VirtualRefBasePtr native methods

Change-Id: I4d63fe080049fd50d9e71145694a2298cde8e72b
2016-03-31 08:20:46 +00:00
Diego Perez
9d1a69ff55 Merge "Implement VirtualRefBasePtr native methods" into nyc-dev 2016-03-31 08:14:26 +00:00
Jeff Sharkey
4d5806d0e6 Merge changes Ifecff4f1,Ia302de46 into nyc-dev
am: 2c0ae91

* commit '2c0ae91f2d22b2c9a3b506d3a7f60bc31f72c57d':
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.

Change-Id: I24829b73653a657a210e41fed6f199f4b8e4dac9
2016-03-31 06:57:16 +00:00
Jeff Sharkey
2c0ae91f2d Merge changes Ifecff4f1,Ia302de46 into nyc-dev
* changes:
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.
2016-03-31 06:48:55 +00:00
Jeff Sharkey
70168dde6e Make Parcelable classes final, API cleanup.
Remove some Context methods that leaked through.  Add lint rule to
recommend using List<? extends Parcelable> instead of Parcelable[].

Bug: 27932224, 27930145, 27932911
Change-Id: Ia302de46cdb0c5101fa175a09316df91aeefcf0d
2016-03-30 23:31:39 -06:00
Andrew Johnson
299e488ee2 Removing assignments to localeScriptWasComputed in aapt.
On certain devices running Android M with unknown vendor
modifications. Setting the localeScriptWasComputed bit in
the resource parameters struct causes the translations
for many languages to fail to load. The app then
defaults to English.

This has been reported on the following devices:
Motorola XT1086, XT1096, and XT1586, HTC One, and Huawei
MediaPad 10 LINK.

This change works around the issue by never setting
localeScriptWasComputed in aapt and instead always
writing the default value of false.

Bug: 27872476
Change-Id: Id638d1d0e5f9dcb1c02e65d67667d76174c69b9e
2016-03-30 20:24:48 -04:00
Ying Wang
d625b1370a Merge "Fix compilation using javac." into nyc-dev
am: 92e1ea2

* commit '92e1ea2383014390532c61afbc81773b8934ae48':
  Fix compilation using javac.

Change-Id: I43e557c0144c1923f234519018b00149f8a9a728
2016-03-30 19:16:59 +00:00
Diego Perez
fc970ab65a Implement VirtualRefBasePtr native methods
The VirtualRefBasePtr is used to track the usage of native objects from
the java side by reference counting. Implementing the class delegate to
make sure we dispose the objects correctly.

Change-Id: I3dd4717944b0dbe79f30e49b3083bf65c6e5276d
2016-03-30 17:53:23 +00:00
Ying Wang
5e92c429ec Fix compilation using javac.
We still need to be able to compile all the Java source code in the tree
using javac, though the compiled code never ends up running on device.

Bug: 25958912
Change-Id: Id76663cdf768db579517515d7b7f51519b515fa8
2016-03-30 10:33:47 -07:00
Robert Carr
d4c85e182a Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev
am: ffe3098

* commit 'ffe309816989457f71a39a84d22fb06fe5b6e8d5':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I8e57aa126a601df935b6005b74ba7842f819c741
2016-03-30 00:22:03 +00:00
Robert Carr
0b10c335c7 Ensure we change SurfaceView size from UI thread.
We need to change the SurfaceView size from the UI thread
so that we can appropriately deliver the SurfaceChanged
callback. We also need to not preserve geometry
in this case, as if we don't update the surface
and layout size together we could get scaling. This still has
some potential for holes, as transactions are not synced with
the parent renderer, but we have other methods to avoid
these in the case of resizing. This fixes the remaining
issues with content sizing and surface view "out of sync".

Bug: 27780983
Bug: 27687126
Bug: 27676101

Change-Id: Idd7864f00e5cf7a4eb32dd66c0b389292a788069
2016-03-29 13:42:06 -07:00
Deepanshu Gupta
920de84c10 Merge "Fix menu popup rendering" into nyc-dev
am: 83b9db0

* commit '83b9db029b6fe02761e1c8e50eb8dce6f4d37d0f':
  Fix menu popup rendering
2016-03-28 17:17:37 +00:00
Deepanshu Gupta
83b9db029b Merge "Fix menu popup rendering" into nyc-dev 2016-03-28 17:07:13 +00:00
Deepanshu Gupta
97c0679b1a Fix menu popup rendering
Change-Id: I3394866d72af7fd1762ac477529a4a1bc473b7dc
2016-03-28 09:57:24 -07:00
Deepanshu Gupta
fe66a19f4b Merge "LayoutLib intellij codestyle: line wrap" into nyc-dev
am: 3646f55

* commit '3646f5591f3742c6b5975c5e47937aa1e06a7ae2':
  LayoutLib intellij codestyle: line wrap
2016-03-25 20:58:24 +00:00
Deepanshu Gupta
2f1ac03751 Merge "Add tests for getResource*Name()" into nyc-dev
am: 3b7abd3

* commit '3b7abd33f9f86be653d06ced456d7fb67a0b8a81':
  Add tests for getResource*Name()
2016-03-25 20:58:22 +00:00
Deepanshu Gupta
3646f5591f Merge "LayoutLib intellij codestyle: line wrap" into nyc-dev 2016-03-25 20:53:15 +00:00
Deepanshu Gupta
3b7abd33f9 Merge "Add tests for getResource*Name()" into nyc-dev 2016-03-25 20:52:52 +00:00
Jungshik Shin
186b0e2cd4 Merge "Add Lang-to-Script entries for languages with new hyph patterns" into nyc-dev
am: fe952f3

* commit 'fe952f3a0b0ad5c481fa3e52385866f777a4d6e2':
  Add Lang-to-Script entries for languages with new hyph patterns
2016-03-25 00:35:08 +00:00
Jungshik Shin
fe952f3a0b Merge "Add Lang-to-Script entries for languages with new hyph patterns" into nyc-dev 2016-03-25 00:30:45 +00:00
Deepanshu Gupta
60dc3a9917 LayoutLib intellij codestyle: line wrap
Force line wrap (do not exceed right margin) and allow shorter lines to
merge.

Change-Id: I06f3689bff710c8dec023edb842595eacd745c17
2016-03-24 14:27:27 -07:00
Deepanshu Gupta
ceb1ab1d2a Add tests for getResource*Name()
Change-Id: I02170b2b68c76f817aa0771a5333abf2aee456c0
2016-03-24 14:27:21 -07:00
Deepanshu Gupta
3a0697fb8e Merge "Support getResource*Name() methods for Resources" into nyc-dev
am: 90b6454

* commit '90b6454cb319573ec79807c14ae9cc70f9ac4f80':
  Support getResource*Name() methods for Resources
2016-03-24 19:10:26 +00:00
Deepanshu Gupta
618ca261f3 Support getResource*Name() methods for Resources
The following methods are now supported:
getResourceEntryName
getResourcePackageName
getResourceTypeName
getResourceName

Bug: http://b.android.com/181872
Change-Id: If06b5e0687ab6f8cb20ab77f339870dd08a84ce1
2016-03-24 12:02:17 -07:00