DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16

1 files changed, 0 insertions, 57 deletions

diff --git a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
deleted file mode 100644
index 4e8a10b1f..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.settings;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceFragment;
-import android.view.inputmethod.InputMethodSubtype;
-
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.RichInputMethodManager;
-
-import javax.annotation.Nonnull;
-
-/**
- * Utility class for managing additional features settings.
- */
-@SuppressWarnings("unused")
-public class AdditionalFeaturesSettingUtils {
-    public static final int ADDITIONAL_FEATURES_SETTINGS_SIZE = 0;
-
-    private AdditionalFeaturesSettingUtils() {
-        // This utility class is not publicly instantiable.
-    }
-
-    public static void addAdditionalFeaturesPreferences(
-            final Context context, final PreferenceFragment settingsFragment) {
-        // do nothing.
-    }
-
-    public static void readAdditionalFeaturesPreferencesIntoArray(final Context context,
-            final SharedPreferences prefs, final int[] additionalFeaturesPreferences) {
-        // do nothing.
-    }
-
-    @Nonnull
-    public static RichInputMethodSubtype createRichInputMethodSubtype(
-            @Nonnull final RichInputMethodManager imm,
-            @Nonnull final InputMethodSubtype subtype,
-            final Context context) {
-        return new RichInputMethodSubtype(subtype);
-    }
-}