diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-01 14:11:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-01 14:11:04 +0200 |
| commit | 87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1 (patch) | |
| tree | 5729a1839fbd0e0ae5e161a8804145ed02aa2b64 /OpenKeychain | |
| parent | 19c9fcc2c95b441133d3dffec9b5f71621fb2162 (diff) | |
| download | open-keychain-87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1.tar.gz open-keychain-87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1.tar.bz2 open-keychain-87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1.zip | |
linked: fix back button in github dialog
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml | 26 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml | 1 |
2 files changed, 26 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml index 0dd8c02f8..276aaff54 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml @@ -159,6 +159,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -178,7 +179,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@string/btn_cancel" + android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:textAllCaps="true" style="?android:attr/borderlessButtonStyle" @@ -188,6 +189,29 @@ android:clickable="true" android:layout_gravity="center_vertical" /> + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:background="?android:attr/listDivider" /> + + <TextView + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_finish" + android:minHeight="?android:attr/listPreferredItemHeight" + android:textAllCaps="true" + android:drawableRight="@drawable/ic_person_add_grey_24dp" + android:drawablePadding="8dp" + style="?android:attr/borderlessButtonStyle" + android:gravity="center_vertical|right" + android:layout_gravity="center_vertical" + android:visibility="invisible" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml index 81844e739..39e32b629 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml @@ -149,4 +149,5 @@ android:gravity="center_vertical|right" android:layout_gravity="center_vertical" /> </LinearLayout> + </RelativeLayout>
\ No newline at end of file |