drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Iae493184 into eclair

Browse Source 
* changes:
  Minor fix for the parent style computation in the layoutlib.
This commit is contained in:
Android (Google) Code Review
2009-11-16 11:21:34 -08:00
parent fa82d97dc6 0da2676ea8
commit 19e420c52d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
View File

@ -675,9 +675,12 @@ public final class Bridge implements ILayoutBridge {
name = name.substring(BridgeConstants.PREFIX_ANDROID.length()); name = name.substring(BridgeConstants.PREFIX_ANDROID.length());
} }
// at this point we could have the format style/<name>. we want only the name // at this point we could have the format <type>/<name>. we want only the name as long as
// the type is style.
if (name.startsWith(BridgeConstants.REFERENCE_STYLE)) { if (name.startsWith(BridgeConstants.REFERENCE_STYLE)) {
name = name.substring(BridgeConstants.REFERENCE_STYLE.length()); name = name.substring(BridgeConstants.REFERENCE_STYLE.length());
} else if (name.indexOf('/') != -1) {
return null;
} }
IResourceValue parent = null; IResourceValue parent = null;
@ -697,7 +700,7 @@ public final class Bridge implements ILayoutBridge {
return (IStyleResourceValue)parent; return (IStyleResourceValue)parent;
} }
sLogger.error(String.format("Unable to resolve parent style name: ", parentName)); sLogger.error(String.format("Unable to resolve parent style name: %s", parentName));
return null; return null;
} }
@ -1069,24 +1072,24 @@ public final class Bridge implements ILayoutBridge {
public void wallpaperOffsetsComplete(IBinder window) { public void wallpaperOffsetsComplete(IBinder window) {
// pass for now. // pass for now.
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
public Bundle sendWallpaperCommand(IBinder window, String action, int x, int y, public Bundle sendWallpaperCommand(IBinder window, String action, int x, int y,
int z, Bundle extras, boolean sync) { int z, Bundle extras, boolean sync) {
// pass for now. // pass for now.
return null; return null;
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void wallpaperCommandComplete(IBinder window, Bundle result) { public void wallpaperCommandComplete(IBinder window, Bundle result) {
// pass for now. // pass for now.
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void closeSystemDialogs(String reason) { public void closeSystemDialogs(String reason) {
// pass for now. // pass for now.
} }
public IBinder asBinder() { public IBinder asBinder() {
// pass for now. // pass for now.
return null; return null;
@ -1151,12 +1154,12 @@ public final class Bridge implements ILayoutBridge {
int z, Bundle extras, boolean sync) { int z, Bundle extras, boolean sync) {
// pass for now. // pass for now.
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void closeSystemDialogs(String reason) { public void closeSystemDialogs(String reason) {
// pass for now. // pass for now.
} }
public IBinder asBinder() { public IBinder asBinder() {
// pass for now. // pass for now.
return null; return null;