diff options
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/Android.mk | 8 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/Paint.java | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 6d606a9077c5..135a6335946d 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -52,13 +52,15 @@ include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(built_framework_dep) \ $(built_layoutlib_create_jar) - @echo "host layoutlib_create: $@" - @mkdir -p $(dir $@) - @rm -f $@ + $(hide) echo "host layoutlib_create: $@" + $(hide) mkdir -p $(dir $@) + $(hide) rm -f $@ + $(hide) ls -l $(built_framework_classes) $(hide) java -jar $(built_layoutlib_create_jar) \ $@ \ $(built_core_classes) \ $(built_framework_classes) + $(hide) ls -l $(built_framework_classes) # diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint.java b/tools/layoutlib/bridge/src/android/graphics/Paint.java index 619ab308f57a..d13b5fea3358 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Paint.java +++ b/tools/layoutlib/bridge/src/android/graphics/Paint.java @@ -283,6 +283,8 @@ public class Paint extends _Original_Paint { mStyle = src.mStyle; mFlags = src.mFlags; + updateFontObject(); + super.set(src); } } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java index 4201e80aae4c..f91f601c83f6 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java @@ -46,6 +46,7 @@ import android.os.RemoteException; import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.BridgeInflater; +import android.view.InputChannel; import android.view.IWindow; import android.view.IWindowSession; import android.view.KeyEvent; @@ -990,13 +991,21 @@ public final class Bridge implements ILayoutBridge { private static final class WindowSession implements IWindowSession { @SuppressWarnings("unused") - public int add(IWindow arg0, LayoutParams arg1, int arg2, Rect arg3) + public int add(IWindow arg0, LayoutParams arg1, int arg2, Rect arg3, + InputChannel outInputchannel) throws RemoteException { // pass for now. return 0; } @SuppressWarnings("unused") + public int addWithoutInputChannel(IWindow arg0, LayoutParams arg1, int arg2, Rect arg3) + throws RemoteException { + // pass for now. + return 0; + } + + @SuppressWarnings("unused") public void finishDrawing(IWindow arg0) throws RemoteException { // pass for now. } |