OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1b87390) | patch
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 12 Mar 2014 01:02:44 +0000 (18:02 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 03:03:19 +0000 (20:03 -0700)
commitf1e7187645f0b0388f7b97d742395efd228b347a
tree1745ee38a0db1dad4b2f4d45378c56c8a13de779tree | snapshot
parent1b87390c9426c4bc9119829e9375d712dfde11c3commit | diff
Fix theme/style resolution in Layoutlib [DO NOT MERGE]

Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)

Conflicts:
core/java/android/content/res/Resources.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
core/java/android/content/res/Resources.java diff | blob | history
tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java [new file with mode: 0644] blob
tools/layoutlib/bridge/src/android/content/res/Resources_Theme_Delegate.java diff | blob | history
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java diff | blob | history
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help