11 files changed, 19 insertions, 19 deletions
diff --git a/java/res/layout/dictionary_line.xml b/java/res/layout/dictionary_line.xml
index bb1843d6c..e6d3ff8f0 100644
--- a/java/res/layout/dictionary_line.xml
+++ b/java/res/layout/dictionary_line.xml
@@ -66,7 +66,7 @@
           android:textColor="?android:attr/textColorSecondary"
           android:maxLines="1" />
 
-      <com.android.inputmethod.dictionarypack.DictionaryDownloadProgressBar
+      <org.kelar.inputmethod.dictionarypack.DictionaryDownloadProgressBar
           android:id="@+id/dictionary_line_progress_bar"
           style="@android:style/Widget.Holo.ProgressBar.Horizontal"
           android:layout_width="match_parent"
@@ -76,7 +76,7 @@
     </FrameLayout>
   </LinearLayout>
 
-  <com.android.inputmethod.dictionarypack.ButtonSwitcher
+  <org.kelar.inputmethod.dictionarypack.ButtonSwitcher
       android:id="@+id/wordlist_button_switcher"
       android:layout_weight="0"
       android:layout_marginStart="13dip"
@@ -107,5 +107,5 @@
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/delete_dict" />
-  </com.android.inputmethod.dictionarypack.ButtonSwitcher>
+  </org.kelar.inputmethod.dictionarypack.ButtonSwitcher>
 </LinearLayout>
diff --git a/java/res/layout/emoji_keyboard_page.xml b/java/res/layout/emoji_keyboard_page.xml
index 0d1086171..67f6f3f3e 100644
--- a/java/res/layout/emoji_keyboard_page.xml
+++ b/java/res/layout/emoji_keyboard_page.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.keyboard.emoji.EmojiPageKeyboardView
+<org.kelar.inputmethod.keyboard.emoji.EmojiPageKeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/emoji_keyboard_page"
     android:layoutDirection="ltr"
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 7c5f6c0a6..69ff74386 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.keyboard.emoji.EmojiPalettesView
+<org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
         android:id="@+id/emoji_keyboard_pager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-    <com.android.inputmethod.keyboard.emoji.EmojiCategoryPageIndicatorView
+    <org.kelar.inputmethod.keyboard.emoji.EmojiCategoryPageIndicatorView
         android:id="@+id/emoji_category_page_id_view"
         android:layout_width="match_parent"
         android:layout_height="2dip" />
@@ -129,4 +129,4 @@
             android:hapticFeedbackEnabled="false"
             android:soundEffectsEnabled="false" />
     </LinearLayout>
-</com.android.inputmethod.keyboard.emoji.EmojiPalettesView>
+</org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView>
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index ae3c19db5..3d80533de 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.latin.InputView
+<org.kelar.inputmethod.latin.InputView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -29,4 +29,4 @@
     <include
         android:id="@+id/emoji_palettes_view"
         layout="@layout/emoji_palettes_view" />
-</com.android.inputmethod.latin.InputView>
+</org.kelar.inputmethod.latin.InputView>
diff --git a/java/res/layout/main_keyboard_frame.xml b/java/res/layout/main_keyboard_frame.xml
index ebf746679..95b36639d 100644
--- a/java/res/layout/main_keyboard_frame.xml
+++ b/java/res/layout/main_keyboard_frame.xml
@@ -27,7 +27,7 @@
 
     <!-- To ensure that key preview popup is correctly placed when the current system locale is
          one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
-    <com.android.inputmethod.latin.suggestions.SuggestionStripView
+    <org.kelar.inputmethod.latin.suggestions.SuggestionStripView
         android:id="@+id/suggestion_strip_view"
         android:layoutDirection="ltr"
         android:layout_width="match_parent"
@@ -37,7 +37,7 @@
 
     <!-- To ensure that key preview popup is correctly placed when the current system locale is
          one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
-    <com.android.inputmethod.keyboard.MainKeyboardView
+    <org.kelar.inputmethod.keyboard.MainKeyboardView
         android:id="@+id/keyboard_view"
         android:layoutDirection="ltr"
         android:layout_width="match_parent"
diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml
index 449c00f92..02956a1d3 100644
--- a/java/res/layout/more_keys_keyboard.xml
+++ b/java/res/layout/more_keys_keyboard.xml
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
 >
-    <com.android.inputmethod.keyboard.MoreKeysKeyboardView
+    <org.kelar.inputmethod.keyboard.MoreKeysKeyboardView
         android:id="@+id/more_keys_keyboard_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/more_keys_keyboard_for_action_lxx.xml b/java/res/layout/more_keys_keyboard_for_action_lxx.xml
index d23faa4f0..09157c13c 100644
--- a/java/res/layout/more_keys_keyboard_for_action_lxx.xml
+++ b/java/res/layout/more_keys_keyboard_for_action_lxx.xml
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
 >
-    <com.android.inputmethod.keyboard.MoreKeysKeyboardView
+    <org.kelar.inputmethod.keyboard.MoreKeysKeyboardView
         android:id="@+id/more_keys_keyboard_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml
index 0869992c9..06dd77aa5 100644
--- a/java/res/layout/more_suggestions.xml
+++ b/java/res/layout/more_suggestions.xml
@@ -24,8 +24,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
 >
-    <com.android.inputmethod.latin.suggestions.MoreSuggestionsView
-        xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    <org.kelar.inputmethod.latin.suggestions.MoreSuggestionsView
+        xmlns:latin="http://schemas.android.com/apk/res-auto"
         android:id="@+id/more_suggestions_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/setup_start_indicator_label.xml b/java/res/layout/setup_start_indicator_label.xml
index 33854bb44..dd5acf09c 100644
--- a/java/res/layout/setup_start_indicator_label.xml
+++ b/java/res/layout/setup_start_indicator_label.xml
@@ -19,14 +19,14 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <view class="com.android.inputmethod.latin.setup.SetupStartIndicatorView$LabelView"
+    <view class="org.kelar.inputmethod.latin.setup.SetupStartIndicatorView$LabelView"
         android:id="@+id/setup_start_label"
         android:text="@string/setup_start_action"
         android:gravity="end|center_vertical"
         android:layout_width="0dp"
         android:layout_weight="1.0"
         style="@style/setupStepActionLabelStyleCommon" />
-    <view class="com.android.inputmethod.latin.setup.SetupStartIndicatorView$IndicatorView"
+    <view class="org.kelar.inputmethod.latin.setup.SetupStartIndicatorView$IndicatorView"
         android:id="@+id/setup_start_indicator"
         style="@style/setupStepStartIndicatorStyle" />
 </merge>
diff --git a/java/res/layout/setup_steps_cards.xml b/java/res/layout/setup_steps_cards.xml
index 9b03a3e93..06792fae3 100644
--- a/java/res/layout/setup_steps_cards.xml
+++ b/java/res/layout/setup_steps_cards.xml
@@ -38,7 +38,7 @@
             style="@style/setupStepBulletStyle"
             android:text="@string/setup_step3_bullet" />
     </LinearLayout>
-    <com.android.inputmethod.latin.setup.SetupStepIndicatorView
+    <org.kelar.inputmethod.latin.setup.SetupStepIndicatorView
         android:id="@+id/setup_step_indicator"
         style="@style/setupStepIndicatorStyle" />
     <FrameLayout
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 01c25ea8e..c391561e3 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -51,7 +51,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp" />
     </LinearLayout>
-    <com.android.inputmethod.latin.setup.SetupStartIndicatorView
+    <org.kelar.inputmethod.latin.setup.SetupStartIndicatorView
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 </merge>