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

Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0

Browse Source 
am: 867c370465

* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This commit is contained in:
Deepanshu Gupta
2015-11-19 21:09:24 +00:00
committed by android-build-merger
parent 38a3b2154c 867c370465
commit 4d9df358ec
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/layoutlib/bridge/src/android/text/Hyphenator_Delegate.java
View File

@@ -20,10 +20,9 @@ import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import java.io.File;
import java.nio.ByteBuffer;
/**
* Delegate that overrides implementation for certain methods in {@link android.text.Hyphenator}
* Delegate that overrides implementation for certain methods in {@link android.text.StaticLayout}
* <p/>
* Through the layoutlib_create tool, selected methods of StaticLayout have been replaced
* by calls to methods of the same name in this delegate class.
@@ -39,7 +38,7 @@ public class Hyphenator_Delegate {
return null;
}
/*package*/ static long loadHyphenator(ByteBuffer buf, int offset) {
/*package*/ static long loadHyphenator(String patternData) {
return sDelegateManager.addNewDelegate(new Hyphenator_Delegate());
}
}

5
tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java
View File

@@ -13,7 +13,6 @@ import android.icu.util.ULocale;
import android.text.Primitive.PrimitiveType;
import android.text.StaticLayout.LineBreaks;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -53,8 +52,8 @@ public class StaticLayout_Delegate {
}
@LayoutlibDelegate
/*package*/ static long nLoadHyphenator(ByteBuffer buf, int offset) {
return Hyphenator_Delegate.loadHyphenator(buf, offset);
/*package*/ static long nLoadHyphenator(String patternData) {
return Hyphenator_Delegate.loadHyphenator(patternData);
}
@LayoutlibDelegate