Remove close button from mini keyboard

Bug: 2959169
Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393

11 files changed, 1 insertions, 66 deletions

diff --git a/java/res/drawable-hdpi/btn_close_normal.png b/java/res/drawable-hdpi/btn_close_normal.png
deleted file mode 100644
index 38b49f1a3..000000000
--- a/java/res/drawable-hdpi/btn_close_normal.png
+++ /dev/null
diff --git a/java/res/drawable-hdpi/btn_close_pressed.png b/java/res/drawable-hdpi/btn_close_pressed.png
deleted file mode 100644
index aa9ea49f0..000000000
--- a/java/res/drawable-hdpi/btn_close_pressed.png
+++ /dev/null
diff --git a/java/res/drawable-hdpi/btn_close_selected.png b/java/res/drawable-hdpi/btn_close_selected.png
deleted file mode 100644
index 870c670f7..000000000
--- a/java/res/drawable-hdpi/btn_close_selected.png
+++ /dev/null
diff --git a/java/res/drawable-mdpi/btn_close_normal.png b/java/res/drawable-mdpi/btn_close_normal.png
deleted file mode 100644
index 4c6e79dc8..000000000
--- a/java/res/drawable-mdpi/btn_close_normal.png
+++ /dev/null
diff --git a/java/res/drawable-mdpi/btn_close_pressed.png b/java/res/drawable-mdpi/btn_close_pressed.png
deleted file mode 100644
index fc983afdc..000000000
--- a/java/res/drawable-mdpi/btn_close_pressed.png
+++ /dev/null
diff --git a/java/res/drawable-mdpi/btn_close_selected.png b/java/res/drawable-mdpi/btn_close_selected.png
deleted file mode 100644
index f2bf91a2d..000000000
--- a/java/res/drawable-mdpi/btn_close_selected.png
+++ /dev/null
diff --git a/java/res/drawable/btn_close.xml b/java/res/drawable/btn_close.xml
deleted file mode 100644
index ee5813898..000000000
--- a/java/res/drawable/btn_close.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false" android:state_focused="false"
-        android:drawable="@drawable/btn_close_normal" />
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_close_pressed" />
-
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_close_selected" />
-</selector>
diff --git a/java/res/layout/input_gingerbread_popup.xml b/java/res/layout/input_gingerbread_popup.xml
index 0f0f080b5..0cc953edf 100755
--- a/java/res/layout/input_gingerbread_popup.xml
+++ b/java/res/layout/input_gingerbread_popup.xml
@@ -36,13 +36,4 @@
             latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
             latin:popupLayout="@layout/input_gingerbread_popup"
         />
-    <ImageButton android:id="@+id/closeButton"
-        android:background="@android:color/transparent"
-        android:src="@drawable/btn_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="8dp"
-        android:clickable="true"
-        />
 </LinearLayout>
diff --git a/java/res/layout/input_stone_popup.xml b/java/res/layout/input_stone_popup.xml
index 1efa56c5e..f159625f7 100755
--- a/java/res/layout/input_stone_popup.xml
+++ b/java/res/layout/input_stone_popup.xml
@@ -38,13 +38,4 @@
             latin:shadowColor="@color/latinkeyboard_key_color_white"
             latin:popupLayout="@layout/input_stone_popup"
         />
-    <ImageButton android:id="@+id/closeButton"
-        android:background="@android:color/transparent"
-        android:src="@drawable/btn_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="8dp"
-        android:clickable="true"
-        />
 </LinearLayout>
diff --git a/java/res/layout/keyboard_popup_keyboard.xml b/java/res/layout/keyboard_popup_keyboard.xml
index 0b0046a49..6d3985065 100644
--- a/java/res/layout/keyboard_popup_keyboard.xml
+++ b/java/res/layout/keyboard_popup_keyboard.xml
@@ -36,13 +36,4 @@
             latin:keyPreviewLayout="@layout/keyboard_key_preview"
             latin:popupLayout="@layout/keyboard_popup_keyboard"
             />
-    <ImageButton android:id="@+id/closeButton"
-        android:background="@android:color/transparent"
-        android:src="@drawable/btn_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="8dp"
-        android:clickable="true"
-        />
 </LinearLayout>
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index a58c6e5d2..ab1789ffe 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -62,8 +62,7 @@ import java.util.Map;
  * @attr ref R.styleable#LatinKeyboardBaseView_verticalCorrection
  * @attr ref R.styleable#LatinKeyboardBaseView_popupLayout
  */
-public class LatinKeyboardBaseView extends View implements View.OnClickListener,
-        PointerTracker.UIProxy {
+public class LatinKeyboardBaseView extends View implements PointerTracker.UIProxy {
     private static final String TAG = "LatinKeyboardBaseView";
     private static final boolean DEBUG = false;
 
@@ -646,14 +645,6 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener,
         return mKeyDetector.isProximityCorrectionEnabled();
     }
 
-    /**
-     * Popup keyboard close button clicked.
-     * @hide
-     */
-    public void onClick(View v) {
-        dismissPopupKeyboard();
-    }
-
     protected CharSequence adjustCase(CharSequence label) {
         if (mKeyboard.isShifted() && label != null && label.length() < 3
                 && Character.isLowerCase(label.charAt(0))) {
@@ -1006,8 +997,6 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener,
                 mMiniKeyboardContainer = inflater.inflate(mPopupLayout, null);
                 mMiniKeyboard = (LatinKeyboardBaseView) mMiniKeyboardContainer.findViewById(
                        R.id.LatinKeyboardBaseView);
-                View closeButton = mMiniKeyboardContainer.findViewById(R.id.closeButton);
-                if (closeButton != null) closeButton.setOnClickListener(this);
                 mMiniKeyboard.setOnKeyboardActionListener(new OnKeyboardActionListener() {
                     public void onKey(int primaryCode, int[] keyCodes, int x, int y) {
                         mKeyboardActionListener.onKey(primaryCode, keyCodes, x, y);