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

Commit 6d90a10a authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 0cc0544a: Merge the dictionary pack in Latin IME.

* commit '0cc0544a':
  Merge the dictionary pack in Latin IME.
parents 841c295f 0cc0544a
Loading
Loading
Loading
Loading
+42 −0
Original line number Diff line number Diff line
@@ -23,8 +23,11 @@
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <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"
            android:icon="@mipmap/ic_ime_settings"
@@ -91,5 +94,44 @@
                <action android:name="android.text.style.SUGGESTION_PICKED" />
            </intent-filter>
        </receiver>

        <provider android:name="com.android.inputmethod.dictionarypack.DictionaryProvider"
                  android:grantUriPermissions="true"
                  android:exported="false"
                  android:authorities="@string/authority"
                  android:multiprocess="false"
                  android:label="@string/dictionary_provider_name">
        </provider>

        <service android:name="com.android.inputmethod.dictionarypack.DictionaryService"
                 android:label="@string/dictionary_service_name">
        </service>

        <receiver android:name="com.android.inputmethod.dictionarypack.EventHandler">
            <intent-filter>
                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
                <action android:name="android.intent.action.DATE_CHANGED" />
                <action android:name="com.android.inputmethod.latin.dictionarypack.UPDATE_NOW" />
            </intent-filter>
        </receiver>

        <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
                  android:label="@string/dictionary_settings_title"
                  android:icon="@mipmap/ic_ime_settings"
                  android:theme="@android:style/Theme.Holo"
                  android:uiOptions="splitActionBarWhenNarrow">
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
            </intent-filter>
        </activity>

        <activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog"
                  android:label="@string/dictionary_install_over_metered_network_prompt"
                  android:icon="@mipmap/ic_ime_settings"
                  android:theme="@android:style/Theme.Holo">
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
            </intent-filter>
        </activity>
    </application>
</manifest>
+856 B
Loading image diff...
+678 B
Loading image diff...
+1 KiB
Loading image diff...
+84 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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.
*/
-->
<!-- TODO: Remove paddingRight, layout_marginLeft, layout_marginRight for API version 17+ -->
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:gravity="center_vertical"
    android:paddingRight="?android:attr/scrollbarSize"
    android:paddingEnd="?android:attr/scrollbarSize"
    android:background="?android:attr/selectableItemBackground"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginLeft="15dip"
    android:layout_marginStart="15dip"
    android:layout_marginRight="6dip"
    android:layout_marginEnd="6dip"
    android:layout_marginTop="6dip"
    android:layout_marginBottom="6dip"
    android:layout_weight="1">

  <LinearLayout
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_weight="1"
      android:orientation="vertical">

    <TextView
        android:id="@+android:id/title"
        android:layout_marginLeft="5dip"
        android:layout_marginStart="5dip"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:ellipsize="marquee"
        android:fadingEdge="horizontal" />

    <TextView
        android:id="@+android:id/summary"
        android:layout_marginLeft="5dip"
        android:layout_marginStart="5dip"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="?android:attr/textColorSecondary"
        android:maxLines="1" />

    <!-- <ProgressBar -->
    <!--     android:id="@+id/dictionary_line_progress_bar" -->
    <!--     style="@android:style/Widget.Holo.ProgressBar.Horizontal" -->
    <!--     android:layout_width="match_parent" -->
    <!--     android:layout_height="match_parent" -->
    <!--     android:gravity="center" /> -->

  </LinearLayout>

  <Button
      android:id="@+android:id/wordlist_button"
      android:layout_weight="0"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_gravity="right|center_vertical"
      android:singleLine="true"
      android:textAppearance="?android:attr/textAppearanceMedium"
      android:text="@string/install_dict" />

</LinearLayout>
Loading