diff options
| author | Jeremy Klein <jlklein@google.com> | 2015-10-05 18:34:51 -0700 |
|---|---|---|
| committer | Jeremy Klein <jlklein@google.com> | 2015-10-06 13:02:43 -0700 |
| commit | 531add53ae61b1ebf39a101919906f9913e5ec03 (patch) | |
| tree | 21ae143edfa51e7e3663f5f93086f5a337c1c2a4 /app/src/main/res/layout | |
| parent | 505d8fdab97829cbd87dbcf476e029a44d886a90 (diff) | |
| download | connectbot-531add53ae61b1ebf39a101919906f9913e5ec03.tar.gz connectbot-531add53ae61b1ebf39a101919906f9913e5ec03.tar.bz2 connectbot-531add53ae61b1ebf39a101919906f9913e5ec03.zip | |
Lint fixes.
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/act_hints.xml | 329 | ||||
| -rw-r--r-- | app/src/main/res/layout/dia_keyboard_shortcuts.xml | 6 |
2 files changed, 164 insertions, 171 deletions
diff --git a/app/src/main/res/layout/act_hints.xml b/app/src/main/res/layout/act_hints.xml index 69475d9..2e45c37 100644 --- a/app/src/main/res/layout/act_hints.xml +++ b/app/src/main/res/layout/act_hints.xml @@ -15,182 +15,175 @@ ~ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" tools:context="org.connectbot.HintsActivity"> - <ScrollView + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="10dip" > - <LinearLayout + <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="10dip" - > - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/host_shortcuts_header" - android:textAppearance="?android:attr/textAppearanceLarge" - android:layout_marginTop="10dp"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/host_shortcuts_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/scroll_hints_header" - android:textAppearance="?android:attr/textAppearanceLarge" - android:layout_marginTop="10dp"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/scroll_hints_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/gesture_scrollback" - android:contentDescription="@string/scrolling_back" - android:layout_marginTop="10dp" - android:layout_gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/scrolling_back" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginBottom="5dp" - android:gravity="center_horizontal"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/gesture_scrollforward" - android:contentDescription="@string/scrolling_forward" - android:layout_marginTop="10dp" - android:layout_gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/scrolling_forward" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginBottom="5dp" - android:gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/page_updn_header" - android:textAppearance="?android:attr/textAppearanceLarge" - android:layout_marginTop="10dp"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/page_updn_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/gesture_pgup" - android:contentDescription="@string/page_up" - android:layout_marginTop="10dp" - android:layout_gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/page_up" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginBottom="5dp" - android:gravity="center_horizontal"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/gesture_pgdn" - android:contentDescription="@string/page_down" - android:layout_marginTop="10dp" - android:layout_gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/page_down" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginBottom="5dp" - android:gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/switching_hosts_header" - android:textAppearance="?android:attr/textAppearanceLarge" - android:layout_marginTop="10dp"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/switching_hosts_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/gesture_hostprev" - android:contentDescription="@string/prev_host" - android:layout_marginTop="10dp" - android:layout_gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/prev_host" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginBottom="5dp" - android:gravity="center_horizontal"/> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/gesture_hostnext" - android:contentDescription="@string/next_host" - android:layout_marginTop="10dp" - android:layout_gravity="center_horizontal"/> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/next_host" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginBottom="5dp" - android:gravity="center_horizontal"/> - - </LinearLayout> - - </ScrollView> - -</RelativeLayout> + android:text="@string/host_shortcuts_header" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_marginTop="10dp"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/host_shortcuts_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/scroll_hints_header" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_marginTop="10dp"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/scroll_hints_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gesture_scrollback" + android:contentDescription="@string/scrolling_back" + android:layout_marginTop="10dp" + android:layout_gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/scrolling_back" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginBottom="5dp" + android:gravity="center_horizontal"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gesture_scrollforward" + android:contentDescription="@string/scrolling_forward" + android:layout_marginTop="10dp" + android:layout_gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/scrolling_forward" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginBottom="5dp" + android:gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/page_updn_header" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_marginTop="10dp"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/page_updn_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gesture_pgup" + android:contentDescription="@string/page_up" + android:layout_marginTop="10dp" + android:layout_gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/page_up" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginBottom="5dp" + android:gravity="center_horizontal"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gesture_pgdn" + android:contentDescription="@string/page_down" + android:layout_marginTop="10dp" + android:layout_gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/page_down" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginBottom="5dp" + android:gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/switching_hosts_header" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_marginTop="10dp"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/switching_hosts_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gesture_hostprev" + android:contentDescription="@string/prev_host" + android:layout_marginTop="10dp" + android:layout_gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/prev_host" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginBottom="5dp" + android:gravity="center_horizontal"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gesture_hostnext" + android:contentDescription="@string/next_host" + android:layout_marginTop="10dp" + android:layout_gravity="center_horizontal"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/next_host" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginBottom="5dp" + android:gravity="center_horizontal"/> + + </LinearLayout> + +</ScrollView> diff --git a/app/src/main/res/layout/dia_keyboard_shortcuts.xml b/app/src/main/res/layout/dia_keyboard_shortcuts.xml index b6fb589..fca66b2 100644 --- a/app/src/main/res/layout/dia_keyboard_shortcuts.xml +++ b/app/src/main/res/layout/dia_keyboard_shortcuts.xml @@ -30,7 +30,7 @@ android:stretchColumns="1"> <TableRow> <TextView - android:text="Ctrl-Shift-V" + android:text="@string/paste_shortcut" android:padding="3dip" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -45,7 +45,7 @@ <TableRow> <TextView - android:text="Ctrl and +" + android:text="@string/increase_font_shortcut" android:padding="3dip" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -60,7 +60,7 @@ <TableRow> <TextView - android:text="Ctrl and -" + android:text="@string/decrease_font_shortcut" android:padding="3dip" android:textAppearance="?android:attr/textAppearanceMedium" /> |