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

resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

Browse Source 
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
This commit is contained in:
Deepanshu Gupta
2014-03-11 16:39:13 -07:00
parent a54f852d3d c76345a396
commit f978f16e50
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
View File

@@ -401,17 +401,17 @@ public final class Path_Delegate {
}
@LayoutlibDelegate
/*package*/ static void native_addPath(long nPath, int src, float dx, float dy) {
/*package*/ static void native_addPath(long nPath, long src, float dx, float dy) {
addPath(nPath, src, AffineTransform.getTranslateInstance(dx, dy));
}
@LayoutlibDelegate
/*package*/ static void native_addPath(long nPath, int src) {
/*package*/ static void native_addPath(long nPath, long src) {
addPath(nPath, src, null /*transform*/);
}
@LayoutlibDelegate
/*package*/ static void native_addPath(long nPath, int src, long matrix) {
/*package*/ static void native_addPath(long nPath, long src, long matrix) {
Matrix_Delegate matrixDelegate = Matrix_Delegate.getDelegate(matrix);
if (matrixDelegate == null) {
return;
@@ -474,7 +474,7 @@ public final class Path_Delegate {
}
@LayoutlibDelegate
/*package*/ static boolean native_op(long nPath1, long nPath2, int op, int result) {
/*package*/ static boolean native_op(long nPath1, long nPath2, int op, long result) {
Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Path.op() not supported", null);
return false;
}

16
tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
View File

@@ -136,6 +136,11 @@ public class ICU_Delegate {
return "";
}
@LayoutlibDelegate
/*package*/ static String getDisplayScriptNative(String variantCode, String locale) {
return "";
}
@LayoutlibDelegate
/*package*/ static String getISO3CountryNative(String locale) {
return "";
@@ -166,6 +171,17 @@ public class ICU_Delegate {
return Locale.getISOCountries();
}
@LayoutlibDelegate
/*package*/ static String localeForLanguageTag(String languageTag, boolean strict) {
return "";
}
@LayoutlibDelegate
/*package*/ static String languageTagForLocale(String locale) {
return "";
}
@LayoutlibDelegate
/*package*/ static boolean initLocaleDataNative(String locale, LocaleData result) {