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

Commit ab6f3b36 authored by Mario Tanev's avatar Mario Tanev
Browse files

Change DictionaryFacilitator.java to an interface, create its 

implementation DictionaryFacilitatorImpl.java and add a java-overridable
factory DictionaryFacilitatorProvider.java used to create a
DictionaryFacilitator.

Change-Id: Id4a58ae31feaa4d12a048a772c8d76ff82fdee45
parent d523bace

java-overridable/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

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

 */



package com.android.inputmethod.latin;



import android.content.Context;



/**

 * Factory for instantiating DictionaryFacilitator objects.

 */

public class DictionaryFacilitatorProvider {

    public static DictionaryFacilitator newDictionaryFacilitator() {

        return new DictionaryFacilitatorImpl();

    }



    public static DictionaryFacilitator newDictionaryFacilitator(final Context context) {

        return new DictionaryFacilitatorImpl(context);

    }

}

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

+54 −832

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+947 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class DictionaryFacilitatorLruCache { 
            if (dictionaryFacilitator != null) {

                return dictionaryFacilitator;

            }

            dictionaryFacilitator = new DictionaryFacilitator();

            dictionaryFacilitator = DictionaryFacilitatorProvider.newDictionaryFacilitator();

            resetDictionariesForLocaleLocked(dictionaryFacilitator, locale);

            waitForLoadingMainDictionary(dictionaryFacilitator);

            mLruCache.put(locale, dictionaryFacilitator);

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

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 


    final Settings mSettings;

  private final DictionaryFacilitator mDictionaryFacilitator =

            new DictionaryFacilitator(this /* context */);

      DictionaryFacilitatorProvider.newDictionaryFacilitator(this /* context */);

    // TODO: Move from LatinIME.

    private final PersonalizationDictionaryUpdater mPersonalizationDictionaryUpdater =

            new PersonalizationDictionaryUpdater(this /* context */, mDictionaryFacilitator);