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

Merge "Update layoutlib following Changes I2500bd4c and If456266f"

Browse Source
This commit is contained in:
Jerome Gaillard
2017-03-16 16:16:12 +00:00
committed by Android (Google) Code Review
parent 180f5e918c 95f36e23c3
commit e34edfc8e5
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
View File

@@ -16,7 +16,6 @@
package android.graphics;
import android.text.FontConfig;
import com.android.ide.common.rendering.api.AssetRepository;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.layoutlib.bridge.Bridge;
@@ -293,12 +292,16 @@ public class FontFamily_Delegate {
@LayoutlibDelegate
/*package*/ static boolean nAddFontWeightStyle(long builderPtr, ByteBuffer font,
int ttcIndex, List<FontConfig.Axis> listOfAxis,
int weight, boolean isItalic) {
int ttcIndex, int weight, boolean isItalic) {
assert false : "The only client of this method has been overriden.";
return false;
}
@LayoutlibDelegate
/*package*/ static void nAddAxisValue(long builderPtr, int tag, float value) {
assert false : "The only client of this method has been overriden.";
}
static boolean addFont(long builderPtr, final String path, final int weight,
final boolean isItalic) {
final FontFamily_Delegate delegate = getDelegate(builderPtr);

9
tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
View File

@@ -964,8 +964,9 @@ public class Paint_Delegate {
}
@LayoutlibDelegate
/*package*/ static int nGetTextRunCursor(Paint paint, long native_object, char[] text,
int contextStart, int contextLength, int flags, int offset, int cursorOpt) {
/*package*/ static int nGetTextRunCursor(Paint paint, long native_object, long typefacePtr,
char[] text, int contextStart, int contextLength, int flags, int offset,
int cursorOpt) {
// FIXME
Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,
"Paint.getTextRunCursor is not supported.", null, null /*data*/);
@@ -973,8 +974,8 @@ public class Paint_Delegate {
}
@LayoutlibDelegate
/*package*/ static int nGetTextRunCursor(Paint paint, long native_object, String text,
int contextStart, int contextEnd, int flags, int offset, int cursorOpt) {
/*package*/ static int nGetTextRunCursor(Paint paint, long native_object, long typefacePtr,
String text, int contextStart, int contextEnd, int flags, int offset, int cursorOpt) {
// FIXME
Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,
"Paint.getTextRunCursor is not supported.", null, null /*data*/);