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

Commit 0ea6270f authored by Ken Wakasa's avatar Ken Wakasa
Browse files

More commit -> apply changes with SharedPreferencesCompat. 

The newly added SharedPreferencesCompat adapter class does apply() when available (Gingerbread+), else do commit().

This change incorporates I4eca20fb and I39f6aa04.

bug: 2983837
Change-Id: Iec4e8b69840ad71dbbd6098eeba349934d8248ff
parent aed01227

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -106,7 +106,7 @@ public class Hints { 
        SharedPreferences.Editor editor =

        SharedPreferences.Editor editor =

                PreferenceManager.getDefaultSharedPreferences(mContext).edit();

                PreferenceManager.getDefaultSharedPreferences(mContext).edit();

        editor.putLong(PREF_VOICE_INPUT_LAST_TIME_USED, System.currentTimeMillis());

        editor.putLong(PREF_VOICE_INPUT_LAST_TIME_USED, System.currentTimeMillis());

        editor.commit();

        SharedPreferencesCompat.apply(editor);





        mVoiceResultContainedPunctuation = false;

        mVoiceResultContainedPunctuation = false;

        for (CharSequence s : SPEAKABLE_PUNCTUATION.keySet()) {

        for (CharSequence s : SPEAKABLE_PUNCTUATION.keySet()) {
@@ -168,7 +168,7 @@ public class Hints { 
            SharedPreferences.Editor editor = sp.edit();

            SharedPreferences.Editor editor = sp.edit();

            editor.putInt(PREF_VOICE_HINT_NUM_UNIQUE_DAYS_SHOWN, numUniqueDaysShown + 1);

            editor.putInt(PREF_VOICE_HINT_NUM_UNIQUE_DAYS_SHOWN, numUniqueDaysShown + 1);

            editor.putLong(PREF_VOICE_HINT_LAST_TIME_SHOWN, System.currentTimeMillis());

            editor.putLong(PREF_VOICE_HINT_LAST_TIME_SHOWN, System.currentTimeMillis());

            editor.commit();

            SharedPreferencesCompat.apply(editor);

        }

        }





        if (mDisplay != null) {

        if (mDisplay != null) {
@@ -181,7 +181,7 @@ public class Hints { 
        int value = sp.getInt(pref, 0);

        int value = sp.getInt(pref, 0);

        SharedPreferences.Editor editor = sp.edit();

        SharedPreferences.Editor editor = sp.edit();

        editor.putInt(pref, value + 1);

        editor.putInt(pref, value + 1);

        editor.commit();

        SharedPreferencesCompat.apply(editor);

        return value;

        return value;

    }

    }

}
 
}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -143,7 +143,7 @@ public class InputLanguageSelection extends PreferenceActivity { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);

        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);

        Editor editor = sp.edit();

        Editor editor = sp.edit();

        editor.putString(LatinIME.PREF_SELECTED_LANGUAGES, checkedLanguages);

        editor.putString(LatinIME.PREF_SELECTED_LANGUAGES, checkedLanguages);

        editor.commit();

        SharedPreferencesCompat.apply(editor);

    }

    }





    ArrayList<Loc> getUniqueLocales() {

    ArrayList<Loc> getUniqueLocales() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -188,7 +188,7 @@ public class LanguageSwitcher { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mIme);

        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mIme);

        Editor editor = sp.edit();

        Editor editor = sp.edit();

        editor.putString(LatinIME.PREF_INPUT_LANGUAGE, getInputLanguage());

        editor.putString(LatinIME.PREF_INPUT_LANGUAGE, getInputLanguage());

        editor.apply();

        SharedPreferencesCompat.apply(editor);

    }

    }





    static String toTitleCase(String s) {

    static String toTitleCase(String s) {

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1551,7 +1551,7 @@ public class LatinIME extends InputMethodService 
            SharedPreferences.Editor editor =

            SharedPreferences.Editor editor =

                    PreferenceManager.getDefaultSharedPreferences(this).edit();

                    PreferenceManager.getDefaultSharedPreferences(this).edit();

            editor.putBoolean(PREF_HAS_USED_VOICE_INPUT, true);

            editor.putBoolean(PREF_HAS_USED_VOICE_INPUT, true);

            editor.commit();

            SharedPreferencesCompat.apply(editor);

            mHasUsedVoiceInput = true;

            mHasUsedVoiceInput = true;

        }

        }
@@ -1561,7 +1561,7 @@ public class LatinIME extends InputMethodService 
            SharedPreferences.Editor editor =

            SharedPreferences.Editor editor =

                    PreferenceManager.getDefaultSharedPreferences(this).edit();

                    PreferenceManager.getDefaultSharedPreferences(this).edit();

            editor.putBoolean(PREF_HAS_USED_VOICE_INPUT_UNSUPPORTED_LOCALE, true);

            editor.putBoolean(PREF_HAS_USED_VOICE_INPUT_UNSUPPORTED_LOCALE, true);

            editor.commit();

            SharedPreferencesCompat.apply(editor);

            mHasUsedVoiceInputUnsupportedLocale = true;

            mHasUsedVoiceInputUnsupportedLocale = true;

        }

        }

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

0 → 100644
+54 −0
Original line number Original line Diff line number Diff line 
/*

 * 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();

    }

}