nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0c268b08: Merge "Refactor KeyboardTextsSet class" 

* commit '0c268b08b69e9f4f730dc145bb86522ca2964a52':
  Refactor KeyboardTextsSet class
main
Tadashi G. Takaoka 2014-03-20 02:56:05 -07:00 committed by Android Git Automerger
parent 0d00e56b54 0c268b08b6
commit 600a730004
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

@ -43,18 +43,19 @@ public final class KeyboardTextsSet {
mTextsTable = KeyboardTextsTable.getTextsTable(language);
}
// TODO: Consolidate this method with {@link #setLocale(Locale)}.
public void loadStringResources(final Context context) {
final Resources res = context.getResources();
final int referenceId = context.getApplicationInfo().labelRes;
loadStringResourcesInternal(context, RESOURCE_NAMES, referenceId);
final String resourcePackageName = res.getResourcePackageName(referenceId);
loadStringResourcesInternal(res, RESOURCE_NAMES, resourcePackageName);
}
@UsedForTesting
void loadStringResourcesInternal(final Context context, final String[] resourceNames,
final int referenceId) {
final Resources res = context.getResources();
final String packageName = res.getResourcePackageName(referenceId);
void loadStringResourcesInternal(final Resources res, final String[] resourceNames,
final String resourcePackageName) {
for (final String resName : resourceNames) {
final int resId = res.getIdentifier(resName, "string", packageName);
final int resId = res.getIdentifier(resName, "string", resourcePackageName);
mResourceNameToTextsMap.put(resName, res.getString(resId));
}
}
@ -77,6 +78,7 @@ public final class KeyboardTextsSet {
return size;
}
// TODO: Resolve text reference when creating {@link KeyboardTextsTable} class.
public String resolveTextReference(final String rawText) {
if (TextUtils.isEmpty(rawText)) {
return null;

5
tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
View File

@ -51,10 +51,13 @@ public class MoreKeySpecSplitTests extends InstrumentationTestCase {
}.runInLocale(targetContext.getResources(), TEST_LOCALE);
final String[] testResourceNames = getAllResourceIdNames(
com.android.inputmethod.latin.tests.R.string.class);
mTextsSet.loadStringResourcesInternal(instrumentation.getContext(), testResourceNames,
final Context testContext = instrumentation.getContext();
final Resources testRes = testContext.getResources();
final String testResPackageName = testRes.getResourcePackageName(
// This dummy raw resource is needed to be able to load string resources from a test
// APK successfully.
com.android.inputmethod.latin.tests.R.raw.dummy_resource_for_testing);
mTextsSet.loadStringResourcesInternal(testRes, testResourceNames, testResPackageName);
}
private static String[] getAllResourceIdNames(final Class<?> resourceIdClass) {