diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-24 10:33:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-24 10:33:21 +0000 |
| commit | e2f83fac78257241be303747be806368264ecf49 (patch) | |
| tree | 39f058fd35d6f2f6a7d24c633d5b14f4254fee22 /tools | |
| parent | 9856739cb0f10dd6234359869991b4c57eab340f (diff) | |
| parent | 083f2714290563c924e6a731591ad924c15e5c85 (diff) | |
| download | frameworks_base-e2f83fac78257241be303747be806368264ecf49.zip frameworks_base-e2f83fac78257241be303747be806368264ecf49.tar.gz frameworks_base-e2f83fac78257241be303747be806368264ecf49.tar.bz2 | |
am 52abbced: Merge "Fix SurfaceView in LayoutLib." into lmp-preview-dev
* commit '52abbced58ace68f8a91c4d092061d115af3b268':
Fix SurfaceView in LayoutLib.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/view/SurfaceView.java | 4 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/SurfaceView.java b/tools/layoutlib/bridge/src/android/view/SurfaceView.java index 6aa4b3b..1e7dfbe 100644 --- a/tools/layoutlib/bridge/src/android/view/SurfaceView.java +++ b/tools/layoutlib/bridge/src/android/view/SurfaceView.java @@ -45,6 +45,10 @@ public class SurfaceView extends MockView { super(context, attrs, defStyle); } + public SurfaceView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + public SurfaceHolder getHolder() { return mSurfaceHolder; } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java index 3d50b2a..4a9f718 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java @@ -31,7 +31,11 @@ import android.widget.TextView; public class MockView extends TextView { public MockView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); + this(context, attrs, defStyle, 0); + } + + public MockView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); setText(this.getClass().getSimpleName()); setTextColor(0xFF000000); |