Merge pull request #66 from navgurukul/bug_fixes_suraj

glide type feature added
navgurukul · Nov 23, 2024 · 0a50dbb · 0a50dbb
2 parents 6cb11e8 + fe4c3da
commit 0a50dbb
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 36 deletions.
diff --git a/...g/inputmethod/keyboard/ProximityInfo.java → ...d/inputmethod/keyboard/ProximityInfo.java b/...g/inputmethod/keyboard/ProximityInfo.java → ...d/inputmethod/keyboard/ProximityInfo.java
@@ -1,4 +1,4 @@
-package org.inputmethod.keyboard;
+package com.android.inputmethod.keyboard;
 
 import android.graphics.Rect;
 import org.oscar.kb.latin.utils.Log;

diff --git a/...g/inputmethod/latin/BinaryDictionary.java → ...d/inputmethod/latin/BinaryDictionary.java b/...g/inputmethod/latin/BinaryDictionary.java → ...d/inputmethod/latin/BinaryDictionary.java
@@ -1,10 +1,13 @@
-package org.inputmethod.latin;
+package com.android.inputmethod.latin;
 
 import android.text.TextUtils;
 import android.util.SparseArray;
 
 import androidx.annotation.NonNull;
 
+import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import com.android.inputmethod.latin.utils.WordInputEventForPersonalization;
+
 import org.oscar.kb.latin.Dictionary;
 import org.oscar.kb.latin.NgramContext;
 import org.oscar.kb.latin.SuggestedWords.SuggestedWordInfo;
@@ -19,8 +22,6 @@
 import org.oscar.kb.latin.settings.SettingsValuesForSuggestion;
 import org.oscar.kb.latin.utils.JniUtils;
 
-import org.inputmethod.latin.utils.BinaryDictionaryUtils;
-import org.inputmethod.latin.utils.WordInputEventForPersonalization;
 import org.oscar.kb.latin.makedict.DictionaryHeader;
 import org.oscar.kb.latin.utils.Log;
 

diff --git a/...inputmethod/latin/DicTraverseSession.java → ...inputmethod/latin/DicTraverseSession.java b/...inputmethod/latin/DicTraverseSession.java → ...inputmethod/latin/DicTraverseSession.java
@@ -1,4 +1,4 @@
-package org.inputmethod.latin;
+package com.android.inputmethod.latin;
 
 import org.oscar.kb.latin.common.NativeSuggestOptions;
 import org.oscar.kb.latin.define.DecoderSpecificConstants;

diff --git a/...od/latin/utils/BinaryDictionaryUtils.java → ...od/latin/utils/BinaryDictionaryUtils.java b/...od/latin/utils/BinaryDictionaryUtils.java → ...od/latin/utils/BinaryDictionaryUtils.java
@@ -1,6 +1,7 @@
-package org.inputmethod.latin.utils;
+package com.android.inputmethod.latin.utils;
+
+import com.android.inputmethod.latin.BinaryDictionary;
 
-import org.inputmethod.latin.BinaryDictionary;
 import org.oscar.kb.latin.common.StringUtils;
 import org.oscar.kb.latin.makedict.DictionaryHeader;
 import org.oscar.kb.latin.makedict.UnsupportedFormatException;

diff --git a/...ils/WordInputEventForPersonalization.java → ...ils/WordInputEventForPersonalization.java b/...ils/WordInputEventForPersonalization.java → ...ils/WordInputEventForPersonalization.java
@@ -1,4 +1,4 @@
-package org.inputmethod.latin.utils;
+package com.android.inputmethod.latin.utils;
 
 import org.oscar.kb.latin.utils.Log;
 

diff --git a/app/src/main/java/org/oscar/kb/keyboard/Keyboard.java b/app/src/main/java/org/oscar/kb/keyboard/Keyboard.java
@@ -11,7 +11,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.inputmethod.keyboard.ProximityInfo;
+
+import com.android.inputmethod.keyboard.ProximityInfo;
 
 import org.oscar.kb.keyboard.internal.KeyVisualAttributes;
 import org.oscar.kb.keyboard.internal.KeyboardIconsSet;

diff --git a/app/src/main/java/org/oscar/kb/keyboard/KeyboardLayout.java b/app/src/main/java/org/oscar/kb/keyboard/KeyboardLayout.java
@@ -8,7 +8,8 @@
 
 import androidx.annotation.NonNull;
 
-import org.inputmethod.keyboard.ProximityInfo;
+
+import com.android.inputmethod.keyboard.ProximityInfo;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/org/oscar/kb/latin/ContactsBinaryDictionary.java b/app/src/main/java/org/oscar/kb/latin/ContactsBinaryDictionary.java
@@ -15,7 +15,8 @@
 
 import androidx.annotation.Nullable;
 
