Remove shortcut support from LatinIME.

Note this change does not affect the native decoder interface.

Change-Id: I73b7dc008a5acaf75a31a36a2d332b5afabd82d0

2 files changed, 0 insertions, 111 deletions

diff --git a/java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java b/java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java
index 476c13406..5c0c4328f 100644
--- a/java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java
@@ -19,7 +19,6 @@ package com.android.inputmethod.latin.utils;
 import com.android.inputmethod.latin.makedict.DictionaryHeader;
 import com.android.inputmethod.latin.makedict.NgramProperty;
 import com.android.inputmethod.latin.makedict.ProbabilityInfo;
-import com.android.inputmethod.latin.makedict.WeightedString;
 import com.android.inputmethod.latin.makedict.WordProperty;
 
 import java.util.HashMap;
@@ -29,7 +28,6 @@ public class CombinedFormatUtils {
     public static final String BIGRAM_TAG = "bigram";
     public static final String NGRAM_TAG = "ngram";
     public static final String NGRAM_PREV_WORD_TAG = "prev_word";
-    public static final String SHORTCUT_TAG = "shortcut";
     public static final String PROBABILITY_TAG = "f";
     public static final String HISTORICAL_INFO_TAG = "historicalInfo";
     public static final String HISTORICAL_INFO_SEPARATOR = ":";
@@ -71,14 +69,6 @@ public class CombinedFormatUtils {
             builder.append("," + POSSIBLY_OFFENSIVE_TAG + "=" + TRUE_VALUE);
         }
         builder.append("\n");
-        if (wordProperty.mHasShortcuts) {
-            for (final WeightedString shortcutTarget : wordProperty.mShortcutTargets) {
-                builder.append("  " + SHORTCUT_TAG + "=" + shortcutTarget.mWord);
-                builder.append(",");
-                builder.append(formatProbabilityInfo(shortcutTarget.mProbabilityInfo));
-                builder.append("\n");
-            }
-        }
         if (wordProperty.mHasNgrams) {
             for (final NgramProperty ngramProperty : wordProperty.mNgrams) {
                 builder.append(" " + NGRAM_TAG + "=" + ngramProperty.mTargetWord.mWord);
diff --git a/java/src/com/android/inputmethod/latin/utils/NetworkConnectivityUtils.java b/java/src/com/android/inputmethod/latin/utils/NetworkConnectivityUtils.java
deleted file mode 100644
index 101c55067..000000000
--- a/java/src/com/android/inputmethod/latin/utils/NetworkConnectivityUtils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.inputmethod.latin.utils;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-import javax.annotation.Nonnull;
-
-/**
- * This class keeps track of the network connectivity state by receiving the system intent
- * {@link ConnectivityManager#CONNECTIVITY_ACTION}, and invokes an registered call back to notify
- * changes of the network connectivity state.
- */
-public final class NetworkConnectivityUtils {
-    private static NetworkConnectivityReceiver sNetworkConnectivityReceiver;
-
-    public interface NetworkStateChangeListener {
-        /**
-         * Called when the network connectivity state has changed.
-         */
-        public void onNetworkStateChanged();
-    }
-
-    private static class NetworkConnectivityReceiver extends BroadcastReceiver {
-        @Nonnull
-        private final NetworkStateChangeListener mListener;
-        private boolean mIsNetworkConnected;
-
-        public NetworkConnectivityReceiver(@Nonnull final NetworkStateChangeListener listener,
-                final boolean isNetworkConnected) {
-            mListener = listener;
-            mIsNetworkConnected = isNetworkConnected;
-        }
-
-        public synchronized boolean isNetworkConnected() {
-            return mIsNetworkConnected;
-        }
-
-        @Override
-        public void onReceive(final Context context, final Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
-                final boolean noConnection = intent.getBooleanExtra(
-                        ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
-                synchronized (this) {
-                    mIsNetworkConnected = !noConnection;
-                }
-                mListener.onNetworkStateChanged();
-            }
-        }
-    }
-
-    private NetworkConnectivityUtils() {
-        // This utility class is not publicly instantiable.
-    }
-
-    public static void onCreate(@Nonnull final Context context,
-            @Nonnull final NetworkStateChangeListener listener) {
-        final ConnectivityManager connectivityManager =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        final NetworkInfo info = connectivityManager.getActiveNetworkInfo();
-        final boolean isNetworkConnected = (info != null && info.isConnected());
-
-        // Register {@link BroadcastReceiver} for the network connectivity state change.
-        final NetworkConnectivityReceiver receiver = new NetworkConnectivityReceiver(
-                listener, isNetworkConnected);
-        final IntentFilter filter = new IntentFilter();
-        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        context.registerReceiver(receiver, filter);
-
-        sNetworkConnectivityReceiver = receiver;
-    }
-
-    public static void onDestroy(final Context context) {
-        context.unregisterReceiver(sNetworkConnectivityReceiver);
-    }
-
-    public static boolean isNetworkConnected() {
-        final NetworkConnectivityReceiver receiver = sNetworkConnectivityReceiver;
-        return receiver != null && receiver.isNetworkConnected();
-    }
-}