am 45606d3c: am 0ea6270f: More commit -> apply changes with SharedPreferencesCompat.

Merge commit '45606d3c48c5f079673879add3e700ea571e2a93'

* commit '45606d3c48c5f079673879add3e700ea571e2a93':
  More commit -> apply changes with SharedPreferencesCompat.

5 files changed, 61 insertions, 7 deletions

diff --git a/java/src/com/android/inputmethod/latin/Hints.java b/java/src/com/android/inputmethod/latin/Hints.java
index 2434d5195..c467365e7 100644
--- a/java/src/com/android/inputmethod/latin/Hints.java
+++ b/java/src/com/android/inputmethod/latin/Hints.java
@@ -106,7 +106,7 @@ public class Hints {
         SharedPreferences.Editor editor =
                 PreferenceManager.getDefaultSharedPreferences(mContext).edit();
         editor.putLong(PREF_VOICE_INPUT_LAST_TIME_USED, System.currentTimeMillis());
-        editor.commit();
+        SharedPreferencesCompat.apply(editor);
 
         mVoiceResultContainedPunctuation = false;
         for (CharSequence s : SPEAKABLE_PUNCTUATION.keySet()) {
@@ -168,7 +168,7 @@ public class Hints {
             SharedPreferences.Editor editor = sp.edit();
             editor.putInt(PREF_VOICE_HINT_NUM_UNIQUE_DAYS_SHOWN, numUniqueDaysShown + 1);
             editor.putLong(PREF_VOICE_HINT_LAST_TIME_SHOWN, System.currentTimeMillis());
-            editor.commit();
+            SharedPreferencesCompat.apply(editor);
         }
 
         if (mDisplay != null) {
@@ -181,7 +181,7 @@ public class Hints {
         int value = sp.getInt(pref, 0);
         SharedPreferences.Editor editor = sp.edit();
         editor.putInt(pref, value + 1);
-        editor.commit();
+        SharedPreferencesCompat.apply(editor);
         return value;
     }
 }
diff --git a/java/src/com/android/inputmethod/latin/InputLanguageSelection.java b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
index 7258874c0..e811a2cdd 100644
--- a/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
+++ b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
@@ -143,7 +143,7 @@ public class InputLanguageSelection extends PreferenceActivity {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
         Editor editor = sp.edit();
         editor.putString(LatinIME.PREF_SELECTED_LANGUAGES, checkedLanguages);
-        editor.commit();
+        SharedPreferencesCompat.apply(editor);
     }
 
     ArrayList<Loc> getUniqueLocales() {
diff --git a/java/src/com/android/inputmethod/latin/LanguageSwitcher.java b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
index d898d6830..7b5c30491 100644
--- a/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
@@ -188,7 +188,7 @@ public class LanguageSwitcher {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mIme);
         Editor editor = sp.edit();
         editor.putString(LatinIME.PREF_INPUT_LANGUAGE, getInputLanguage());
-        editor.apply();
+        SharedPreferencesCompat.apply(editor);
     }
 
     static String toTitleCase(String s) {
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e84ba5a2b..8710b38d0 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1550,7 +1550,7 @@ public class LatinIME extends InputMethodService
             SharedPreferences.Editor editor =
                     PreferenceManager.getDefaultSharedPreferences(this).edit();
             editor.putBoolean(PREF_HAS_USED_VOICE_INPUT, true);
-            editor.commit();
+            SharedPreferencesCompat.apply(editor);
             mHasUsedVoiceInput = true;
         }
 
@@ -1560,7 +1560,7 @@ public class LatinIME extends InputMethodService
             SharedPreferences.Editor editor =
                     PreferenceManager.getDefaultSharedPreferences(this).edit();
             editor.putBoolean(PREF_HAS_USED_VOICE_INPUT_UNSUPPORTED_LOCALE, true);
-            editor.commit();
+            SharedPreferencesCompat.apply(editor);
             mHasUsedVoiceInputUnsupportedLocale = true;
         }
 
diff --git a/java/src/com/android/inputmethod/latin/SharedPreferencesCompat.java b/java/src/com/android/inputmethod/latin/SharedPreferencesCompat.java
new file mode 100644
index 000000000..8364c90fa
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/SharedPreferencesCompat.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 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.SharedPreferences;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Reflection utils to call SharedPreferences$Editor.apply when possible,
+ * falling back to commit when apply isn't available.
+ */
+public class SharedPreferencesCompat {
+    private static final Method sApplyMethod = findApplyMethod();
+
+    private static Method findApplyMethod() {
+        try {
+            Class cls = SharedPreferences.Editor.class;
+            return cls.getMethod("apply");
+        } catch (NoSuchMethodException unused) {
+            // fall through
+        }
+        return null;
+    }
+
+    public static void apply(SharedPreferences.Editor editor) {
+        if (sApplyMethod != null) {
+            try {
+                sApplyMethod.invoke(editor);
+                return;
+            } catch (InvocationTargetException unused) {
+                // fall through
+            } catch (IllegalAccessException unused) {
+                // fall through
+            }
+        }
+        editor.commit();
+    }
+}