Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e681b528 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project" 

* commit '7a2fbbb3':
  Add strings-appname.xml to AOSP Android Keyboard project
parents 33eaf073 7a2fbbb3

java/AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />



    <application android:label="@string/aosp_android_keyboard_ime_name"

    <application android:label="@string/english_ime_name"

            android:icon="@mipmap/ic_ime_settings"

            android:killAfterRestore="false"

            android:supportsRtl="true">



        <service android:name="LatinIME"

                android:label="@string/aosp_android_keyboard_ime_name"

                android:label="@string/english_ime_name"

                android:permission="android.permission.BIND_INPUT_METHOD">

            <intent-filter>

                <action android:name="android.view.InputMethod" />
@@ -44,7 +44,7 @@ 
        </service>



        <service android:name=".spellcheck.AndroidSpellCheckerService"

                 android:label="@string/aosp_spell_checker_service_name"

                 android:label="@string/spell_checker_service_name"

                 android:permission="android.permission.BIND_TEXT_SERVICE">

            <intent-filter>

                <action android:name="android.service.textservice.SpellCheckerService" />
@@ -53,7 +53,7 @@ 
        </service>



        <activity android:name=".setup.SetupActivity"

                android:label="@string/aosp_android_keyboard_ime_name"

                android:label="@string/english_ime_name"

                android:icon="@drawable/ic_setup_wizard">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -69,7 +69,7 @@ 
            </intent-filter>

        </receiver>



        <activity android:name="SettingsActivity" android:label="@string/aosp_android_keyboard_ime_settings"

        <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"

                  android:uiOptions="splitActionBarWhenNarrow">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -77,7 +77,7 @@ 
        </activity>



        <activity android:name="com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity"

                  android:label="@string/aosp_android_spell_checker_service_settings">

                  android:label="@string/android_spell_checker_settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

java/res/values/strings-appname.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources>

    <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated.

         This resource should be copied from msgid="8250992613616792321" -->

    <string name="english_ime_name">Android Keyboard (AOSP)</string>



    <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated.

         This resource should be copied from msgid="511950477199948048" -->

    <string name="spell_checker_service_name">Android Spell Checker (AOSP)</string>



    <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated.

         This resource should be copied from msgid="423615877174850267" -->

    <string name="english_ime_settings">Android Keyboard Settings (AOSP)</string>



    <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated.

         This resource should be copied from msgid="2970535894327288421" -->

    <string name="android_spell_checker_settings">Android Spell Checker Settings (AOSP)</string>

</resources>

java/res/values/strings.xml

+0 −12
Original line number Diff line number Diff line
@@ -18,18 +18,6 @@ 
*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. -->

    <string name="aosp_android_keyboard_ime_name">Android Keyboard (AOSP)</string>



    <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated. -->

    <string name="aosp_android_keyboard_ime_settings">Android Keyboard Settings (AOSP)</string>



    <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated. -->

    <string name="aosp_spell_checker_service_name">Android Spell Checker (AOSP)</string>



    <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated. -->

    <string name="aosp_android_spell_checker_service_settings">Android Spell Checker Settings (AOSP)</string>



    <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] -->

    <string name="english_ime_input_options">Input options</string>