diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-17 20:16:58 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-17 20:16:58 +0100 |
| commit | 7a04dfe6bfc6bdfdbe75aebeef321464b87db155 (patch) | |
| tree | 8562e9a7267e84ed9a46526769aecbfd81fcd334 /OpenPGP-Keychain | |
| parent | 2e3d0d444180ef7217e6e960d2092e4f3de4c198 (diff) | |
| download | open-keychain-7a04dfe6bfc6bdfdbe75aebeef321464b87db155.tar.gz open-keychain-7a04dfe6bfc6bdfdbe75aebeef321464b87db155.tar.bz2 open-keychain-7a04dfe6bfc6bdfdbe75aebeef321464b87db155.zip | |
prevent key view from scrolling, move encrypt button down again
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml index 3cbea3e9b..9a2b768a2 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml @@ -3,9 +3,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp"> @@ -82,23 +86,6 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginTop="14dp" - android:text="@string/section_actions" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/key_view_action_encrypt" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" android:text="@string/section_master_key" /> <TableLayout @@ -217,6 +204,23 @@ android:layout_height="wrap_content" android:layout_marginBottom="14dp" /> + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_actions" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/key_view_action_encrypt" + bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_type="info" /> + </LinearLayout> </ScrollView>
\ No newline at end of file |