OSDN Git Service

LayoutLib: Use special view cookie for include-merge case.
authorXavier Ducrohet <xav@android.com>
Mon, 24 Jan 2011 22:03:21 +0000 (14:03 -0800)
committerXavier Ducrohet <xav@android.com>
Mon, 24 Jan 2011 22:14:53 +0000 (14:14 -0800)
commit82b9232565bfececdb643a94cecdd1bd1cb5c643
tree966746b27fd9d02ec000db9fc7be2c75628224be
parent67005b05cc76a38a5b3bf6e83957dd03619e9126
LayoutLib: Use special view cookie for include-merge case.

All items directly under the <merge> tag now return the view cookie
of the referencing <include> tag using a special class for
easy differentiation in the calling client.

Change-Id: I7a2a4e642be9564f47e256fd1586012497d34792
tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java [new file with mode: 0644]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeInflater.java
tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/TestDelegates.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java