diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-08 15:45:24 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-08 15:45:24 -0300 |
| commit | ed81bda75445b88337e6d52792a507efc8415661 (patch) | |
| tree | 94f1ddcb51dff3e544252358331d169a58fc6d45 /android | |
| parent | 9196de73e9680b25a8a478f324f9f0f4a3df9c0d (diff) | |
| parent | 562b64a228b4850bd46919fbf30bacc0e75b0d62 (diff) | |
| download | mullvadvpn-ed81bda75445b88337e6d52792a507efc8415661.tar.xz mullvadvpn-ed81bda75445b88337e6d52792a507efc8415661.zip | |
Merge branch 'push-account-screen-buttons-down'
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/res/layout/account.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index 87cea450b4..1437611f06 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -29,8 +29,8 @@ </FrameLayout> <net.mullvad.mullvadvpn.ui.widget.ListenableScrollView android:id="@+id/scroll_area" android:layout_width="match_parent" - android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:fillViewport="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="2dp" @@ -59,6 +59,9 @@ android:paddingVertical="@dimen/half_vertical_space" mullvad:description="@string/paid_until" mullvad:whenMissing="hide" /> + <Space android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> <include layout="@layout/payment_buttons" /> <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/logout" android:layout_width="match_parent" |