am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

* commit '49d47a02e8c767d81815827a8170d015db6ea2d4': Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 01:54:44 +00:00
parent b90db3e6ab 49d47a02e8
commit 71acfa6c19
5 changed files with 155 additions and 14 deletions
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -1352,6 +1352,11 @@ public class Resources {

        private final AssetManager mAssets;
        private final int mTheme;
+
+        // Needed by layoutlib.
+        /*package*/ int getNativeTheme() {
+            return mTheme;
+        }
    }

    /**