am fe72f135: Remove close button from mini keyboard
Merge commit 'fe72f135b855cbbebe2c1a00650a58736370693c' into gingerbread-plus-aosp * commit 'fe72f135b855cbbebe2c1a00650a58736370693c': Remove close button from mini keyboardmain
commit
20052f34f9
Binary file not shown.
Before Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.7 KiB |
|
@ -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>
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue