OSDN Git Service

Merge e57aa434 from honeycomb-mr1. do not merge.
authorXavier Ducrohet <xav@android.com>
Fri, 20 May 2011 03:34:28 +0000 (20:34 -0700)
committerXavier Ducrohet <xav@android.com>
Fri, 20 May 2011 21:50:45 +0000 (14:50 -0700)
commit4c1e73b69a13a4f24a8fc123f599a9e9d8505525
tree8f4ce5d09c152fee925aec054df1411294f65558
parentf791863f0ac67ab6abd7410d5807d716cffc5b72
Merge e57aa434 from honeycomb-mr1. do not merge.

LayoutLib: Fix issue where <include> with no layout params wouldn't display.

The issue is that the layout params from the root element of the included
layout should be used but this failed because loading the layout params
from the <include> tag didn't throw a RuntimeException in our modified
code (BridgeTypedArray).

Because we don't want to throw exception in general we only throw it
when reading the layout params of an include node which is pretty crappy,
but works for now.

Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java