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

Commit 08adb09e authored by Jean Chalard's avatar Jean Chalard
Browse files

Remove unused stuff. 

Remove 2 methods that were left only for tests to compile in
another project, but are not used any more now that the tests
have been updated.
Also remove an attribute that is never read.

Change-Id: Ic9ba1f52a465199c82c923d77ed7450460e8a4b9
parent 9ffaae71

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

+3 −6
Original line number Original line Diff line number Diff line
@@ -271,8 +271,7 @@ public class Suggest implements Dictionary.WordCallback { 




        return new SuggestedWords.Builder()

        return new SuggestedWords.Builder()

                .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                .setAllowsToBeAutoCorrected(false)

                .setAllowsToBeAutoCorrected(false);

                .setHasAutoCorrection(false);

    }

    }





    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder

    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -425,13 +424,11 @@ public class Suggest implements Dictionary.WordCallback { 
                        "--", false));

                        "--", false));

            }

            }

            builder = new SuggestedWords.Builder().setWords(scoreInfoList)

            builder = new SuggestedWords.Builder().setWords(scoreInfoList)

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected);

                    .setHasAutoCorrection(hasAutoCorrection);

        } else {

        } else {

            builder = new SuggestedWords.Builder()

            builder = new SuggestedWords.Builder()

                    .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                    .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected);

                    .setHasAutoCorrection(hasAutoCorrection);

        }

        }





        boolean autoCorrectionAvailable = hasAutoCorrection;

        boolean autoCorrectionAvailable = hasAutoCorrection;

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

+0 −20
Original line number Original line Diff line number Diff line
@@ -79,7 +79,6 @@ public class SuggestedWords { 
        private boolean mIsPunctuationSuggestions;

        private boolean mIsPunctuationSuggestions;

        private boolean mShouldBlockAutoCorrectionBySafetyNet;

        private boolean mShouldBlockAutoCorrectionBySafetyNet;

        private boolean mAllowsToBeAutoCorrected;

        private boolean mAllowsToBeAutoCorrected;

        private boolean mHasAutoCorrection;

        private List<SuggestedWordInfo> mSuggestedWordInfoList =

        private List<SuggestedWordInfo> mSuggestedWordInfoList =

                new ArrayList<SuggestedWordInfo>();

                new ArrayList<SuggestedWordInfo>();
@@ -87,25 +86,11 @@ public class SuggestedWords { 
            // Nothing to do here.

            // Nothing to do here.

        }

        }





        // TODO: compatibility for tests. Remove this once tests are okay.

        public Builder addWords(List<SuggestedWordInfo> suggestedWordInfoList) {

            return setWords(suggestedWordInfoList);

        }



        public Builder setWords(List<SuggestedWordInfo> suggestedWordInfoList) {

        public Builder setWords(List<SuggestedWordInfo> suggestedWordInfoList) {

            mSuggestedWordInfoList = suggestedWordInfoList;

            mSuggestedWordInfoList = suggestedWordInfoList;

            return this;

            return this;

        }

        }





        /* package for tests */

        Builder addWord(CharSequence word, SuggestedWordInfo suggestedWordInfo) {

            if (!TextUtils.isEmpty(suggestedWordInfo.mWord)) {

                // It's okay if suggestedWordInfo is null since it's checked where it's used.

                mSuggestedWordInfoList.add(suggestedWordInfo);

            }

            return this;

        }



        public static List<SuggestedWordInfo> getFromCharSequenceList(

        public static List<SuggestedWordInfo> getFromCharSequenceList(

                final List<CharSequence> wordList) {

                final List<CharSequence> wordList) {

            final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>();

            final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>();
@@ -149,11 +134,6 @@ public class SuggestedWords { 
            return this;

            return this;

        }

        }





        public Builder setHasAutoCorrection(final boolean hasAutoCorrection) {

            mHasAutoCorrection = hasAutoCorrection;

            return this;

        }



        // Should get rid of the first one (what the user typed previously) from suggestions

        // Should get rid of the first one (what the user typed previously) from suggestions

        // and replace it with what the user currently typed.

        // and replace it with what the user currently typed.

        public static ArrayList<SuggestedWordInfo> getTypedWordAndPreviousSuggestions(

        public static ArrayList<SuggestedWordInfo> getTypedWordAndPreviousSuggestions(