diff options
Diffstat (limited to 'java')
| -rwxr-xr-x | java/Android.mk | 2 | ||||
| -rwxr-xr-x | java/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboard.java | 17 |
3 files changed, 11 insertions, 12 deletions
diff --git a/java/Android.mk b/java/Android.mk index 9b2e47da4..a6dc49b2b 100755 --- a/java/Android.mk +++ b/java/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := LatinIme2Google -LOCAL_CERTIFICATE := shared +LOCAL_CERTIFICATE := vendor/google/certs/app LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2 diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index d1b56c26c..9a41667af 100755 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -1,7 +1,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.google.android.inputmethod.latin" - android:versionCode="9" - android:versionName="0.16"> + android:versionCode="10" + android:versionName="0.18"> <uses-sdk android:minSdkVersion="8"></uses-sdk> diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java index 1a9350a83..2dd03389c 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -292,9 +292,6 @@ public class LatinKeyboard extends Keyboard { if (mF1Key != null) { mF1Key.icon = mMicIcon; } - if (mSpaceKey != null) { - mSpaceKey.icon = mSpaceIcon; - } } else { mShiftLockIcon = mRes.getDrawable(R.drawable.sym_keyboard_shift_locked); mSpaceIcon = mRes.getDrawable(R.drawable.sym_keyboard_space); @@ -303,9 +300,10 @@ public class LatinKeyboard extends Keyboard { if (mF1Key != null) { mF1Key.icon = mMicIcon; } - if (mSpaceKey != null) { - mSpaceKey.icon = mSpaceIcon; - } + } + if (mSpaceKey != null) { + mSpaceKey.icon = mSpaceIcon; + updateSpaceBarForLocale(f); } } @@ -346,7 +344,7 @@ public class LatinKeyboard extends Keyboard { } } - private void updateSpaceBarForLocale() { + private void updateSpaceBarForLocale(boolean isBlack) { if (mLocale != null) { // Create the graphic for spacebar Bitmap buffer = Bitmap.createBitmap(mSpaceKey.width, mSpaceIcon.getIntrinsicHeight(), @@ -356,7 +354,8 @@ public class LatinKeyboard extends Keyboard { mSpaceKey.icon = new BitmapDrawable(mRes, buffer); mSpaceKey.repeatable = mLanguageSwitcher.getLocaleCount() < 2; } else { - mSpaceKey.icon = mRes.getDrawable(R.drawable.sym_keyboard_space); + mSpaceKey.icon = isBlack ? mRes.getDrawable(R.drawable.sym_bkeyboard_space) + : mRes.getDrawable(R.drawable.sym_keyboard_space); mSpaceKey.repeatable = true; } } @@ -461,7 +460,7 @@ public class LatinKeyboard extends Keyboard { } if (mLocale != null && mLocale.equals(locale)) return; mLocale = locale; - updateSpaceBarForLocale(); + updateSpaceBarForLocale(mIsBlackSym); } boolean isCurrentlyInSpace() { |