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

Commit 10155b5e authored by Dan Zivkovic's avatar Dan Zivkovic Committed by Android Git Automerger
Browse files

am 77e0fa1d: LatinIME portion of multi-lang option removal. 

* commit '77e0fa1d':
  LatinIME portion of multi-lang option removal.
parents 7eb388c7 77e0fa1d

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

+2 −11
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ public class NativeSuggestOptions { 


    private final int[] mOptions;



    public NativeSuggestOptions(final int additionalFeaturesSettingsSize) {

        mOptions = new int[OPTIONS_SIZE + additionalFeaturesSettingsSize];

    public NativeSuggestOptions() {

        mOptions = new int[OPTIONS_SIZE];

    }



    public void setIsGesture(final boolean value) {
@@ -53,15 +53,6 @@ public class NativeSuggestOptions { 
        setIntegerOption(WEIGHT_FOR_LOCALE_IN_THOUSANDS, (int) (value * 1000));

    }



    public void setAdditionalFeaturesOptions(final int[] additionalOptions) {

        if (additionalOptions == null) {

            return;

        }

        for (int i = 0; i < additionalOptions.length; i++) {

            setIntegerOption(OPTIONS_SIZE + i, additionalOptions[i]);

        }

    }



    public int[] getOptions() {

        return mOptions;

    }

java/res/xml/prefs.xml

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
        android:fragment="com.android.inputmethod.latin.settings.AppearanceSettingsFragment"

        android:title="@string/settings_screen_appearance"

        android:key="screen_appearance" />

    <PreferenceScreen

        android:fragment="com.android.inputmethod.latin.settings.MultiLingualSettingsFragment"

        android:title="@string/settings_screen_multilingual"

        android:key="screen_multilingual" />

    <PreferenceScreen

        android:fragment="com.android.inputmethod.latin.settings.GestureSettingsFragment"

        android:title="@string/settings_screen_gesture"

java/res/xml/prefs_screen_multilingual.xml

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

<!-- Copyright (C) 2014 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.

-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/settings_screen_multilingual"

    android:key="screen_multilingual">

    <CheckBoxPreference

        android:key="pref_show_language_switch_key"

        android:title="@string/show_language_switch_key"

        android:summary="@string/show_language_switch_key_summary"

        android:defaultValue="true"

        android:persistent="true" />

    <CheckBoxPreference

        android:key="pref_include_other_imes_in_language_switch_list"

        android:dependency="pref_show_language_switch_key"

        android:title="@string/include_other_imes_in_language_switch_list"

        android:summary="@string/include_other_imes_in_language_switch_list_summary"

        android:defaultValue="false"

        android:persistent="true" />

</PreferenceScreen>

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+0 −2
Original line number Diff line number Diff line
@@ -293,8 +293,6 @@ public final class BinaryDictionary extends Dictionary { 
                settingsValuesForSuggestion.mBlockPotentiallyOffensive);

        session.mNativeSuggestOptions.setSpaceAwareGestureEnabled(

                settingsValuesForSuggestion.mSpaceAwareGestureEnabled);

        session.mNativeSuggestOptions.setAdditionalFeaturesOptions(

                settingsValuesForSuggestion.mAdditionalFeaturesSettingValues);

        session.mNativeSuggestOptions.setWeightForLocale(weightForLocale);

        if (inOutWeightOfLangModelVsSpatialModel != null) {

            session.mInputOutputWeightOfLangModelVsSpatialModel[0] =

java/src/com/android/inputmethod/latin/DicTraverseSession.java

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.inputmethod.latin; 


import com.android.inputmethod.latin.common.Constants;

import com.android.inputmethod.latin.common.NativeSuggestOptions;

import com.android.inputmethod.latin.settings.AdditionalFeaturesSettingUtils;

import com.android.inputmethod.latin.utils.JniUtils;



import java.util.Locale;
@@ -44,8 +43,7 @@ public final class DicTraverseSession { 
    public final int[] mOutputAutoCommitFirstWordConfidence = new int[1];

    public final float[] mInputOutputWeightOfLangModelVsSpatialModel = new float[1];



    public final NativeSuggestOptions mNativeSuggestOptions = new NativeSuggestOptions(

            AdditionalFeaturesSettingUtils.ADDITIONAL_FEATURES_SETTINGS_SIZE);

    public final NativeSuggestOptions mNativeSuggestOptions = new NativeSuggestOptions();



    private static native long setDicTraverseSessionNative(String locale, long dictSize);

    private static native void initDicTraverseSessionNative(long nativeDicTraverseSession,