diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2016-02-23 04:31:44 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2016-02-23 04:31:44 +0000 |
| commit | ac1aaa43cca539fff10568c4a75641b30c335493 (patch) | |
| tree | be291a6c743294f977a3944f589c322c4e39a216 /java/src | |
| parent | 05b10b33f21ef5f4055afc4725cd3f9e3e87dab9 (diff) | |
| parent | 9f1498ca138c69cefb241fe41510452924173b32 (diff) | |
| download | latinime-ac1aaa43cca539fff10568c4a75641b30c335493.tar.gz latinime-ac1aaa43cca539fff10568c4a75641b30c335493.tar.xz latinime-ac1aaa43cca539fff10568c4a75641b30c335493.zip | |
Fix runtime crash on KitKat and prior. am: 60b59042d1
am: 9f1498ca13
* commit '9f1498ca138c69cefb241fe41510452924173b32':
Fix runtime crash on KitKat and prior.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index c2d9f965f..f938b6078 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -33,6 +33,7 @@ import android.content.res.Resources; import android.graphics.Color; import android.inputmethodservice.InputMethodService; import android.media.AudioManager; +import android.os.Build; import android.os.Debug; import android.os.IBinder; import android.os.Message; @@ -54,6 +55,7 @@ import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.accessibility.AccessibilityUtils; import com.android.inputmethod.annotations.UsedForTesting; +import com.android.inputmethod.compat.BuildCompatUtils; import com.android.inputmethod.compat.EditorInfoCompatUtils; import com.android.inputmethod.compat.InputMethodServiceCompatUtils; import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils; @@ -1908,7 +1910,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } private void setNavigationBarVisibility(final boolean visible) { - // Color.BLACK is ignored and default IME navigation bar color is used. - getWindow().getWindow().setNavigationBarColor(visible ? Color.BLACK : Color.TRANSPARENT); + if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.M) { + // For N and later, IMEs can specify Color.TRANSPARENT to make the navigation bar + // transparent. For other colors the system uses the default color. + getWindow().getWindow().setNavigationBarColor( + visible ? Color.BLACK : Color.TRANSPARENT); + } } } |