Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LayoutLib: Fix some rendering issues

Browse Source 
Change-Id: I662a39a783de5bc7f3063f46cedaab11c7e6496e
This commit is contained in:
Xavier Ducrohet
2011-02-02 18:37:59 -08:00
parent a4747d536e
commit 33758ef8c9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -413,6 +413,9 @@ public final class BridgeContext extends Activity {
ResourceValue item = mRenderResources.findResValue(customStyle,
false /*forceFrameworkOnly*/);
// resolve it in case it links to something else
item = mRenderResources.resolveResValue(item);
if (item instanceof StyleResourceValue) {
defStyleValues = (StyleResourceValue)item;
}

11
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@@ -361,9 +361,6 @@ public class RenderSessionImpl extends FrameworkResourceIdProvider {
View view = mInflater.inflate(mBlockParser, mViewRoot);
// post-inflate process. For now this supports TabHost/TabWidget
postInflateProcess(view, mParams.getProjectCallback());
Fragment_Delegate.setProjectCallback(null);
// set the AttachInfo on the root view.
@@ -375,6 +372,9 @@ public class RenderSessionImpl extends FrameworkResourceIdProvider {
info.mHardwareAccelerated = false;
mViewRoot.dispatchAttachedToWindow(info, 0);
// post-inflate process. For now this supports TabHost/TabWidget
postInflateProcess(view, mParams.getProjectCallback());
// get the background drawable
if (mWindowBackground != null) {
Drawable d = ResourceHelper.getDrawable(mWindowBackground,
@@ -461,13 +461,14 @@ public class RenderSessionImpl extends FrameworkResourceIdProvider {
// remeasure with the size we need
// This must always be done before the call to layout
w_spec = MeasureSpec.makeMeasureSpec(mMeasuredScreenWidth, MeasureSpec.EXACTLY);
h_spec = MeasureSpec.makeMeasureSpec(mMeasuredScreenHeight,
MeasureSpec.EXACTLY);
h_spec = MeasureSpec.makeMeasureSpec(mMeasuredScreenHeight, MeasureSpec.EXACTLY);
mViewRoot.measure(w_spec, h_spec);
// now do the layout.
mViewRoot.layout(0, 0, mMeasuredScreenWidth, mMeasuredScreenHeight);
mViewRoot.mAttachInfo.mTreeObserver.dispatchOnPreDraw();
// draw the views
// create the BufferedImage into which the layout will be rendered.
boolean newImage = false;