mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-12 09:37:58 +01:00
Merge remote-tracking branch 'ratatoskr-org/sc' into sc
Change-Id: Ic2a0c968c1ab484fbf3fbd9effabf5a94fa1032d
This commit is contained in:
commit
e48fdcae8e
@ -2,6 +2,7 @@
|
|||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<item android:drawable="@drawable/bg_login_server_checked" android:state_checked="true" />
|
<item android:drawable="@drawable/bg_login_server_checked" android:state_checked="true" />
|
||||||
|
<item android:drawable="@drawable/bg_login_server_checked" android:state_focused="true" />
|
||||||
<item android:drawable="@drawable/bg_login_server_checked" android:state_pressed="true" />
|
<item android:drawable="@drawable/bg_login_server_checked" android:state_pressed="true" />
|
||||||
|
|
||||||
<item android:drawable="@drawable/bg_login_server" />
|
<item android:drawable="@drawable/bg_login_server" />
|
||||||
|
@ -52,6 +52,8 @@
|
|||||||
android:layout_marginTop="24dp"
|
android:layout_marginTop="24dp"
|
||||||
android:background="@drawable/bg_login_server_selector"
|
android:background="@drawable/bg_login_server_selector"
|
||||||
android:contentDescription="@string/login_a11y_connect_using_matrix_id_sc"
|
android:contentDescription="@string/login_a11y_connect_using_matrix_id_sc"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
android:minHeight="80dp"
|
android:minHeight="80dp"
|
||||||
android:paddingStart="@dimen/layout_horizontal_margin"
|
android:paddingStart="@dimen/layout_horizontal_margin"
|
||||||
android:paddingEnd="@dimen/layout_horizontal_margin"
|
android:paddingEnd="@dimen/layout_horizontal_margin"
|
||||||
@ -95,6 +97,8 @@
|
|||||||
android:layout_marginTop="@dimen/layout_vertical_margin"
|
android:layout_marginTop="@dimen/layout_vertical_margin"
|
||||||
android:background="@drawable/bg_login_server_selector"
|
android:background="@drawable/bg_login_server_selector"
|
||||||
android:contentDescription="@string/login_a11y_choose_other_sc"
|
android:contentDescription="@string/login_a11y_choose_other_sc"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
android:minHeight="80dp"
|
android:minHeight="80dp"
|
||||||
android:paddingStart="@dimen/layout_horizontal_margin"
|
android:paddingStart="@dimen/layout_horizontal_margin"
|
||||||
android:paddingEnd="@dimen/layout_horizontal_margin"
|
android:paddingEnd="@dimen/layout_horizontal_margin"
|
||||||
@ -138,6 +142,8 @@
|
|||||||
android:layout_marginTop="@dimen/layout_vertical_margin"
|
android:layout_marginTop="@dimen/layout_vertical_margin"
|
||||||
android:background="@drawable/bg_login_server_selector"
|
android:background="@drawable/bg_login_server_selector"
|
||||||
android:contentDescription="@string/login_a11y_choose_matrix_org"
|
android:contentDescription="@string/login_a11y_choose_matrix_org"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
android:minHeight="80dp"
|
android:minHeight="80dp"
|
||||||
android:paddingStart="@dimen/layout_horizontal_margin"
|
android:paddingStart="@dimen/layout_horizontal_margin"
|
||||||
android:paddingEnd="@dimen/layout_horizontal_margin"
|
android:paddingEnd="@dimen/layout_horizontal_margin"
|
||||||
|
Loading…
Reference in New Issue
Block a user