diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-03 16:19:19 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-03 16:19:31 -0700 |
| commit | 007ad7700a23ff7e618cfeee1eab97063c93b800 (patch) | |
| tree | 809162fdcb2b108689670bca4cb6c84a77410c81 /core/java/android/inputmethodservice | |
| parent | 2529d4eab80778aef9c7a9fe27712a41686d22c4 (diff) | |
| parent | 0c388fd29cf685a722ca862fe1af472b1c7e2a1f (diff) | |
| download | frameworks_base-007ad7700a23ff7e618cfeee1eab97063c93b800.zip frameworks_base-007ad7700a23ff7e618cfeee1eab97063c93b800.tar.gz frameworks_base-007ad7700a23ff7e618cfeee1eab97063c93b800.tar.bz2 | |
merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
Diffstat (limited to 'core/java/android/inputmethodservice')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 8c8d3e5..1a261d3 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1988,15 +1988,19 @@ public class InputMethodService extends AbstractInputMethodService { ei.inputType != InputType.TYPE_NULL); if (hasAction) { mExtractAccessories.setVisibility(View.VISIBLE); - if (ei.actionLabel != null) { - mExtractAction.setText(ei.actionLabel); - } else { - mExtractAction.setText(getTextForImeAction(ei.imeOptions)); + if (mExtractAction != null) { + if (ei.actionLabel != null) { + mExtractAction.setText(ei.actionLabel); + } else { + mExtractAction.setText(getTextForImeAction(ei.imeOptions)); + } + mExtractAction.setOnClickListener(mActionClickListener); } - mExtractAction.setOnClickListener(mActionClickListener); } else { mExtractAccessories.setVisibility(View.GONE); - mExtractAction.setOnClickListener(null); + if (mExtractAction != null) { + mExtractAction.setOnClickListener(null); + } } } |