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

Commit 5abefbb8 authored by Jatin Matani's avatar Jatin Matani
Browse files

resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp 

Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423
parents 1791ce07 9cd60fe1

common/src/com/android/inputmethod/latin/common/FileUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import java.io.FilenameFilter; 
 * A simple class to help with removing directories recursively.

 */

public class FileUtils {

    private static final String TAG = "FileUtils";



    public static boolean deleteRecursively(final File path) {

        if (path.isDirectory()) {

            final File[] files = path.listFiles();

java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java

+2 −7
Original line number Diff line number Diff line
@@ -19,16 +19,11 @@ package com.android.inputmethod.dictionarypack; 
import android.content.Context;



/**

 * Helper to get the metadata URI from its base URI and the additional ID, if any.

 * Helper to get the metadata URI from its base URI.

 */

@SuppressWarnings("unused")

public class MetadataUriGetter {

    private MetadataUriGetter() {

        // This helper class is not instantiable.

    }



    public static String getUri(final Context context, final String baseUri,

            final String additionalId) {

    public static String getUri(final Context context, final String baseUri) {

        return baseUri;

    }

}

java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java

+6 −0
Original line number Diff line number Diff line
@@ -101,4 +101,10 @@ public final class StatsUtils { 


    public static void onSettingsActivity(final String entryPoint) {

    }



    public static void onInputConnectionLaggy(final int operation, final long duration) {

    }



    public static void onDecoderLaggy(final int operation, final long duration) {

    }

}

java/res/values-af/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
    <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Sleuteldruk se vibrasie-tydsduur"</string>

    <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Sleuteldruk se klankvolume"</string>

    <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Vertraging van sleutellangdruk"</string>

    <string name="prefs_enable_emoji_alt_physical_key" msgid="5963640002335470112">"Emosiekone vir fisieke sleutelbord"</string>

    <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="5259484820941627827">"Fisieke Alt-sleutel wys die emosiekoon-palet"</string>

    <string name="button_default" msgid="3988017840431881491">"Verstek"</string>

    <string name="setup_welcome_title" msgid="6112821709832031715">"Welkom by <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>

    <string name="setup_welcome_additional_description" msgid="8150252008545768953">"met Gebaar-tik"</string>

java/res/values-am/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
    <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"የቁልፍ ጭነት ንዝረት ርዝመት"</string>

    <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"የቁልፍ ጭነት ድምጽ መጠን"</string>

    <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"የሰሌዳ ቁልፍ ጠቅታ በመጫን መዘግየት"</string>

    <string name="prefs_enable_emoji_alt_physical_key" msgid="5963640002335470112">"ስሜት ገላጭ ምስሎች ለአካላዊ ቁልፍ ሰሌዳ"</string>

    <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="5259484820941627827">"አካላዊ Alt ቁልፍ የስሜት ገላጭ ቤተ-ስዕልን ያሳያል"</string>

    <string name="button_default" msgid="3988017840431881491">"ነባሪ"</string>

    <string name="setup_welcome_title" msgid="6112821709832031715">"እንኳን ወደ <xliff:g id="APPLICATION_NAME">%s</xliff:g> በደህና መጡ"</string>

    <string name="setup_welcome_additional_description" msgid="8150252008545768953">"በጣት ምልክት መተየብ"</string>