2896 Commits

Author SHA1 Message Date
Deepanshu Gupta
9068539a48 Update nav bar icons. [DO NOT MERGE]
- 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
(cherry picked from commit 139d6ff12d395a888624113fdd2521861b47d761)
2015-08-25 12:06:53 -07:00
Deepanshu Gupta
e5afc3117b Move the layout code out of RenderSessionImpl. [DO NOT MERGE]
Also, switch to using a RelativeLayout from a LinearLayout. The change
will help in future when enabling transparent status and nav bar.

Change-Id: Ie4db5d28313f1c5ef775603788598a56409f92c7
(cherry picked from commit b1484862e2367d87d3ccbd0fd0a6d2598ed5918a)
2015-08-25 12:06:52 -07:00
Deepanshu Gupta
c989950dbf CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]
Not all attr are added to R.attr. This results in some attr not being
found and hence a broken rendering. Fix the issue by adding all attr
referenced in R.styleable to the map of attr before adding any remaining
values from R.attr.

Change-Id: I1ebf8a394b9e1edbf7490e011833d20a00d38317
(cherry picked from commit e8018480dbefc896bd26e5eedfdde802ce3731a7)
2015-08-25 12:06:52 -07:00
Deepanshu Gupta
b2fdaca959 Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Store a list of drawer layouts with tools:openDrawer encountered and
call openDrawer on them during the post-inflation processing.

Change-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5
(cherry picked from commit ccbc11770397888cf7780925bb4c7cf1d2f2f80e)
2015-08-25 12:06:51 -07:00
Deepanshu Gupta
a14ec6f450 Change tools:list_item to listitem. [DO NOT MERGE]
The listitem is already in use for ListView. Reuse the same attribute
for RecyclerView rather than creating a new one.

Change-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5
(cherry picked from commit 111dc04a28f0181bf429e5ded9024d3fdff7be50)
2015-08-25 12:06:51 -07:00
Deepanshu Gupta
b1e21330f8 Implement tools:list_item for RecyclerView. [DO NOT MERGE]
It's now possible to use tools:list_item attribute for RecyclerView to
point to a default layout, rather than always using a TextView.

Change-Id: I5d522b2f0ca38b420fddfcb0f73a26d95707da79
(cherry picked from commit 61f23e9bf7d784e7a52168196758c4f6c6853e77)
2015-08-25 12:06:50 -07:00
Jens Ole Lauridsen
cd4d5b3f38 Support AppBar from Material Design. [DO NOT MERGE]
This CL is a start for making the design able to render the AppBar.
We are still missing support for: system menu and the app icon.

Change-Id: I19600f8ee1e7e6492186a0b7ae7fb38c82e15c02
(cherry picked from commit 4dfe4d43ce5634f059a3ba669e3cac4551c3a3ee)
2015-08-25 12:06:50 -07:00
Deepanshu Gupta
de13095d5d Update tests per new layoutlib_api [DO NOT MERGE]
Change-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210
(cherry picked from commit d7b846c1814de34f2cea8507907f70618ec7cae0)
2015-08-25 12:06:50 -07:00
Deepanshu Gupta
db67caa60c Add missing resolveResValue call. [DO NOT MERGE]
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
(cherry picked from commit 5d1eaf4a197130f561b16c4ed083cf016b20ab92)
2015-08-25 12:06:49 -07:00
Deepanshu Gupta
6eef124657 LayoutLib: Skip classes from java package. [DO NOT MERGE]
Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.

Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
(cherry picked from commit 86caef1892e1ce063e0e880396c8deaa3a6a171d)
2015-08-25 12:06:49 -07:00
Deepanshu Gupta
4f5e6c6315 Skip warnings for some unresolved references. [DO NOT MERGE]
Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.

Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.

Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
(cherry picked from commit b3e872be9e634c8d1f34d07778ea753880bbf2d9)
2015-08-25 12:06:48 -07:00
Deepanshu Gupta
3e875dbb38 Fix import order. [DO NOT MERGE]
Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
(cherry picked from commit b9b8aef94e5bad8f5f03f686a2d3d8a09c045a7b)
2015-08-25 12:06:48 -07:00
Deepanshu Gupta
e5fa12ad78 Fix ParserFactory not initialized error. [DO NOT MERGE]
Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
(cherry picked from commit 996458b76c944f78eee26d7bd8cb4d39303b9119)
2015-08-25 12:06:47 -07:00
Deepanshu Gupta
a287b8428a Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
(cherry picked from commit d758e042ce08c46712db3db2d63fc84795028dfe)
2015-08-25 12:06:47 -07:00
Deepanshu Gupta
e698bb27f3 Fix BridgeTypedArray.getType() [DO NOT MERGE]
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
(cherry picked from commit 5779ad71eabed3aabaefef1e4749693f8320816e)
2015-08-25 12:06:46 -07:00
Deepanshu Gupta
e481e713f2 Include Shapes in LayoutLib. [DO NOT MERGE]
Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit 59164ec0551aa49f497acca81222f304cf4f344b)
2015-08-25 12:06:46 -07:00
Deepanshu Gupta
ba5a02c5aa LayoutLib: Support getting resource arrays. [DO NOT MERGE]
- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
  custom theme attributes. The AppTheme now inherits from
  Material.Light.DarkActionBar, so other tests should be unaffected.

Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.

