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

Commit 8e005f29 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 1061bfdb: Break dependencies to allow offdevice tests to build 

* commit '1061bfdb':
  Break dependencies to allow offdevice tests to build
parents 6d90a10a 1061bfdb

java/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java

0 → 100644
+40 −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.dictionarypack;



/**

 * A class to group constants for dictionary pack usage.

 *

 * This class only defines constants. It should not make any references to outside code as far as

 * possible, as it's used to separate cleanly the keyboard code from the dictionary pack code; this

 * is needed in particular to cleanly compile regression tests.

 */

public class DictionaryPackConstants {

    /**

     * Authority for the ContentProvider protocol.

     */

    // TODO: find some way to factorize this string with the one in the resources

    public static final String AUTHORITY = "com.android.inputmethod.dictionarypack.aosp";



    /**

     * The action of the intent for publishing that new dictionary data is available.

     */

    // TODO: make this different across different packages. A suggested course of action is

    // to use the package name inside this string.

    public static final String NEW_DICTIONARY_INTENT_ACTION =

            "com.android.inputmethod.dictionarypack.newdict";

}

java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java

+10 −10
Original line number Diff line number Diff line
@@ -48,11 +48,8 @@ public final class DictionaryProvider extends ContentProvider { 
    private static final String TAG = DictionaryProvider.class.getSimpleName();

    public static final boolean DEBUG = false;



    // Authority and URI matching for the ContentProvider protocol.

    // TODO: find some way to factorize this string with the one in the resources

    public static final String AUTHORITY = "com.android.inputmethod.dictionarypack.aosp";

    public static final Uri CONTENT_URI =

            Uri.parse(ContentResolver.SCHEME_CONTENT + "://" + AUTHORITY);

            Uri.parse(ContentResolver.SCHEME_CONTENT + "://" + DictionaryPackConstants.AUTHORITY);

    private static final String QUERY_PARAMETER_MAY_PROMPT_USER = "mayPrompt";

    private static final String QUERY_PARAMETER_TRUE = "true";

    private static final String QUERY_PARAMETER_DELETE_RESULT = "result";
@@ -70,12 +67,15 @@ public final class DictionaryProvider extends ContentProvider { 
    private static final UriMatcher sUriMatcherV2 = new UriMatcher(NO_MATCH);

    static

    {

        sUriMatcherV1.addURI(AUTHORITY, "list", DICTIONARY_V1_WHOLE_LIST);

        sUriMatcherV1.addURI(AUTHORITY, "*", DICTIONARY_V1_DICT_INFO);

        sUriMatcherV2.addURI(AUTHORITY, "*/metadata", DICTIONARY_V2_METADATA);

        sUriMatcherV2.addURI(AUTHORITY, "*/list", DICTIONARY_V2_WHOLE_LIST);

        sUriMatcherV2.addURI(AUTHORITY, "*/dict/*", DICTIONARY_V2_DICT_INFO);

        sUriMatcherV2.addURI(AUTHORITY, "*/datafile/*", DICTIONARY_V2_DATAFILE);

        sUriMatcherV1.addURI(DictionaryPackConstants.AUTHORITY, "list", DICTIONARY_V1_WHOLE_LIST);

        sUriMatcherV1.addURI(DictionaryPackConstants.AUTHORITY, "*", DICTIONARY_V1_DICT_INFO);

        sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/metadata",

                DICTIONARY_V2_METADATA);

        sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/list", DICTIONARY_V2_WHOLE_LIST);

        sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/dict/*",

                DICTIONARY_V2_DICT_INFO);

        sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/datafile/*",

                DICTIONARY_V2_DATAFILE);

    }



    // MIME types for dictionary and dictionary list, as required by ContentProvider contract.

java/src/com/android/inputmethod/dictionarypack/DictionarySettingsFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ public final class DictionarySettingsFragment extends PreferenceFragment 
        UpdateHandler.unregisterUpdateEventListener(this);

        activity.unregisterReceiver(mConnectivityChangedReceiver);

        if (mChangedSettings) {

            final Intent newDictBroadcast = new Intent(UpdateHandler.NEW_DICTIONARY_INTENT_ACTION);

            final Intent newDictBroadcast =

                    new Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION);

            activity.sendBroadcast(newDictBroadcast);

            mChangedSettings = false;

        }

java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java

+2 −9
Original line number Diff line number Diff line
@@ -88,14 +88,6 @@ public final class UpdateHandler { 
    // Name of the category for the main dictionary

    public static final String MAIN_DICTIONARY_CATEGORY = "main";



    /**

     * The action of the intent for publishing that new dictionary data is available.

     */

    // TODO: make this different across different packages. A suggested course of action is

    // to use the package name inside this string.

    public static final String NEW_DICTIONARY_INTENT_ACTION =

            "com.android.inputmethod.dictionarypack.newdict";



    // The id for the "dictionary available" notification.

    static final int DICT_AVAILABLE_NOTIFICATION_ID = 1;
@@ -552,7 +544,8 @@ public final class UpdateHandler { 
     * Warn Android Keyboard that the state of dictionaries changed and it should refresh its data.

     */

    private static void signalNewDictionaryState(final Context context) {

        final Intent newDictBroadcast = new Intent(NEW_DICTIONARY_INTENT_ACTION);

        final Intent newDictBroadcast =

                new Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION);

        context.sendBroadcast(newDictBroadcast);

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.inputmethod.latin; 
import android.text.TextUtils;

import android.util.SparseArray;



import com.android.inputmethod.dictionarypack.DictionaryProvider;

import com.android.inputmethod.keyboard.ProximityInfo;

import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
@@ -32,7 +31,6 @@ import java.util.Locale; 
 */

public final class BinaryDictionary extends Dictionary {

    private static final String TAG = BinaryDictionary.class.getSimpleName();

    public static final String DICTIONARY_PACK_AUTHORITY = DictionaryProvider.AUTHORITY;



    // Must be equal to MAX_WORD_LENGTH in native/jni/src/defines.h

    private static final int MAX_WORD_LENGTH = Constants.Dictionary.MAX_WORD_LENGTH;