diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 9bb16c7ff..dedece55c 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -35,6 +35,23 @@ + + + "Trenutno koristite račun %1$s" "Uredu" "Otkaži" - "Odjavi me" + "Odjava" "Odaberite račun koji ćete koristiti" "engleski (UK)" "engleski (SAD)" @@ -140,7 +140,7 @@ "Emoji za fizičku tastaturu" "Tipka Alt na fizičkoj tastaturi aktivira paletu za emoji" "Zadano" - "Dobrodošli u aplikaciju %s" + "Dobro došli u aplikaciju %s" "s kucanjem pokretima" "Započnite" "Sljedeći korak" @@ -153,7 +153,7 @@ "Zatim odaberite aplikaciju \"%s\" kao vaš aktivni način unosa teksta." "Zamijeni načine unosa" "Odlično, sve je spremno!" - "Sada možete kucati u svim omiljenim aplikacijama pomoću aplikacije %s." + "Sada možete upisivati u svim omiljenim aplikacijama pomoću aplikacije %s." "Konfiguriraj dodatne jezike" "Završeno" "Prikaži ikonu aplikacije" diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 1764ded8c..00ed52cad 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -123,6 +123,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen static final long DELAY_WAIT_FOR_DICTIONARY_LOAD_MILLIS = TimeUnit.SECONDS.toMillis(2); static final long DELAY_DEALLOCATE_MEMORY_MILLIS = TimeUnit.SECONDS.toMillis(10); + /** + * A broadcast intent action to hide the software keyboard. + */ + static final String ACTION_HIDE_SOFT_INPUT = + "com.android.inputmethod.latin.HIDE_SOFT_INPUT"; + + /** + * A custom permission for external apps to send {@link #ACTION_HIDE_SOFT_INPUT}. + */ + static final String PERMISSION_HIDE_SOFT_INPUT = + "com.android.inputmethod.latin.HIDE_SOFT_INPUT"; + /** * The name of the scheme used by the Package Manager to warn of a new package installation, * replacement or removal. @@ -160,6 +172,25 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen private final BroadcastReceiver mDictionaryDumpBroadcastReceiver = new DictionaryDumpBroadcastReceiver(this); + final static class HideSoftInputReceiver extends BroadcastReceiver { + private final InputMethodService mIms; + + public HideSoftInputReceiver(InputMethodService ims) { + mIms = ims; + } + + @Override + public void onReceive(Context context, Intent intent) { + final String action = intent.getAction(); + if (ACTION_HIDE_SOFT_INPUT.equals(action)) { + mIms.requestHideSelf(0 /* flags */); + } else { + Log.e(TAG, "Unexpected intent " + intent); + } + } + } + final HideSoftInputReceiver mHideSoftInputReceiver = new HideSoftInputReceiver(this); + private AlertDialog mOptionsDialog; private final boolean mIsHardwareAcceleratedDrawingEnabled; @@ -595,6 +626,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen dictDumpFilter.addAction(DictionaryDumpBroadcastReceiver.DICTIONARY_DUMP_INTENT_ACTION); registerReceiver(mDictionaryDumpBroadcastReceiver, dictDumpFilter); + final IntentFilter hideSoftInputFilter = new IntentFilter(); + hideSoftInputFilter.addAction(ACTION_HIDE_SOFT_INPUT); + registerReceiver(mHideSoftInputReceiver, hideSoftInputFilter, PERMISSION_HIDE_SOFT_INPUT, + null /* scheduler */); + StatsUtils.onCreate(mSettings.getCurrent(), mRichImm); } @@ -699,6 +735,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen public void onDestroy() { mDictionaryFacilitator.closeDictionaries(); mSettings.onDestroy(); + unregisterReceiver(mHideSoftInputReceiver); unregisterReceiver(mRingerModeChangeReceiver); unregisterReceiver(mDictionaryPackInstallReceiver); unregisterReceiver(mDictionaryDumpBroadcastReceiver);