diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/layout-xlarge/keyboard_popup_honeycomb.xml | 4 | ||||
-rw-r--r-- | java/res/layout/input_basic.xml | 2 | ||||
-rw-r--r-- | java/res/layout/input_basic_highcontrast.xml | 2 | ||||
-rw-r--r-- | java/res/layout/input_gingerbread.xml | 2 | ||||
-rw-r--r-- | java/res/layout/input_honeycomb.xml | 2 | ||||
-rw-r--r-- | java/res/layout/input_stone_bold.xml | 2 | ||||
-rw-r--r-- | java/res/layout/input_stone_normal.xml | 2 | ||||
-rw-r--r-- | java/res/layout/input_stone_popup.xml | 4 | ||||
-rw-r--r-- | java/res/layout/keyboard_popup.xml | 4 | ||||
-rw-r--r-- | java/res/layout/keyboard_popup_honeycomb.xml | 4 | ||||
-rw-r--r-- | java/res/values/attrs.xml | 20 | ||||
-rw-r--r-- | java/res/values/styles.xml | 2 |
12 files changed, 25 insertions, 25 deletions
diff --git a/java/res/layout-xlarge/keyboard_popup_honeycomb.xml b/java/res/layout-xlarge/keyboard_popup_honeycomb.xml index 5a91dbeb0..0b8229ca5 100644 --- a/java/res/layout-xlarge/keyboard_popup_honeycomb.xml +++ b/java/res/layout-xlarge/keyboard_popup_honeycomb.xml @@ -26,9 +26,9 @@ android:paddingLeft="40dip" android:paddingRight="40dip" > - <com.android.inputmethod.latin.BaseKeyboardView + <com.android.inputmethod.keyboard.KeyboardView xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/BaseKeyboardView" + android:id="@+id/KeyboardView" android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/java/res/layout/input_basic.xml b/java/res/layout/input_basic.xml index 168eba691..7b85bae94 100644 --- a/java/res/layout/input_basic.xml +++ b/java/res/layout/input_basic.xml @@ -18,7 +18,7 @@ */ --> -<com.android.inputmethod.latin.LatinKeyboardView +<com.android.inputmethod.keyboard.LatinKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:id="@+id/LatinkeyboardBaseView" diff --git a/java/res/layout/input_basic_highcontrast.xml b/java/res/layout/input_basic_highcontrast.xml index 19ff1db11..d9200fd5e 100644 --- a/java/res/layout/input_basic_highcontrast.xml +++ b/java/res/layout/input_basic_highcontrast.xml @@ -18,7 +18,7 @@ */ --> -<com.android.inputmethod.latin.LatinKeyboardView +<com.android.inputmethod.keyboard.LatinKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml index fe31321f1..6233e6dc6 100644 --- a/java/res/layout/input_gingerbread.xml +++ b/java/res/layout/input_gingerbread.xml @@ -18,7 +18,7 @@ */ --> -<com.android.inputmethod.latin.LatinKeyboardView +<com.android.inputmethod.keyboard.LatinKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:id="@+id/LatinkeyboardBaseView" diff --git a/java/res/layout/input_honeycomb.xml b/java/res/layout/input_honeycomb.xml index 079e70c65..b39387481 100644 --- a/java/res/layout/input_honeycomb.xml +++ b/java/res/layout/input_honeycomb.xml @@ -18,7 +18,7 @@ */ --> -<com.android.inputmethod.latin.LatinKeyboardView +<com.android.inputmethod.keyboard.LatinKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:id="@+id/LatinkeyboardBaseView" diff --git a/java/res/layout/input_stone_bold.xml b/java/res/layout/input_stone_bold.xml index 5fb439acb..bf25e1597 100644 --- a/java/res/layout/input_stone_bold.xml +++ b/java/res/layout/input_stone_bold.xml @@ -18,7 +18,7 @@ */ --> -<com.android.inputmethod.latin.LatinKeyboardView +<com.android.inputmethod.keyboard.LatinKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:id="@+id/LatinkeyboardBaseView" diff --git a/java/res/layout/input_stone_normal.xml b/java/res/layout/input_stone_normal.xml index 7a7b36894..cf4708612 100644 --- a/java/res/layout/input_stone_normal.xml +++ b/java/res/layout/input_stone_normal.xml @@ -18,7 +18,7 @@ */ --> -<com.android.inputmethod.latin.LatinKeyboardView +<com.android.inputmethod.keyboard.LatinKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:id="@+id/LatinkeyboardBaseView" diff --git a/java/res/layout/input_stone_popup.xml b/java/res/layout/input_stone_popup.xml index 3a7b5b9ab..b4da04536 100644 --- a/java/res/layout/input_stone_popup.xml +++ b/java/res/layout/input_stone_popup.xml @@ -25,9 +25,9 @@ android:orientation="horizontal" android:background="@drawable/keyboard_popup_panel_background" > - <com.android.inputmethod.latin.BaseKeyboardView + <com.android.inputmethod.keyboard.KeyboardView xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/BaseKeyboardView" + android:id="@+id/KeyboardView" android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/keyboard_popup.xml index 929e17111..ac8134bfb 100644 --- a/java/res/layout/keyboard_popup.xml +++ b/java/res/layout/keyboard_popup.xml @@ -26,9 +26,9 @@ android:paddingLeft="16dip" android:paddingRight="16dip" > - <com.android.inputmethod.latin.BaseKeyboardView + <com.android.inputmethod.keyboard.KeyboardView xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/BaseKeyboardView" + android:id="@+id/KeyboardView" android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/java/res/layout/keyboard_popup_honeycomb.xml b/java/res/layout/keyboard_popup_honeycomb.xml index 63b535381..e5fcbd44c 100644 --- a/java/res/layout/keyboard_popup_honeycomb.xml +++ b/java/res/layout/keyboard_popup_honeycomb.xml @@ -26,9 +26,9 @@ android:paddingLeft="24dip" android:paddingRight="24dip" > - <com.android.inputmethod.latin.BaseKeyboardView + <com.android.inputmethod.keyboard.KeyboardView xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/BaseKeyboardView" + android:id="@+id/KeyboardView" android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index ef7a968c9..4fc5351bf 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -16,7 +16,7 @@ <resources> - <declare-styleable name="BaseKeyboardView"> + <declare-styleable name="KeyboardView"> <!-- Default KeyboardView style. --> <attr name="keyboardViewStyle" format="reference" /> @@ -68,14 +68,14 @@ </attr> <attr name="colorScheme"> - <!-- This should be aligned with BaseKeyboardView.COLOR_SCHEME_* --> + <!-- This should be aligned with KeyboardView.COLOR_SCHEME_* --> <enum name="white" value="0" /> <enum name="black" value="1" /> </attr> </declare-styleable> - <declare-styleable name="BaseKeyboard"> + <declare-styleable name="Keyboard"> <!-- Default width of a key, in pixels or percentage of display width. --> <attr name="keyWidth" format="dimension|fraction" /> <!-- Default height of a key, in pixels or percentage of display width. --> @@ -86,7 +86,7 @@ <attr name="verticalGap" format="dimension|fraction" /> </declare-styleable> - <declare-styleable name="BaseKeyboard_Key"> + <declare-styleable name="Keyboard_Key"> <!-- The unicode value or comma-separated values that this key outputs. --> <attr name="codes" format="integer|string" /> <!-- The XML keyboard layout of any popup keyboard. --> @@ -114,7 +114,7 @@ <attr name="keyLabel" format="string" /> <!-- The key label option --> <attr name="keyLabelOption"> - <!-- This should be aligned with BaseKeyboardView.KEY_LABEL_OPTION_* --> + <!-- This should be aligned with KeyboardView.KEY_LABEL_OPTION_* --> <flag name="alignLeft" value="1" /> <flag name="alignRight" value="2" /> <flag name="alignBottom" value="8" /> @@ -135,7 +135,7 @@ <attr name="shiftedIcon" format="reference" /> </declare-styleable> - <declare-styleable name="BaseKeyboard_Row"> + <declare-styleable name="Keyboard_Row"> <!-- Row edge flags. --> <attr name="rowEdgeFlags"> <!-- Row is anchored to the top of the keyboard. --> @@ -145,12 +145,12 @@ </attr> </declare-styleable> - <declare-styleable name="BaseKeyboard_Include"> + <declare-styleable name="Keyboard_Include"> <attr name="keyboardLayout" format="reference" /> </declare-styleable> - <declare-styleable name="BaseKeyboard_Case"> - <!-- This should be aligned with KeyboardSwitcher.MODE_* --> + <declare-styleable name="Keyboard_Case"> + <!-- This should be aligned with KeyboardId.MODE_* --> <attr name="mode"> <enum name="text" value="0" /> <enum name="url" value="1" /> @@ -175,7 +175,7 @@ </attr> </declare-styleable> - <declare-styleable name="BaseKeyboard_KeyStyle"> + <declare-styleable name="Keyboard_KeyStyle"> <attr name="styleName" format="string" /> <attr name="parentStyle" format="string" /> </declare-styleable> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 02d21b43b..130714fd3 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -15,7 +15,7 @@ --> <resources> - <style name="BaseKeyboardView"> + <style name="KeyboardView"> <item name="android:background">@drawable/keyboard_background</item> <item name="keyBackground">@drawable/btn_keyboard_key</item> |