-import org.inputmethod.latin.BinaryDictionary;
+
+import com.android.inputmethod.latin.BinaryDictionary;
 
 import org.oscar.kb.latin.ContactsManager.ContactsChangedListener;
 import org.oscar.kb.latin.common.StringUtils;

diff --git a/app/src/main/java/org/oscar/kb/latin/ExpandableBinaryDictionary.java b/app/src/main/java/org/oscar/kb/latin/ExpandableBinaryDictionary.java
@@ -11,7 +11,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.inputmethod.latin.BinaryDictionary;
+import com.android.inputmethod.latin.BinaryDictionary;
+
 import org.oscar.kb.latin.common.ComposedData;
 import org.oscar.kb.latin.common.FileUtils;
 import org.oscar.kb.latin.define.DecoderSpecificConstants;

diff --git a/app/src/main/java/org/oscar/kb/latin/ReadOnlyBinaryDictionary.java b/app/src/main/java/org/oscar/kb/latin/ReadOnlyBinaryDictionary.java
@@ -6,7 +6,8 @@
 
 package org.oscar.kb.latin;
 
-import org.inputmethod.latin.BinaryDictionary;
+import com.android.inputmethod.latin.BinaryDictionary;
+
 import org.oscar.kb.latin.common.ComposedData;
 import org.oscar.kb.latin.settings.SettingsValuesForSuggestion;
 

diff --git a/app/src/main/java/org/oscar/kb/latin/Suggest.kt b/app/src/main/java/org/oscar/kb/latin/Suggest.kt
@@ -6,7 +6,7 @@
 package org.oscar.kb.latin
 
 import android.text.TextUtils
-import org.inputmethod.latin.utils.BinaryDictionaryUtils
+import com.android.inputmethod.latin.utils.BinaryDictionaryUtils
 import org.oscar.kb.keyboard.Keyboard
 import org.oscar.kb.latin.SuggestedWords.SuggestedWordInfo
 import org.oscar.kb.latin.common.ComposedData

diff --git a/app/src/main/java/org/oscar/kb/latin/UserBinaryDictionary.java b/app/src/main/java/org/oscar/kb/latin/UserBinaryDictionary.java
@@ -16,10 +16,9 @@
 
 import androidx.annotation.Nullable;
 
-import org.inputmethod.latin.BinaryDictionary;
 
-import org.oscar.kb.latin.utils.Log;
-import org.oscar.kb.latin.utils.SubtypeLocaleUtils;
+import com.android.inputmethod.latin.BinaryDictionary;
+
 import org.oscar.kb.latin.utils.Log;
 import org.oscar.kb.latin.utils.SubtypeLocaleUtils;
 

diff --git a/app/src/main/java/org/oscar/kb/latin/makedict/ProbabilityInfo.java b/app/src/main/java/org/oscar/kb/latin/makedict/ProbabilityInfo.java
@@ -6,7 +6,8 @@
 
 package org.oscar.kb.latin.makedict;
 
-import org.inputmethod.latin.BinaryDictionary;
+import com.android.inputmethod.latin.BinaryDictionary;
+
 import org.oscar.kb.latin.utils.CombinedFormatUtils;
 
 import java.util.Arrays;

diff --git a/app/src/main/java/org/oscar/kb/latin/makedict/WordProperty.java b/app/src/main/java/org/oscar/kb/latin/makedict/WordProperty.java
@@ -9,7 +9,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.inputmethod.latin.BinaryDictionary;
+import com.android.inputmethod.latin.BinaryDictionary;
+
 import org.oscar.kb.latin.Dictionary;
 import org.oscar.kb.latin.NgramContext;
 import org.oscar.kb.latin.common.StringUtils;

diff --git a/app/src/main/java/org/oscar/kb/latin/personalization/UserHistoryDictionary.java b/app/src/main/java/org/oscar/kb/latin/personalization/UserHistoryDictionary.java
@@ -11,7 +11,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.inputmethod.latin.BinaryDictionary;
+import com.android.inputmethod.latin.BinaryDictionary;
+
 import org.oscar.kb.latin.Dictionary;
 import org.oscar.kb.latin.ExpandableBinaryDictionary;
 import org.oscar.kb.latin.NgramContext;

diff --git a/app/src/main/java/org/oscar/kb/latin/setup/SetupWizardActivity.java b/app/src/main/java/org/oscar/kb/latin/setup/SetupWizardActivity.java
@@ -146,8 +146,8 @@ protected void onCreate(final Bundle savedInstanceState) {
             mStepNumber = savedInstanceState.getInt(STATE_STEP);
         }
 
