diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/drawable-hdpi/ic_cancel_black_24dp.png | bin | 0 -> 531 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_cancel_black_24dp.png | bin | 0 -> 303 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png | bin | 0 -> 603 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png | bin | 0 -> 1136 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_cancel_black_24dp.png | bin | 0 -> 1230 bytes | |||
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/defaults.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 2 |
8 files changed, 2 insertions, 3 deletions
diff --git a/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png Binary files differnew file mode 100644 index 000000000..b4a2d11a7 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_black_24dp.png Binary files differnew file mode 100644 index 000000000..7867e72cf --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_cancel_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png Binary files differnew file mode 100644 index 000000000..e6c744484 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png Binary files differnew file mode 100644 index 000000000..a5fe0e30e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_black_24dp.png Binary files differnew file mode 100644 index 000000000..5ffd8d000 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_cancel_black_24dp.png diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index efd4b76f5..41e00b4ba 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="16dp" + android:layout_marginBottom="@dimen/avatar_item_distance" android:adjustViewBounds="true" android:contentDescription="@string/account_image_description" android:maxHeight="384dp" diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 91eb210d4..9e269d271 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -87,7 +87,6 @@ <bool name="send_button_status">true</bool> <string name="quick_action">recent</string> <bool name="return_to_previous">false</bool> - <bool name="use_subject">true</bool> <bool name="display_enter_key">false</bool> <bool name="show_dynamic_tags">false</bool> <integer name="grace_period">144</integer> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index aa844dce1..6eef29072 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -63,7 +63,7 @@ <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item> <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item> - <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item> + <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item> <item name="icon_chat" type="reference">@drawable/ic_action_chat</item> <item name="icon_copy" type="reference">@drawable/ic_content_copy_grey600_24dp</item> <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> |