Bug: 12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit 642cff50f8f7a67eed09eac1e56d7133b26a192c)
2015-08-25 12:06:45 -07:00
Deepanshu Gupta
a5ffed0b69 LayoutLib: Change nullity annotations. [DO NOT MERGE]
Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit 476e582d2ffdf25102d4c55f8c242baa3d21d37f)
2015-08-25 12:06:45 -07:00
Deepanshu Gupta
c96ef95285 Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit 6330971ed293a2777bbdab09288f90ea4b2d0255)
2015-08-25 12:06:44 -07:00
Deepanshu Gupta
b318ff54fc Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Only cherry picked for the style not found fix.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit d5b82845450beac2d3c7db9cd80e9fc34d43a297)
2015-08-25 12:06:44 -07:00
Deepanshu Gupta
cc5e69e4fe Inject anonymous inner classes of injected classes [DO NOT MERGE]
When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit bfc9c3bcbe3b7056d3330f754811c1506f181b88)
2015-08-25 12:06:44 -07:00
Deepanshu Gupta
d7e89906a4 Update platformDir search in tests. [DO NOT MERGE]
When trying to find the SDK Platform Dir for LayoutLib tests, also
test if the dir from which the tests are run is module dir.

Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
(cherry picked from commit 612a05e7e15184b21437731b9aa5db2d1d4fc54c)
2015-08-25 12:06:43 -07:00
Deepanshu Gupta
afedbc47b3 Make Context.getClassLoader() work. [DO NOT MERGE]
Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.

To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().

Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.

Also, update the list of packages to search for Framework views.

Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
(cherry picked from commit f8ea750455eec81e4e6d877b3e18e29a86d4ec95)
2015-08-25 12:06:43 -07:00
Deepanshu Gupta
92480a9ad8 Fix include tag rendering. [DO NOT MERGE]
A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.

Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit 21b564573327b1ed2f7e06146b8a01c47ede3089)
2015-08-25 12:06:42 -07:00
Deepanshu Gupta
f6b0854745 Show better error message for color attr not found. [DO NOT MERGE]
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit 5f1bf496948fb6383ae17e5467a26a00489d7564)
2015-08-25 12:06:42 -07:00
Deepanshu Gupta
b1370c2687 Fix build: udpate parser factory method [DO NOT MERGE]
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit 3dc19883c571a829c36aa603c04a55c91b00dd57)
2015-08-25 12:06:41 -07:00
Deepanshu Gupta
aa72988955 Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51debadca830eefbf8131185ac55ce699)
2015-08-25 12:06:41 -07:00
Deepanshu Gupta
5c90c4f459 Remove kxml dependency [DO NOT MERGE]
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af25584633462e4ab8cf9bafe10f43e7cb2d83)
2015-08-25 12:06:30 -07:00
Diego Perez
7720eb18c1 Merge "Render to measured size when using expand mode" into lmp-mr1-dev 2015-07-21 12:56:56 +00:00
Diego Perez
5e50e00c66 Merge "Fix for shadows on theme editor" into lmp-mr1-dev 2015-06-15 08:35:00 +00:00
Diego Perez
ead59b0d47 Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 2015-06-15 08:34:04 +00:00
Diego Perez
ce4a9d9110 Merge "New custom widgets library" into lmp-mr1-dev 2015-06-12 14:34:50 +00:00
Diego Perez
4362443cd9 Render to measured size when using expand mode
When using RenderingMode.V_SCROLL or RenderingMode.H_SCROLL, if the
screen size is smaller than the measured size but as large as the
desired size, the layout will render incorrectly and won't expand.
This changes that to expand to at least the size of the screen.

