3524 Commits

Author SHA1 Message Date
Adam Lesinski
3dd41596b1 Merge "AAPT2: Fix layout versioning" into mnc-dev 2015-05-16 01:47:08 +00:00
Adam Lesinski
39c353a6ca AAPT2: Fix layout versioning
Change-Id: I37190cf8a1f0a81c068aeb2b5326b3b3080f75a5
2015-05-14 20:56:10 -07:00
Deepanshu Gupta
3dc19883c5 Fix build: udpate parser factory method
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
2015-05-14 17:00:50 -07:00
Deepanshu Gupta
f2d408b51d Don't keep LayoutlibCallback reference.
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
2015-05-14 15:37:29 -07:00
Deepanshu Gupta
fc41c2c02e Move couple of intellij libraries to project level.
Move framework and layoutlib api libraries back to being project
libraries so that other modules can depend on it. This enables custom
widget libraries project to merge through cleanly.

Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f
2015-05-14 15:12:57 -07:00
Deepanshu Gupta
4ebbfd7787 Fix build.
When doing the full build, javalib.jar wasn't created. However, mm had
created the javalib.jar. Fix the build by not depending on javalib.jar,
but on classes.jar

Change-Id: I643676b1d73cbfce42946a065a2ada6c50cc959a
2015-05-13 22:18:37 -07:00
Deepanshu Gupta
1ae505060e Update rendering fidelity tag to use constant.
Change-Id: If6c1076aa1e070c6bda7be16516fe0e18a95fe2d
2015-05-13 21:47:10 -07:00
Deepanshu Gupta
88b92541be Use Balanced line breaker instead of HighQuality.
Fallback to the Balanced line breaker till the time HighQuality one is
implemented.

Change-Id: I51e9882c5c733e5409f932ef740684829340ced9
2015-05-13 20:53:14 -07:00
Deepanshu Gupta
139d6ff12d Update nav bar icons.
- Add a script to copy the icons from the original source.
- Update layout used for the navigation bar to be closer to the original
  layout.
- Update test image with the latest rendering.
- Add a nexus 5 landscape device config to help with testing.

Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
2015-05-13 20:48:58 -07:00
Deepanshu Gupta
eca056926a Load ICU data in LayoutLib
Also return the correct version numbers for ICU data.

Change-Id: I7de973b5553c73948870b97bdc12a880bb2fdd85
2015-05-13 18:15:32 -07:00
Deepanshu Gupta
d77b9ed7dc Add missing delegates for M preview.
- Remove ICU dependency (use the version bundled with platform).
- Restructure intelliJ project to move dependencies to module.
- Minor fixes to layoutlib tests.

TODO:
- Load ICU data.
- Hyphenator doesn't work.
- High quality line breaker not present.

Change-Id: I965e096e17bfc97ee995a649c3f4f6f64bb4f70d
2015-05-13 18:15:20 -07:00
Deepanshu Gupta
a12ec8f1e2 Run setup for full tests only once.
Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
2015-05-13 18:10:53 -07:00
Deepanshu Gupta
78af255846 Remove kxml dependency.
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
2015-05-13 18:10:46 -07:00
Jorim Jaggi
11274bb3e4 Merge "Fix build" into mnc-dev 2015-05-13 22:36:01 +00:00
Jorim Jaggi
2bf49b1a9f Fix build
Change-Id: Ia9277c6c983758d301c89312e39b59a2db0b29c4
2015-05-13 15:34:50 -07:00
Jorim Jaggi
645edef483 Merge "Make sure the app can draw a frame before unlocking" into mnc-dev 2015-05-13 22:13:27 +00:00
Adam Lesinski
4ee67bc7a7 Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev 2015-05-13 21:43:00 +00:00
Adam Lesinski
45fefaef00 Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev 2015-05-13 21:41:47 +00:00
Adam Lesinski
68727a0b20 Merge "AAPT2: inferred style parent processing" into mnc-dev 2015-05-13 21:40:24 +00:00
Adam Lesinski
79e04686f6 Merge "AAPT2: Support static lib referencing static lib" into mnc-dev 2015-05-13 21:38:02 +00:00
Jorim Jaggi
827e0facfe Make sure the app can draw a frame before unlocking
- The mechanism to stop windows drawing while window animator was
animating was somehow flaky. It relied on the fact that the client
would call relayout() whenever the animating state changed. This is
mostly the case, but not for lockscreen animations. Instead, we now
use a push model, where window manager tells the app that the state
has changed.
- In addition, it only stopped drawing if that window was animating,
but then only resumed drawing after all windows have finished
animating. Now, we do this per window, so we only stop drawing for
windows that are currently animating.
- We resume the top activity now at the very beginning of the
unlocking sequence. This gives the app a chance to draw a frame
before the user sees anything. If it's to slow, then we just use the
outdated framebuffer.

Bug: 19964562
Change-Id: Ifef8abd189a3146d854b81b9b948861e4d38c155
2015-05-13 14:23:05 -07:00
Chris Craik
caa6226b17 Revert "Anti-alias by default"
bug:20948129

Keep HIDDEN_DEFAULT_PAINT_FLAGS name.

This reverts commit 1b60cc0529161b5eca6407b551d67d355994c567.

Change-Id: I97cd9c556375c74c52b006bda4fc7b3a2cfa89e1
2015-05-13 13:44:30 -07:00
Adam Lesinski
dfa5e0705f AAPT2: Fix issue where @null was wrongly encoded
@null must be encoded as TYPE_REFERENCE with a value of
0. TYPE_NULL is used by the runtime as a placeholder when resolving
style attributes. If we set a style attribute to TYPE_NULL,
the runtime will throw. The runtime will convert a TYPE_REFERENCE
with value 0 to a proper null value.

