diff options
| -rw-r--r-- | res/layout-land/act_console.xml | 120 | ||||
| -rw-r--r-- | res/layout/act_console.xml (renamed from res/layout-port/act_console.xml) | 30 |
2 files changed, 14 insertions, 136 deletions
diff --git a/res/layout-land/act_console.xml b/res/layout-land/act_console.xml deleted file mode 100644 index d471718..0000000 --- a/res/layout-land/act_console.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ConnectBot: simple, powerful, open-source SSH client for Android - Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="#ff000000" - > - - <TextView - android:id="@android:id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:text="No hosts currently connected" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center" - /> - - <ViewFlipper - android:id="@+id/console_flip" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - /> - - <RelativeLayout - android:id="@+id/console_password_group" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignParentBottom="true" - android:padding="5dip" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" - android:visibility="gone" - > - - <TextView - android:id="@+id/console_password_hint" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="fill_parent" - android:layout_above="@+id/console_password" - /> - - <EditText - android:id="@+id/console_password" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:password="true" - android:singleLine="true" - android:layout_alignParentBottom="true" - /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/console_boolean_group" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignParentBottom="true" - android:padding="5dip" - android:background="#88000000" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" - android:visibility="gone" - > - - <Button - android:id="@+id/console_prompt_no" - android:text="No" - android:paddingTop="5dip" - android:paddingBottom="10dip" - android:paddingLeft="40dip" - android:paddingRight="40dip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:clickable="false" - android:layout_alignParentBottom="true" - /> - - <Button - android:id="@+id/console_prompt_yes" - android:text="Yes" - android:paddingTop="5dip" - android:paddingBottom="10dip" - android:paddingLeft="40dip" - android:paddingRight="40dip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@+id/console_prompt_no" - android:layout_alignParentBottom="true" - /> - - <TextView - android:id="@+id/console_prompt" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_toLeftOf="@+id/console_prompt_yes" - android:layout_width="fill_parent" - android:layout_alignParentBottom="true" - /> - - </RelativeLayout> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-port/act_console.xml b/res/layout/act_console.xml index fa9996d..34d7459 100644 --- a/res/layout-port/act_console.xml +++ b/res/layout/act_console.xml @@ -40,11 +40,10 @@ <RelativeLayout android:id="@+id/console_password_group" android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:padding="5dip" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" + android:background="#80000000" android:visibility="gone" > @@ -53,7 +52,7 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="fill_parent" - android:layout_above="@+id/console_password" + android:visibility="gone" /> <EditText @@ -62,7 +61,7 @@ android:layout_height="wrap_content" android:password="true" android:singleLine="true" - android:layout_alignParentBottom="true" + android:layout_below="@+id/console_password_hint" /> </RelativeLayout> @@ -70,7 +69,7 @@ <RelativeLayout android:id="@+id/console_boolean_group" android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:padding="5dip" android:background="#88000000" @@ -79,6 +78,13 @@ android:visibility="gone" > + <TextView + android:id="@+id/console_prompt" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="fill_parent" + /> + <Button android:id="@+id/console_prompt_no" android:text="No" @@ -89,8 +95,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" + android:layout_below="@+id/console_prompt" android:clickable="false" - android:layout_alignParentBottom="true" /> <Button @@ -103,15 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@+id/console_prompt_no" - android:layout_alignParentBottom="true" - /> - - <TextView - android:id="@+id/console_prompt" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="fill_parent" - android:layout_above="@+id/console_prompt_no" + android:layout_below="@+id/console_prompt" /> </RelativeLayout> |