diff options
Diffstat (limited to 'src/main/res/layout/activity_trust_keys.xml')
-rw-r--r-- | src/main/res/layout/activity_trust_keys.xml | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 7b6ee2fda..fb00f6611 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -26,10 +26,12 @@ android:id="@+id/key_error_message_card" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:visibility="gone" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -76,8 +78,8 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="right"> + android:layout_gravity="end" + android:gravity="end"> <Button android:id="@+id/disable_button" @@ -85,7 +87,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="0dp" + android:paddingStart="16dp" android:paddingLeft="16dp" + android:paddingEnd="16dp" android:paddingRight="16dp" android:text="@string/disable_encryption" android:textColor="@color/accent" /> @@ -98,10 +102,12 @@ android:id="@+id/own_keys_card" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:visibility="gone" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -143,11 +149,11 @@ android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentStart="true"> + android:layout_alignParentBottom="true"> <Button android:id="@+id/cancel_button" @@ -160,8 +166,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" android:background="?attr/divider" /> <Button |