Added tests for the V_SCROLL and H_SCROLL modes.

Bug: http://b.android.com/174928
Change-Id: I22686903560775e2e4f362af1d7b50c9b985467d
2015-06-02 17:09:45 +01:00
Diego Perez
e5be1d7a39 Fix for shadows on theme editor
If the preferred ColorModel doesn't support alpha, the shadows are
incorrectly rendered. In the theme editor on Linux, the graphics device
object doesn't support alpha so we need to use a different color model.
We default to ARGB which works fine.

Change-Id: I3e71e3d086fa4975a9149d36792e574813f37dfd
2015-06-02 11:14:53 +01:00
Diego Perez
aa3b2043f0 New custom widgets library
Adds the widgets needed by the theme editor as a jar file that will be
linked from AS. The controls currently are:
- ThemePreviewLayout: A custom layout that allows to dynamically reflow
  cards that display the theme preview.
- PressedButton: Custom button to display in a pressed state (currently
  we can only do it programatically).
- ErrorCatcher: View that can wrap other view and stops a view throwing
  exceptions that will break the theme editor rendering. This is
  currently used to wrap the custom controls loaded from the source
  code.

The new library currently depends on bridge to be able to use the logger
for the ErrorCatcher view. The ErrorCatcher view is a temporary solution
that will be replaced in a future CL and the dependency will be removed.

Change-Id: I832c447e22e1381abff74c46c4282921b3f6fa23
2015-05-14 23:01:09 +01:00
Diego Perez
635d8f4fe7 Fix crash when shadowSize is 0
Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
(cherry picked from commit e81096458f689ab3c0c4dbab2452722c3e3623c4)
2015-05-08 02:01:53 +01: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
8ab069f3ae Fix GcSnapshot drawInLayer when clipping is used.
GcSnapshot only allocates an image for tinting that is the size of the
current clipping area.  When drawing to that image, the wrong
coordinate system was used since now we are dealing with only the
clipping rect we need to translate -clipX, -clipY the drawing so it's
painted at 0,0 of the new BufferedImage.

Change-Id: Id8639d5ea9bef36ac07743df332161d6eadc6a81
2015-05-07 00:39:39 +00:00
Diego Perez
0e20bd8e50 Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* changes:
  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:14:26 +00:00
Diego Perez
263e6dfa6a Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 2015-05-06 23:52:06 +00:00
Diego Perez
19dbe50bb5 Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 2015-05-06 23:45:41 +00:00
Diego Perez
bc47abe4b4 Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 2015-05-06 23:43:50 +00:00
Deepanshu Gupta
1f8e3de40c Merge "More layoutlib tests." into lmp-mr1-dev 2015-05-06 23:43:15 +00:00
Deepanshu Gupta
b4ca896f05 Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 2015-05-06 23:42:56 +00:00
Diego Perez
1bc7fb2dcc Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 2015-05-06 23:42:35 +00:00
Deepanshu Gupta
4f8a999682 Merge "Nullity annotations to some tests." into lmp-mr1-dev 2015-05-06 23:42:20 +00:00
Deepanshu Gupta
92e798682b Merge "Fix title bar showing when not required." into lmp-mr1-dev 2015-05-06 23:42:01 +00:00
Deepanshu Gupta
0aa004c3cf LayoutLib: fix crash when shadow size <=0.
Drawing empty rects results in IllegalArgumentException on Mac JRE 1.6.
Prevent that by checking the bounds before attempting to draw the rect.

Bug: 20687353
Change-Id: I45f48ee125196480bb6510cc49b24d2122bc3e48
2015-05-01 21:38:02 +00:00
Diego Perez
d0546353a8 Move StatusBar to use statusBarColor theme attribute
Change-Id: Ic0d8f4520a6dcb7225a2947cc56dc06a7340d3ba
2015-04-30 16:28:06 +00:00