diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-03 16:55:24 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-04 11:54:35 +0000 |
| commit | 6e985d41d7210260b926a3e220ee4e7aae114b1f (patch) | |
| tree | 40e761eb8fb83276aa38308bcc7fc23e8a6344d2 | |
| parent | 1ebfc92c1bf539264ea3d320acc87c24a0c41dfc (diff) | |
| download | mullvadvpn-6e985d41d7210260b926a3e220ee4e7aae114b1f.tar.xz mullvadvpn-6e985d41d7210260b926a3e220ee4e7aae114b1f.zip | |
Move history into `AccountLogin` widget
| -rw-r--r-- | android/src/main/res/layout/account_login.xml | 8 | ||||
| -rw-r--r-- | android/src/main/res/layout/login.xml | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/android/src/main/res/layout/account_login.xml b/android/src/main/res/layout/account_login.xml index ca00822354..7798620057 100644 --- a/android/src/main/res/layout/account_login.xml +++ b/android/src/main/res/layout/account_login.xml @@ -9,4 +9,12 @@ android:layout_alignParentTop="true" android:orientation="horizontal" /> </net.mullvad.mullvadvpn.ui.widget.AccountLoginBorder> + <ListView android:id="@+id/account_history_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/account_input_container" + android:divider="@drawable/account_history_list_divider" + android:dividerHeight="1dp" + android:visibility="invisible" + android:background="@drawable/account_history_background" /> </merge> diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index c1224e1d9c..4510d0c627 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -67,13 +67,6 @@ <net.mullvad.mullvadvpn.ui.widget.AccountLogin android:id="@+id/account_login" android:layout_width="match_parent" android:layout_height="wrap_content" /> - <ListView android:id="@+id/account_history_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:divider="@drawable/account_history_list_divider" - android:dividerHeight="1dp" - android:visibility="invisible" - android:background="@drawable/account_history_background" /> <Space android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="3" /> |