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

resolved conflicts for merge of 7545accf to master

Browse Source 
Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb
This commit is contained in:
Elliott Hughes
2015-03-10 10:14:42 -07:00
parent 2fb1d06600 7545accf1f
commit c0b8f647ca
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.mk
View File

@@ -18,6 +18,8 @@ endif
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_CFLAGS += -DU_USING_ICU_NAMESPACE=0
LOCAL_SRC_FILES:= \
AndroidRuntime.cpp \
com_android_internal_content_NativeLibraryHelper.cpp \

12
core/jni/android_text_StaticLayout.cpp
View File

@@ -48,10 +48,10 @@ class Builder {
delete mBreakIterator;
}
void setLocale(const Locale& locale) {
void setLocale(const icu::Locale& locale) {
delete mBreakIterator;
UErrorCode status = U_ZERO_ERROR;
mBreakIterator = BreakIterator::createLineInstance(locale, status);
mBreakIterator = icu::BreakIterator::createLineInstance(locale, status);
// TODO: check status
}
@@ -77,13 +77,13 @@ class Builder {
}
}
BreakIterator* breakIterator() const {
icu::BreakIterator* breakIterator() const {
return mBreakIterator;
}
private:
const size_t MAX_TEXT_BUF_RETAIN = 32678;
BreakIterator* mBreakIterator = nullptr;
icu::BreakIterator* mBreakIterator = nullptr;
UText mUText = UTEXT_INITIALIZER;
std::vector<uint16_t>mTextBuf;
};
@@ -560,9 +560,9 @@ static jint nComputeLineBreaks(JNIEnv* env, jclass, jlong nativePtr,
// TODO: this array access is pretty inefficient, but we'll replace it anyway
ScopedFloatArrayRO widthsScopedArr(env, widths);
BreakIterator* breakIterator = b->breakIterator();
icu::BreakIterator* breakIterator = b->breakIterator();
int loc = breakIterator->first();
while ((loc = breakIterator->next()) != BreakIterator::DONE) {
while ((loc = breakIterator->next()) != icu::BreakIterator::DONE) {
breaks.push_back(loc);
}