Merge "Change the default value of keyTextSize for xlarge"
commit
b851e406c0
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
@ -20,17 +20,17 @@
|
|||
|
||||
<item android:state_checkable="true" android:state_checked="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_on_ginger" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_on_stone" />
|
||||
<item android:state_checkable="true" android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_off_ginger" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_off_stone" />
|
||||
<item android:state_checkable="true" android:state_checked="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_on_ginger" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_on_stone" />
|
||||
<item android:state_checkable="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_off_ginger" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_off_stone" />
|
||||
|
||||
<!-- Normal keys -->
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
|
||||
<item android:drawable="@drawable/btn_keyboard_key_normal_ginger" />
|
||||
<item android:drawable="@drawable/btn_keyboard_key_normal_stone" />
|
||||
</selector>
|
|
@ -1,31 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 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.
|
||||
*/
|
||||
-->
|
||||
|
||||
<com.android.inputmethod.latin.LatinKeyboardView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@android:id/keyboardView"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/keyboard_background"
|
||||
android:keyBackground="@drawable/btn_keyboard_key"
|
||||
android:keyTextSize="32sp"
|
||||
android:verticalCorrection="0dip"
|
||||
/>
|
|
@ -1,31 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 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.
|
||||
*/
|
||||
-->
|
||||
|
||||
<com.android.inputmethod.latin.LatinKeyboardView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@android:id/keyboardView"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/latinkeyboard_extension_background"
|
||||
android:verticalCorrection="0dip"
|
||||
android:keyTextSize="32sp"
|
||||
android:keyBackground="@drawable/btn_keyboard_key_fulltrans"
|
||||
/>
|
|
@ -28,8 +28,7 @@
|
|||
android:background="@drawable/keyboard_background"
|
||||
android:textStyle="bold"
|
||||
|
||||
latin:keyBackground="@drawable/btn_keyboard_key_ginger"
|
||||
latin:keyTextSize="22dip"
|
||||
latin:keyBackground="@drawable/btn_keyboard_key_stone"
|
||||
latin:keyTextColor="@color/latinkeyboard_key_color_black"
|
||||
latin:shadowColor="@color/latinkeyboard_key_color_white"
|
||||
latin:keyTextStyle="bold"
|
||||
|
|
|
@ -27,8 +27,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/keyboard_background"
|
||||
|
||||
latin:keyBackground="@drawable/btn_keyboard_key_ginger"
|
||||
latin:keyTextSize="22dip"
|
||||
latin:keyBackground="@drawable/btn_keyboard_key_stone"
|
||||
latin:keyTextColor="@color/latinkeyboard_key_color_black"
|
||||
latin:shadowColor="@color/latinkeyboard_key_color_white"
|
||||
latin:symbolColorScheme="black"
|
||||
|
|
|
@ -33,10 +33,9 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/keyboard_background"
|
||||
|
||||
latin:keyBackground="@drawable/btn_keyboard_key_ginger"
|
||||
latin:keyBackground="@drawable/btn_keyboard_key_stone"
|
||||
latin:keyTextColor="@color/latinkeyboard_key_color_black"
|
||||
latin:shadowColor="@color/latinkeyboard_key_color_white"
|
||||
latin:keyTextSize="22dip"
|
||||
latin:popupLayout="@layout/input_stone_popup"
|
||||
/>
|
||||
<ImageButton android:id="@+id/closeButton"
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
android:background="@android:color/transparent"
|
||||
|
||||
latin:keyPreviewLayout="@layout/keyboard_key_preview"
|
||||
latin:keyTextSize="22sp"
|
||||
latin:popupLayout="@layout/keyboard_popup_keyboard"
|
||||
/>
|
||||
<ImageButton android:id="@+id/closeButton"
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
<?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.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<style name="LatinKeyboardBaseView">
|
||||
<item name="android:background">@drawable/keyboard_background</item>
|
||||
|
||||
<item name="keyBackground">@drawable/btn_keyboard_key</item>
|
||||
<item name="keyTextSize">32sp</item>
|
||||
<item name="keyTextColor">#FFFFFFFF</item>
|
||||
<item name="keyPreviewLayout">@layout/keyboard_key_preview</item>
|
||||
<item name="keyPreviewOffset">-12dip</item>
|
||||
<item name="keyPreviewHeight">80dip</item>
|
||||
<item name="labelTextSize">14sp</item>
|
||||
<item name="popupLayout">@layout/keyboard_popup_keyboard</item>
|
||||
<item name="verticalCorrection">-10dip</item>
|
||||
<item name="shadowColor">#BB000000</item>
|
||||
<item name="shadowRadius">2.75</item>
|
||||
<item name="backgroundDimAmount">0.5</item>
|
||||
<item name="symbolColorScheme">white</item>
|
||||
</style>
|
||||
</resources>
|
Loading…
Reference in New Issue