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
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
Clara Bayarri
c84e36b7ec
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
...
am: 3e5bf78
* commit '3e5bf786b7ca36fa0cc150fcd8d0e7a69ecb9db0':
Keyboard Shortcuts: plumb deviceId through
2016-03-24 13:37:26 +00:00
Clara Bayarri
3e5bf786b7
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
2016-03-24 13:30:48 +00:00
Clara Bayarri
fcd7e80b21
Keyboard Shortcuts: plumb deviceId through
...
Bug: 27673736
Change-Id: Ie72807aa8c2bfd142b081a6a915e101c16d31473
2016-03-24 11:47:32 +00:00
Dan Willemsen
dc3b852125
resolve merge conflicts of 8416096 to nyc-dev-plus-aosp
...
Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498
2016-03-23 15:31:32 -07:00
Deepanshu Gupta
f42350287c
Merge "Exclude java namespace classes from layoutlib" into nyc-dev
...
am: 3e2b413
* commit '3e2b413dc72f267571421cfb0c8ced7a4778704a':
Exclude java namespace classes from layoutlib
2016-03-23 20:57:21 +00:00
Deepanshu Gupta
3e2b413dc7
Merge "Exclude java namespace classes from layoutlib" into nyc-dev
2016-03-23 20:48:15 +00:00
Dan Willemsen
98ff0b72f0
Remove custom copy rules, stop using ACP
...
Replace some custom rules with BUILD_PREBUILT.
Move tools from ALL_PREBUILTS to BUILD_PREBUILT. All of them are already
in PRODUCT_PACKAGES in build/target/product/base.mk.
Remove uses of ACP and replace with core build system macros or 'cp'
Change-Id: I529e7c6c50fc64ad36b75bb47142f6bde909d141
2016-03-23 13:42:52 -07:00
Deepanshu Gupta
fa5f55fe90
Exclude java namespace classes from layoutlib
...
Such classes can't be loaded anyway. No point including them
Change-Id: I26934014de96aa59f0d4aef59f61d1e4f71b86ea
2016-03-23 12:39:27 -07:00
Diego Perez
29fdb0f752
Merge "Add fill type support to vector drawable" into nyc-dev
...
am: f0fce3e
* commit 'f0fce3e9ceb6cd165488c28f390181c5b2877cee':
Add fill type support to vector drawable
2016-03-23 18:55:30 +00:00
Diego Perez
f0fce3e9ce
Merge "Add fill type support to vector drawable" into nyc-dev
2016-03-23 18:45:29 +00:00
Jungshik Shin
6c4f9e0d6f
Add Lang-to-Script entries for languages with new hyph patterns
...
Hyphenation patterns are being added for 22 languages and they need
entries in LANG_TO_SCRIPT
This CL is a prerequisite to the following CL to add hyphenation
patterns for more languages:
https://googleplex-android-review.googlesource.com/#/c/890133/
BUG: 26405413
Change-Id: Ibba8379cca29a5a7b6df35f10b66468b612601f8
2016-03-23 17:19:49 +00:00
Diego Perez
5ceb30f216
Add fill type support to vector drawable
...
The platform has added fill type to vector drawables. This CL implements
the native replacement.
Also remove a couple of delegates for classes that have been removed
from the platform.
Change-Id: Ie6ba344db9c9c2c45cd0ef4b99f11f9d8bcfd7de
2016-03-23 09:40:23 +00:00
Siyamed Sinir
970f4d4d2d
Merge "Temporarily disable emoji availability check" into nyc-dev
...
am: c7a9018
* commit 'c7a90184e1827a3cfa0a966126720b317563575c':
Temporarily disable emoji availability check
2016-03-23 01:07:49 +00:00
Siyamed Sinir
c56ad2badb
Temporarily disable emoji availability check
...
On builds where SMALLER_FONT_FOOTPRINT environment variable is set, some
of the fonts are not included in the build which causes emoji checks to
fail. This CL temporarily disables emoji checks.
Bug: 27785690
Change-Id: Ie32f0aa630c84347588fc87630467c14e985940a
2016-03-22 17:50:58 -07:00
Chong Zhang
e7e66d44a7
Merge "Don\'t change geometry in relayout if preserve geometry is requested" into nyc-dev
...
am: 3db51d1
* commit '3db51d19990485be0baa191e4c616ca2367dadf2':
Don't change geometry in relayout if preserve geometry is requested
2016-03-22 18:12:54 +00:00
Chong Zhang
3db51d1999
Merge "Don't change geometry in relayout if preserve geometry is requested" into nyc-dev
2016-03-22 18:05:33 +00:00
Diego Perez
03291ab04c
Merge "Remove BufferedImage allocation from PorterDuff filter" into mnc-ub-dev am: ebf3261
...
am: 21412f0
* commit '21412f09b92c8e118c535420a2c2912fa8c58722':
Remove BufferedImage allocation from PorterDuff filter
2016-03-22 17:42:56 +00:00
Diego Perez
21412f09b9
Merge "Remove BufferedImage allocation from PorterDuff filter" into mnc-ub-dev
...
am: ebf3261
* commit 'ebf3261aa6d80ad4ca1df0fd0509961ff7a1914e':
Remove BufferedImage allocation from PorterDuff filter
2016-03-22 17:40:20 +00:00
Diego Perez
ebf3261aa6
Merge "Remove BufferedImage allocation from PorterDuff filter" into mnc-ub-dev
2016-03-22 17:33:05 +00:00
Chong Zhang
6136273888
Don't change geometry in relayout if preserve geometry is requested
...
This causes scaling to be applied in the relayout window since the
requested size won't match the window size. Apply the requested size
in repositionChild instead.
bug: 27676101
Change-Id: I03beee2b9fe118a6be329b5fd1338d54e48d9a22
2016-03-22 10:28:27 -07:00
Deepanshu Gupta
24732d3cde
Merge "Add guard around getXmlFileParser() call" into nyc-dev
...
am: a96d258
* commit 'a96d258fdff19f5deb7bbebe98a9483987724be8':
Add guard around getXmlFileParser() call
2016-03-21 22:53:17 +00:00
Deepanshu Gupta
a96d258fdf
Merge "Add guard around getXmlFileParser() call" into nyc-dev
2016-03-21 22:45:14 +00:00
Deepanshu Gupta
cd6e47e445
Add guard around getXmlFileParser() call
...
Prevents the need to update the LayoutLib API level.
Bug: http://b.android.com/202942
Change-Id: I507239148ab8d6d45406624dba569c8b7197f979
2016-03-21 14:07:20 -07:00
Deepanshu Gupta
86621737fc
Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev
2016-03-21 18:53:57 +00:00
Matt Sarett
8b4aeb2f0c
Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev
...
am: d126b1e
* commit 'd126b1ed5d3a89deadaf7a9d1a9e64a48b53d2ce':
Work-around paletted image decoding bug in SDK_JELLYBEAN
2016-03-21 18:30:06 +00:00
Matt Sarett
d126b1ed5d
Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev
2016-03-21 18:26:19 +00:00
Deepanshu Gupta
13d2e2e10b
Add guard around getXmlFileParser() call
...
Prevents the need to update the LayoutLib API level.
Bug: http://b.android.com/202942
Change-Id: I507239148ab8d6d45406624dba569c8b7197f979
2016-03-21 08:53:13 -07:00
Diego Perez
1515fb7a10
Merge "Account for parent scroll position" into nyc-dev
...
am: 38735b0
* commit '38735b00267b55219a77317ec3ce5ca60c5edd06':
Account for parent scroll position
2016-03-21 11:26:07 +00:00
Diego Perez
38735b0026
Merge "Account for parent scroll position" into nyc-dev
2016-03-21 11:20:14 +00:00
Yohei Yukawa
5a0d9cf754
Merge "Tell IMS about missing InputConnection methods." into nyc-dev
...
am: 1064d35
* commit '1064d35307cff0601a22c8401cb72f628883489d':
Tell IMS about missing InputConnection methods.
2016-03-19 00:44:11 +00:00
Yohei Yukawa
1064d35307
Merge "Tell IMS about missing InputConnection methods." into nyc-dev
2016-03-19 00:36:22 +00:00
Tony Mantler
694834e782
Merge "Fix build" into nyc-dev
...
am: 4f29d45ad
* commit '4f29d45ad44cc2e754000848e07b950e519e0b89':
Fix build
2016-03-18 21:25:58 +00:00
Tony Mantler
4f29d45ad4
Merge "Fix build" into nyc-dev
2016-03-18 21:20:49 +00:00