aboutsummaryrefslogtreecommitdiffstats
path: root/java-overridable/src
diff options
context:
space:
mode:
Diffstat (limited to 'java-overridable/src')
-rw-r--r--java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java13
-rw-r--r--java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java2
-rw-r--r--java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java12
-rw-r--r--java-overridable/src/com/android/inputmethod/latin/sync/BeanstalkManager.java55
4 files changed, 19 insertions, 63 deletions
diff --git a/java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java b/java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java
index 70f152acb..e07a9f358 100644
--- a/java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java
+++ b/java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java
@@ -16,16 +16,20 @@
package com.android.inputmethod.latin.accounts;
-import android.accounts.Account;
import android.content.Context;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
/**
* Utility class for retrieving accounts that may be used for login.
*/
public class LoginAccountUtils {
+ /**
+ * This defines the type of account this class deals with.
+ * This account type is used when listing the accounts available on the device for login.
+ */
+ public static final String ACCOUNT_TYPE = "";
+
private LoginAccountUtils() {
// This utility class is not publicly instantiable.
}
@@ -39,9 +43,4 @@ public class LoginAccountUtils {
public static String[] getAccountsForLogin(final Context context) {
return new String[0];
}
-
- @Nullable
- public static Account getCurrentAccount(final Context context) {
- return null;
- }
}
diff --git a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java b/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
index 10fc612e7..99b958952 100644
--- a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
+++ b/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
@@ -46,5 +46,5 @@ public final class ProductionFlags {
/**
* When {@code true}, personal dictionary sync feature is ready to be enabled.
*/
- public static final boolean ENABLE_PERSONAL_DICTIONARY_SYNC = false;
+ public static final boolean ENABLE_PERSONAL_DICTIONARY_SYNC = ENABLE_ACCOUNT_SIGN_IN && false;
}
diff --git a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
index 1c02d7d63..747a3b06e 100644
--- a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
+++ b/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
@@ -19,6 +19,12 @@ 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.
@@ -39,4 +45,10 @@ public class AdditionalFeaturesSettingUtils {
final SharedPreferences prefs, final int[] additionalFeaturesPreferences) {
// do nothing.
}
+
+ public static RichInputMethodSubtype createRichInputMethodSubtype(
+ @Nonnull final RichInputMethodManager imm,
+ @Nonnull final InputMethodSubtype subtype) {
+ return new RichInputMethodSubtype(subtype);
+ }
}
diff --git a/java-overridable/src/com/android/inputmethod/latin/sync/BeanstalkManager.java b/java-overridable/src/com/android/inputmethod/latin/sync/BeanstalkManager.java
deleted file mode 100644
index 2242d9244..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/sync/BeanstalkManager.java
+++ /dev/null
@@ -1,55 +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.sync;
-
-import android.content.Context;
-
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.GuardedBy;
-
-public class BeanstalkManager {
- private static final Object sLock = new Object();
-
- @GuardedBy("sLock")
- private static BeanstalkManager sInstance;
-
- /**
- * @return the singleton instance of {@link BeanstalkManager}.
- */
- @Nonnull
- public static BeanstalkManager getInstance(Context context) {
- synchronized(sLock) {
- if (sInstance == null) {
- sInstance = new BeanstalkManager(context.getApplicationContext());
- }
- }
- return sInstance;
- }
-
- private BeanstalkManager(final Context context) {
- // Intentional private constructor for singleton.
- }
-
- public void onCreate() {
- }
-
- public void requestSync() {
- }
-
- public void onDestroy() {
- }
-} \ No newline at end of file