Merge "DO NOT MERGE: Merge Oreo MR1 into master"

main
Xin Li 2017-12-06 23:18:26 +00:00 committed by Gerrit Code Review
commit d8a341b914
12 changed files with 74 additions and 20 deletions

View File

@ -35,6 +35,23 @@
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
<!-- A signature-protected permission to ask AOSP Keyboard to close the software keyboard.
To use this, add the following line into calling application's AndroidManifest.xml
<pre>
{@code
<uses-permission android:name="com.android.inputmethod.latin.HIDE_SOFT_INPUT"/>
}
</pre>
then call {@link android.content.Context#sendBroadcast(Intent)} as follows:
<pre>
{@code
sendBroadcast(new Intent("com.android.inputmethod.latin.HIDE_SOFT_INPUT")
.setPackage("com.android.inputmethod.latin"));
}
</pre> -->
<permission android:name="com.android.inputmethod.latin.HIDE_SOFT_INPUT"
android:protectionLevel="signature" />
<application android:label="@string/english_ime_name"
android:icon="@drawable/ic_launcher_keyboard"
android:supportsRtl="true"

View File

@ -77,7 +77,7 @@
<string name="spoken_emoji_25FD" msgid="7673439755069217479">"মাঝারি আকারের ছোট সাদা চৌকো"</string>
<string name="spoken_emoji_25FE" msgid="6782214109919768923">"মাঝারি আকারের ছোট কালো চৌকো"</string>
<string name="spoken_emoji_2600" msgid="2272722634618990413">"রশ্মি সহ কালো সূর্য"</string>
<string name="spoken_emoji_2601" msgid="6205136889311537150">"মেঘ"</string>
<string name="spoken_emoji_2601" msgid="6205136889311537150">"ক্লাউড"</string>
<!-- no translation found for spoken_emoji_2602 (6293136501817877234) -->
<skip />
<!-- no translation found for spoken_emoji_2603 (7285313121103197207) -->

View File

@ -100,7 +100,7 @@
<string name="account_selected" msgid="2846876462199625974">"Trenutno koristite račun <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
<string name="account_select_ok" msgid="9141195141763227797">"Uredu"</string>
<string name="account_select_cancel" msgid="5181012062618504340">"Otkaži"</string>
<string name="account_select_sign_out" msgid="3299651159390187933">"Odjavi me"</string>
<string name="account_select_sign_out" msgid="3299651159390187933">"Odjava"</string>
<string name="account_select_title" msgid="6279711684772922649">"Odaberite račun koji ćete koristiti"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"engleski (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"engleski (SAD)"</string>
@ -140,7 +140,7 @@
<string name="prefs_enable_emoji_alt_physical_key" msgid="5963640002335470112">"Emoji za fizičku tastaturu"</string>
<string name="prefs_enable_emoji_alt_physical_key_summary" msgid="5259484820941627827">"Tipka Alt na fizičkoj tastaturi aktivira paletu za emoji"</string>
<string name="button_default" msgid="3988017840431881491">"Zadano"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Dobrodošli u aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Dobro došli u aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"s kucanjem pokretima"</string>
<string name="setup_start_action" msgid="8936036460897347708">"Započnite"</string>
<string name="setup_next_action" msgid="371821437915144603">"Sljedeći korak"</string>
@ -153,7 +153,7 @@
<string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim odaberite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" kao vaš aktivni način unosa teksta."</string>
<string name="setup_step2_action" msgid="1660330307159824337">"Zamijeni načine unosa"</string>
<string name="setup_step3_title" msgid="3154757183631490281">"Odlično, sve je spremno!"</string>
<string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete kucati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
<string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete upisivati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
<string name="setup_step3_action" msgid="600879797256942259">"Konfiguriraj dodatne jezike"</string>
<string name="setup_finish_action" msgid="276559243409465389">"Završeno"</string>
<string name="show_setup_wizard_icon" msgid="5008028590593710830">"Prikaži ikonu aplikacije"</string>

View File

@ -464,7 +464,7 @@
<string name="spoken_emoji_1F3B0" msgid="7440244806527891956">"Txanpon-makina"</string>
<string name="spoken_emoji_1F3B1" msgid="545544382391379234">"Billarra"</string>
<string name="spoken_emoji_1F3B2" msgid="8302262034774787493">"Dadoa"</string>
<string name="spoken_emoji_1F3B3" msgid="5180870610771027520">"Boloak"</string>
<string name="spoken_emoji_1F3B3" msgid="5180870610771027520">"Bola-jokoa"</string>
<string name="spoken_emoji_1F3B4" msgid="4723852033266071564">"Lore-joko japoniarren kartak"</string>
<string name="spoken_emoji_1F3B5" msgid="1998470239850548554">"Musika-nota"</string>
<string name="spoken_emoji_1F3B6" msgid="3827730457113941705">"Hainbat musika-nota"</string>

View File

@ -21,7 +21,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="5940510615957428904">"Android कीबोर्ड (AOSP)"</string>
<string name="spell_checker_service_name" msgid="1254221805440242662">"Android स्पेलिंग जाचने वाली सेवा (AOSP)"</string>
<string name="spell_checker_service_name" msgid="1254221805440242662">"Android स्पेलिंग जाचने वाली सेवा (AOSP)"</string>
<string name="english_ime_settings" msgid="5760361067176802794">"Android कीबोर्ड सेटिंग (AOSP)"</string>
<string name="android_spell_checker_settings" msgid="6123949487832861885">"Android स्पेलिंग जाचने वाली सेवा के लिए सेटिंग (AOSP)"</string>
<string name="android_spell_checker_settings" msgid="6123949487832861885">"Android स्पेलिंग जाचने वाली सेवा के लिए सेटिंग (AOSP)"</string>
</resources>

View File

@ -22,7 +22,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_input_options" msgid="3909945612939668554">"इनपुट विकल्‍प"</string>
<string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"संपर्कों को सर्च करें"</string>
<string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"स्पेलिंग जाचने वाली सेवा आपकी संपर्क सूची के संपर्कों इस्तेमाल करता है"</string>
<string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"स्पेलिंग जाचने वाली सेवा आपकी संपर्क सूची के संपर्कों इस्तेमाल करता है"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"बटन दबाने पर कंपन (वाइब्रेशन) करे"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"बटन दबाने पर आवाज़"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"कुंजी दबाने पर पॉपअप दिखाएं"</string>
@ -57,7 +57,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"सिस्टम डिफ़ॉल्ट"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"संपर्क नाम सुझाएं"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"सुझाव और सुधार के लिए संपर्क से नामों का उपयोग करें"</string>
<string name="use_personalized_dicts" msgid="5167396352105467626">"वैयक्तिकृत सुझाव"</string>
<string name="use_personalized_dicts" msgid="5167396352105467626">"मनमुताबिक सुझाव"</string>
<string name="enable_metrics_logging" msgid="5506372337118822837">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> को बेहतर बनाएं"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"दोहरे स्पेस वाला पीरियड"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"स्पेसबार पर डबल टैप करने से पीरियड शामिल हो जाता है जिसके बाद एक रिक्ति होती है"</string>
@ -86,7 +86,7 @@
<string name="gesture_space_aware" msgid="2078291600664682496">"वाक्यांश जेस्चर"</string>
<string name="gesture_space_aware_summary" msgid="4371385818348528538">"स्पेस कुंजी तक ग्लाइड करके जेस्चर के दौरान रिक्तियां इनपुट करें"</string>
<string name="voice_input" msgid="3583258583521397548">"ध्वनि संचालन बटन"</string>
<string name="voice_input_disabled_summary" msgid="6323489602945135165">"बोलकर फ़ोन को निर्देश देने का तरीका सक्षम नहीं है. भाषा और इनपुट सेटिंग जाचें."</string>
<string name="voice_input_disabled_summary" msgid="6323489602945135165">"बोलकर फ़ोन को निर्देश देने का तरीका सक्षम नहीं है. भाषा और इनपुट सेटिंग जाचें."</string>
<string name="configure_input_method" msgid="373356270290742459">"इनपुट का तरीका कॉन्‍फ़िगर करें"</string>
<string name="language_selection_title" msgid="3666971864764478269">"भाषाएं"</string>
<string name="help_and_feedback" msgid="5328219371839879161">"सहायता और फ़ीडबैक"</string>

View File

@ -856,7 +856,7 @@
<string name="spoken_emoji_1F514" msgid="7027268683047322521">"Bel"</string>
<string name="spoken_emoji_1F515" msgid="8903179856036069242">"Bel dengan tanda coret"</string>
<string name="spoken_emoji_1F516" msgid="108097933937925381">"Bookmark"</string>
<string name="spoken_emoji_1F517" msgid="2450846665734313397">"Simbol tautan"</string>
<string name="spoken_emoji_1F517" msgid="2450846665734313397">"Simbol link"</string>
<string name="spoken_emoji_1F518" msgid="7028220286841437832">"Tombol radio"</string>
<string name="spoken_emoji_1F519" msgid="8211189165075445687">"Tulisan BACK dengan panah ke kiri di atas"</string>
<string name="spoken_emoji_1F51A" msgid="823966751787338892">"Tulisan END dengan panah ke kiri di atas"</string>

View File

@ -50,7 +50,7 @@
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tombol beralih bahasa juga mencakup metode masukan lain"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tombol pengalih bahasa"</string>
<string name="show_language_switch_key_summary" msgid="7343403647474265713">"Tampilkan saat beberapa bahasa masukan diaktifkan"</string>
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tundaan singkir munculan kunci"</string>
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Jeda tutup pop-up utama"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Tanpa penundaan"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Default"</string>
<string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g> md"</string>

View File

@ -20,9 +20,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="spoken_use_headphones" msgid="4313642710742229868">"मोठ्याने बोललेल्या संकेतशब्द की ऐकण्यासाठी हेडसेट प्लग इन करा."</string>
<string name="spoken_use_headphones" msgid="4313642710742229868">"मोठ्याने बोललेल्या पासवर्ड की ऐकण्यासाठी हेडसेट प्लग इन करा."</string>
<string name="spoken_current_text_is" msgid="4240549866156675799">"वर्तमान मजकूर %s आहे"</string>
<string name="spoken_no_text_entered" msgid="1711276837961785646">"मजकूर प्रविष्ट केला नाही"</string>
<string name="spoken_no_text_entered" msgid="1711276837961785646">"मजकूर एंटर केला नाही"</string>
<string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ला <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> मध्ये सुधारणा करते"</string>
<string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> स्वयं-सुधारणा करते"</string>
<string name="spoken_empty_suggestion" msgid="4250215619373459752">"कोणतीही सूचना नाही"</string>
@ -55,7 +55,7 @@
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"फोन मोड"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"फोन चिन्हे मोड"</string>
<string name="announce_keyboard_hidden" msgid="2313574218950517779">"कीबोर्ड लपविलेला आहे"</string>
<string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> कीबोर्ड दर्शवित आहे"</string>
<string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> कीबोर्ड दाखवत आहे"</string>
<string name="keyboard_mode_date" msgid="6597407244976713364">"तारीख"</string>
<string name="keyboard_mode_date_time" msgid="3642804408726668808">"तारीख आणि वेळ"</string>
<string name="keyboard_mode_email" msgid="1239682082047693644">"ईमेल"</string>

View File

@ -97,7 +97,7 @@
<string name="keyboard_layout" msgid="8451164783510487501">"कीबोर्ड थीम"</string>
<string name="switch_accounts" msgid="3321216593719006162">"खाती स्विच करा"</string>
<string name="no_accounts_selected" msgid="2073821619103904330">"कोणतीही खाती निवडली नाहीत"</string>
<string name="account_selected" msgid="2846876462199625974">"सध्‍या <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> चा वापर करत आहे"</string>
<string name="account_selected" msgid="2846876462199625974">"सध्‍या <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> चा वापर करत आहे"</string>
<string name="account_select_ok" msgid="9141195141763227797">"ठीक आहे"</string>
<string name="account_select_cancel" msgid="5181012062618504340">"रद्द करा"</string>
<string name="account_select_sign_out" msgid="3299651159390187933">"साइन आउट करा"</string>
@ -176,7 +176,7 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"रीफ्रेश करा"</string>
<string name="last_update" msgid="730467549913588780">"अंतिम अपडेट"</string>
<string name="message_updating" msgid="4457761393932375219">"अद्यतनांसाठी तपासत आहे"</string>
<string name="message_loading" msgid="5638680861387748936">"लोड करत आहे..."</string>
<string name="message_loading" msgid="5638680861387748936">"लोड करत आहे..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"मु्ख्य शब्दकोश"</string>
<string name="cancel" msgid="6830980399865683324">"रद्द करा"</string>
<string name="go_to_settings" msgid="3876892339342569259">"सेटिंग्ज"</string>

View File

@ -91,8 +91,8 @@
<string name="language_selection_title" msgid="3666971864764478269">"Lugha"</string>
<string name="help_and_feedback" msgid="5328219371839879161">"Usaidizi na maoni"</string>
<string name="select_language" msgid="5709487854987078367">"Lugha"</string>
<string name="hint_add_to_dictionary" msgid="2645988432867033007">"Gonga tena ili uhifadhi"</string>
<string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"Gonga hapa ili uhifadhi"</string>
<string name="hint_add_to_dictionary" msgid="2645988432867033007">"Gusa tena ili uhifadhi"</string>
<string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"Gusa hapa ili uhifadhi"</string>
<string name="has_dictionary" msgid="6071847973466625007">"Kamusi inapatikana"</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Maandhari ya kibodi"</string>
<string name="switch_accounts" msgid="3321216593719006162">"Badili akaunti"</string>
@ -204,7 +204,7 @@
<string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"Badilisha neno"</string>
<string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"Hariri"</string>
<string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"Futa"</string>
<string name="user_dict_settings_empty_text" msgid="6889278304342592383">"Huna maneno yoyote katika kamusi ya mtumiaji. Gonga kitufe cha Ongeza (+) ili kuongeza neno."</string>
<string name="user_dict_settings_empty_text" msgid="6889278304342592383">"Huna maneno yoyote katika kamusi ya mtumiaji. Gusa kitufe cha Ongeza (+) ili kuongeza neno."</string>
<string name="user_dict_settings_all_languages" msgid="8276126583216298886">"Ya lugha zote"</string>
<string name="user_dict_settings_more_languages" msgid="7131268499685180461">"Lugha zingine..."</string>
<string name="user_dict_settings_delete" msgid="110413335187193859">"Futa"</string>

View File

@ -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);