diff options
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/res/layout-large/act_console.xml | 98 | ||||
-rw-r--r-- | app/src/main/res/layout/act_console.xml | 248 |
2 files changed, 169 insertions, 177 deletions
diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml index 110b4bf..1f8c51f 100644 --- a/app/src/main/res/layout-large/act_console.xml +++ b/app/src/main/res/layout-large/act_console.xml @@ -164,182 +164,178 @@ android:id="@+id/button_ctrl" style="@style/KeyboardButton" android:contentDescription="@string/image_description_toggle_control_character" - android:text="@string/button_key_ctrl" /> + android:text="@string/button_key_ctrl"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_esc" style="@style/KeyboardButton" android:contentDescription="@string/image_description_send_escape_character" - android:text="Esc" /> + android:text="@string/button_key_esc"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_tab" style="@style/KeyboardButton" android:contentDescription="@string/image_description_send_tab_character" + android:text="@string/button_key_tab"/> - android:text="Tab" /> - - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_up" style="@style/KeyboardButton" android:contentDescription="@string/image_description_up" + android:text="@string/button_key_up"/> - android:text="@string/button_key_up" /> - - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_down" style="@style/KeyboardButton" android:contentDescription="@string/image_description_down" - android:text="@string/button_key_down" /> + android:text="@string/button_key_down"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_left" style="@style/KeyboardButton" android:contentDescription="@string/image_description_left" - android:text="@string/button_key_left" /> + android:text="@string/button_key_left"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_right" style="@style/KeyboardButton" android:contentDescription="@string/image_description_right" - android:text="@string/button_key_right" /> + android:text="@string/button_key_right"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_home" style="@style/KeyboardButton" - android:text="@string/button_key_home" /> + android:text="@string/button_key_home"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_end" style="@style/KeyboardButton" - android:text="@string/button_key_end" /> + android:text="@string/button_key_end"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_pgup" style="@style/KeyboardButton" - android:text="@string/button_key_pgup" /> + android:text="@string/button_key_pgup"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_pgdn" style="@style/KeyboardButton" - android:text="@string/button_key_pgdn" /> + android:text="@string/button_key_pgdn"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f1" style="@style/KeyboardButton" - android:text="@string/button_key_f1" - - /> + android:text="@string/button_key_f1"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f2" style="@style/KeyboardButton" - android:text="@string/button_key_f2" /> + android:text="@string/button_key_f2"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f3" style="@style/KeyboardButton" - android:text="@string/button_key_f3" /> + android:text="@string/button_key_f3"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f4" style="@style/KeyboardButton" - android:text="@string/button_key_f4" /> + android:text="@string/button_key_f4"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f5" style="@style/KeyboardButton" - android:text="@string/button_key_f5" /> + android:text="@string/button_key_f5"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f6" style="@style/KeyboardButton" - android:text="@string/button_key_f6" /> + android:text="@string/button_key_f6"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f7" style="@style/KeyboardButton" - android:text="@string/button_key_f7" /> + android:text="@string/button_key_f7"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f8" style="@style/KeyboardButton" - android:text="@string/button_key_f8" /> + android:text="@string/button_key_f8"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f9" style="@style/KeyboardButton" - android:text="@string/button_key_f9" /> + android:text="@string/button_key_f9"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f10" style="@style/KeyboardButton" - android:text="@string/button_key_f10" /> + android:text="@string/button_key_f10"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f11" style="@style/KeyboardButton" - android:text="@string/button_key_f11" /> + android:text="@string/button_key_f11"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button android:id="@+id/button_f12" style="@style/KeyboardButton" - android:text="@string/button_key_f12" /> + android:text="@string/button_key_f12"/> </LinearLayout> </HorizontalScrollView> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <ImageView android:id="@+id/button_keyboard" style="@style/KeyboardKey" android:background="#55b0b0f0" android:contentDescription="@string/image_description_show_keyboard" - android:src="@drawable/button_keyboard" /> + android:src="@drawable/button_keyboard"/> </LinearLayout> </RelativeLayout> diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml index c268d51..a734882 100644 --- a/app/src/main/res/layout/act_console.xml +++ b/app/src/main/res/layout/act_console.xml @@ -121,209 +121,205 @@ </RelativeLayout> <LinearLayout - android:id="@+id/keyboard_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="#55000000" - android:orientation="horizontal" - android:padding="0dip" - android:visibility="gone"> + android:id="@+id/keyboard_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:background="#55000000" + android:orientation="horizontal" + android:padding="0dip" + android:visibility="gone"> <HorizontalScrollView - android:id="@+id/keyboard_hscroll" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:padding="0dp" - android:scrollbars="none"> - - <LinearLayout + android:id="@+id/keyboard_hscroll" android:layout_width="0dp" android:layout_height="match_parent" - android:orientation="horizontal" - android:padding="0dp"> + android:layout_weight="1" + android:padding="0dp" + android:scrollbars="none"> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:orientation="horizontal" + android:padding="0dp"> <Button - android:id="@+id/button_ctrl" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_toggle_control_character" - android:text="@string/button_key_ctrl" /> + android:id="@+id/button_ctrl" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_toggle_control_character" + android:text="@string/button_key_ctrl"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_esc" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_send_escape_character" - android:text="Esc" /> + android:id="@+id/button_esc" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_send_escape_character" + android:text="@string/button_key_esc"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_tab" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_send_tab_character" + android:id="@+id/button_tab" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_send_tab_character" + android:text="@string/button_key_tab"/> - android:text="Tab" /> - - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_up" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_up" - - android:text="@string/button_key_up" /> + android:id="@+id/button_up" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_up" + android:text="@string/button_key_up"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_down" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_down" - android:text="@string/button_key_down" /> + android:id="@+id/button_down" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_down" + android:text="@string/button_key_down"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_left" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_left" - android:text="@string/button_key_left" /> + android:id="@+id/button_left" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_left" + android:text="@string/button_key_left"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_right" - style="@style/KeyboardButton" - android:contentDescription="@string/image_description_right" - android:text="@string/button_key_right" /> + android:id="@+id/button_right" + style="@style/KeyboardButton" + android:contentDescription="@string/image_description_right" + android:text="@string/button_key_right"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_home" - style="@style/KeyboardButton" - android:text="@string/button_key_home" /> + android:id="@+id/button_home" + style="@style/KeyboardButton" + android:text="@string/button_key_home"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_end" - style="@style/KeyboardButton" - android:text="@string/button_key_end" /> + android:id="@+id/button_end" + style="@style/KeyboardButton" + android:text="@string/button_key_end"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_pgup" - style="@style/KeyboardButton" - android:text="@string/button_key_pgup" /> + android:id="@+id/button_pgup" + style="@style/KeyboardButton" + android:text="@string/button_key_pgup"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_pgdn" - style="@style/KeyboardButton" - android:text="@string/button_key_pgdn" /> + android:id="@+id/button_pgdn" + style="@style/KeyboardButton" + android:text="@string/button_key_pgdn"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f1" - style="@style/KeyboardButton" - android:text="@string/button_key_f1" - - /> + android:id="@+id/button_f1" + style="@style/KeyboardButton" + android:text="@string/button_key_f1"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f2" - style="@style/KeyboardButton" - android:text="@string/button_key_f2" /> + android:id="@+id/button_f2" + style="@style/KeyboardButton" + android:text="@string/button_key_f2"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f3" - style="@style/KeyboardButton" - android:text="@string/button_key_f3" /> + android:id="@+id/button_f3" + style="@style/KeyboardButton" + android:text="@string/button_key_f3"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f4" - style="@style/KeyboardButton" - android:text="@string/button_key_f4" /> + android:id="@+id/button_f4" + style="@style/KeyboardButton" + android:text="@string/button_key_f4"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f5" - style="@style/KeyboardButton" - android:text="@string/button_key_f5" /> + android:id="@+id/button_f5" + style="@style/KeyboardButton" + android:text="@string/button_key_f5"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f6" - style="@style/KeyboardButton" - android:text="@string/button_key_f6" /> + android:id="@+id/button_f6" + style="@style/KeyboardButton" + android:text="@string/button_key_f6"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f7" - style="@style/KeyboardButton" - android:text="@string/button_key_f7" /> + android:id="@+id/button_f7" + style="@style/KeyboardButton" + android:text="@string/button_key_f7"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f8" - style="@style/KeyboardButton" - android:text="@string/button_key_f8" /> + android:id="@+id/button_f8" + style="@style/KeyboardButton" + android:text="@string/button_key_f8"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f9" - style="@style/KeyboardButton" - android:text="@string/button_key_f9" /> + android:id="@+id/button_f9" + style="@style/KeyboardButton" + android:text="@string/button_key_f9"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f10" - style="@style/KeyboardButton" - android:text="@string/button_key_f10" /> + android:id="@+id/button_f10" + style="@style/KeyboardButton" + android:text="@string/button_key_f10"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f11" - style="@style/KeyboardButton" - android:text="@string/button_key_f11" /> + android:id="@+id/button_f11" + style="@style/KeyboardButton" + android:text="@string/button_key_f11"/> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <Button - android:id="@+id/button_f12" - style="@style/KeyboardButton" - android:text="@string/button_key_f12" /> + android:id="@+id/button_f12" + style="@style/KeyboardButton" + android:text="@string/button_key_f12"/> </LinearLayout> </HorizontalScrollView> - <View style="@style/KeyboardSeparator" /> + <View style="@style/KeyboardSeparator"/> <ImageView - android:id="@+id/button_keyboard" - style="@style/KeyboardKey" - android:background="#55b0b0f0" - android:contentDescription="@string/image_description_show_keyboard" - android:src="@drawable/button_keyboard" /> + android:id="@+id/button_keyboard" + style="@style/KeyboardKey" + android:background="#55b0b0f0" + android:contentDescription="@string/image_description_show_keyboard" + android:src="@drawable/button_keyboard"/> </LinearLayout> |