Change-Id: Id983ca7e1fbee3124dddafe32f1b5741b824225b
2015-05-12 21:56:43 -07:00
Adam Lesinski
d13fb24986 AAPT2: Debug: Dump only targetted style
Change-Id: Id7c5a4b5d0880520e1fea05e5a31d398946c5f05
2015-05-12 20:45:20 -07:00
Adam Lesinski
bdaa092a19 AAPT2: inferred style parent processing
Change-Id: I8fbc4feef16b6039cf4c526fcfb767dc75a9c131
2015-05-12 20:41:31 -07:00
Adam Lesinski
330edcdf13 AAPT2: Support static lib referencing static lib
When a static library A references static library B,
and app C references both A and B, we get the following symbol merging,
symbols from library B get imported twice.

We must only check that symbol references to library B are valid
when building library A. We should only merge all the symbols
when building final app C.

Change-Id: I23cba33b0901dcbb5328d9c9dfaa6a979c073c36
2015-05-12 20:41:31 -07:00
Alan Viverette
78f12e43f0 Update LayoutLib for theme key changes to fix build
Change-Id: I47b400b320f16688cd32c1d8955a660637d93f4d
2015-05-07 16:24:10 -07:00
Seigo Nonaka
14e139179b Retry "Always show auxiliary subtypes from NavBar keyboard icon."
This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was
reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build
breakage in 'layoutlib' target, with a proper fix.

Hereafter the original CL description is repeated.

The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994
Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
2015-05-06 21:34:07 -07:00
Diego Perez
70280a20f3 am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '0fe14486211e3ade7f29ea76e16211853fe9cd7a':
  Added function to render a drawable in all available states
2015-05-07 03:14:30 +00:00
Diego Perez
0fe1448621 am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '2021c8773150dd47d8781375af94143cb22afd9d':
  Added function to render a drawable in all available states
2015-05-07 03:02:34 +00:00
Diego Perez
2021c87731 am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '33e54563daa0db610f9dc8b9d4fca8f826ffec73':
  Added function to render a drawable in all available states
2015-05-07 02:49:50 +00:00
Diego Perez
4b12583653 Merge "Added function to render a drawable in all available states" into lmp-mr1-dev 2015-05-07 02:28:51 +00:00
Andrew Shulaev
681c7d142a Added function to render a drawable in all available states
This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730.

Change-Id: I596855047d78c3c718744ad61432fc45e1239634
(cherry picked from commit 1f158819bc7cf58f97e47fabfaf23b2fb838f2eb)
2015-05-07 02:05:48 +01:00
Diego Perez
c000db78d7 am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '9af506fb5b5f1c7f36fb439c2b120ad2b0cda602':
  Make status and navigation bars widgets and usable from layouts
2015-05-07 00:49:57 +00:00
Diego Perez
9207b8567a am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit 'ae4619dd7f3d48cae2e9b83681849a77a8201142':
  Move StatusBar to use statusBarColor theme attribute
2015-05-07 00:49:51 +00:00
Deepanshu Gupta
790f6925a7 am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit 'a131bfe094c007721d006fc9ca21cfa74f41dfef':
  More layoutlib tests.
2015-05-07 00:49:40 +00:00
Diego Perez
c2ba739170 am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '613aef87cf6a5958ff2fd255348f92f8d3de152e':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
2015-05-07 00:47:08 +00:00
Deepanshu Gupta
2ab7b46056 resolved conflicts for merge of a663e012 to mnc-dev
Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
2015-05-06 17:45:29 -07:00
Diego Perez
d7a53dab44 am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '9efcb308615c0adaf418d430adabea3d271bcbb4':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-07 00:34:32 +00:00
Deepanshu Gupta
15432daa6e am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '9c9bcd3486d9f7557329dea90b3c5fa1bdace91c':
  Nullity annotations to some tests.
2015-05-07 00:34:26 +00:00
Deepanshu Gupta
dbcedeea20 am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit 'b2951490eabf71e14c8fc5d50397adf869a2a291':
  Fix title bar showing when not required.
2015-05-07 00:34:21 +00:00
Deepanshu Gupta
c49b8f9d1b am 88b193d7: am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '88b193d717bb73cbe555e4e621f7b6efdf49cdaa':
  LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:34:14 +00:00
Diego Perez
613aef87cf am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '86bff0bb63f3667f0b450420514c931b1f4d25d2':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
2015-05-07 00:33:51 +00:00
Diego Perez
9af506fb5b am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '143eaa81934e47c8acb8338d1a2383eb79b690ef':
  Make status and navigation bars widgets and usable from layouts
2015-05-07 00:21:35 +00:00
Diego Perez
ae4619dd7f am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit 'df4c977d760ccfcf929c77b100faa5f8f38df158':
  Move StatusBar to use statusBarColor theme attribute
2015-05-07 00:21:29 +00:00
Diego Perez
52ef7fce16 am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit 'ffeb8117b139f61dd7c92bda6a7d47b83871cb66':
  Make sure shaders use a color model compatible with the destination.
2015-05-07 00:21:24 +00:00
Deepanshu Gupta
a131bfe094 am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '3dbd18cdfe6af1a9c36261551ef98d39e849d389':
  More layoutlib tests.
2015-05-07 00:21:19 +00:00
Deepanshu Gupta
a663e01204 am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '9abe42324f2252460b003e6fcdb097910e16178a':
  RecyclerView in LayoutLib: better XML attrs.
2015-05-07 00:21:14 +00:00
Diego Perez
9efcb30861 am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-07 00:21:09 +00:00
Deepanshu Gupta
9c9bcd3486 am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit 'cae76a70bfca9f37a10f34582cddbe0792625f26':
  Nullity annotations to some tests.
2015-05-07 00:21:03 +00:00