-        if (!JniUtils.sHaveGestureLib);
-//            ((TextView) findViewById(R.id.setup_welcome_description)).setText("");
+        if (!JniUtils.sHaveGestureLib)
+            ((TextView) findViewById(R.id.setup_welcome_description)).setText("");
 
         sharedPreferences = getSharedPreferences("keyboard_prefs", Context.MODE_PRIVATE);
         if (isSetupComplete()) {

diff --git a/app/src/main/java/org/oscar/kb/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java b/app/src/main/java/org/oscar/kb/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
@@ -20,6 +20,8 @@
 import android.view.textservice.SuggestionsInfo;
 import android.view.textservice.TextInfo;
 
+import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+
 import org.oscar.kb.keyboard.Keyboard;
 import org.oscar.kb.latin.NgramContext;
 import org.oscar.kb.latin.SuggestedWords.SuggestedWordInfo;
@@ -28,7 +30,6 @@
 import org.oscar.kb.latin.common.LocaleUtils;
 import org.oscar.kb.latin.common.StringUtils;
 import org.oscar.kb.latin.define.DebugFlags;
-import org.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.oscar.kb.latin.utils.DeviceProtectedUtils;
 import org.oscar.kb.latin.utils.ScriptUtils;

diff --git a/app/src/main/java/org/oscar/kb/latin/utils/AutoCorrectionUtils.java b/app/src/main/java/org/oscar/kb/latin/utils/AutoCorrectionUtils.java
@@ -6,12 +6,11 @@
 
 package org.oscar.kb.latin.utils;
 
-import org.inputmethod.latin.utils.BinaryDictionaryUtils;
+
+import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.oscar.kb.latin.define.DebugFlags;
 import org.oscar.kb.latin.SuggestedWords.SuggestedWordInfo;
-import org.oscar.kb.latin.define.DebugFlags;
-import org.oscar.kb.latin.utils.Log;
 
 public final class AutoCorrectionUtils {
     private static final String TAG = AutoCorrectionUtils.class.getSimpleName();

diff --git a/app/src/main/java/org/oscar/kb/latin/utils/DictionaryInfoUtils.java b/app/src/main/java/org/oscar/kb/latin/utils/DictionaryInfoUtils.java
@@ -12,18 +12,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.inputmethod.latin.utils.BinaryDictionaryUtils;
+
+import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.oscar.kb.latin.define.DecoderSpecificConstants;
 import org.oscar.kb.latin.makedict.DictionaryHeader;
 import org.oscar.kb.latin.makedict.UnsupportedFormatException;
 import org.oscar.kb.latin.settings.SpacingAndPunctuations;
-import org.oscar.kb.latin.define.DecoderSpecificConstants;
-import org.oscar.kb.latin.makedict.DictionaryHeader;
-import org.oscar.kb.latin.utils.Log;
-
-import org.oscar.kb.latin.makedict.UnsupportedFormatException;
-import org.oscar.kb.latin.settings.SpacingAndPunctuations;
 
 
 import java.io.File;

diff --git a/app/src/test/java/org/oscar/kb/KeyboardParserTest.kt b/app/src/test/java/org/oscar/kb/KeyboardParserTest.kt
@@ -5,7 +5,6 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodSubtype
 import org.inputmethod.keyboard.ProximityInfo
 import org.oscar.kb.keyboard.Key.KeyParams
-import org.oscar.kb.keyboard.Keyboard
 import org.oscar.kb.keyboard.KeyboardId
 import org.oscar.kb.keyboard.KeyboardLayoutSet
 import org.oscar.kb.keyboard.internal.KeySpecParser
@@ -18,7 +17,6 @@ import org.oscar.kb.keyboard.internal.keyboard_parser.RawKeyboardParser
 import org.oscar.kb.keyboard.internal.keyboard_parser.addLocaleKeyTextsToParams
 import org.oscar.kb.keyboard.internal.keyboard_parser.floris.KeyCode
 import org.oscar.kb.latin.LatinIME
-import org.oscar.kb.latin.RichInputMethodSubtype
 import org.oscar.kb.latin.utils.AdditionalSubtypeUtils.createEmojiCapableAdditionalSubtype
 import org.oscar.kb.latin.utils.POPUP_KEYS_LAYOUT
 import org.oscar.kb.latin.utils.checkKeys

diff --git a/app/src/test/java/org/oscar/kb/Shadows.kt b/app/src/test/java/org/oscar/kb/Shadows.kt
@@ -12,7 +12,6 @@ import org.inputmethod.latin.utils.BinaryDictionaryUtils
 import org.robolectric.annotation.Implementation
 import org.robolectric.annotation.Implements
 import org.robolectric.shadows.ShadowInputMethodManager
-import org.oscar.kb.BuildConfig
 import java.util.*
 
 @Implements(LocaleManagerCompat::class)