diff options
author | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:56 -0800 |
---|---|---|
committer | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:56 -0800 |
commit | ae938c20a11b6195936f97eebd32abd35335bceb (patch) | |
tree | d7dfd33f349bab895cfbbf12744c88b72cd50759 /app/src/main/res/layout/a_provider_credentials.xml | |
parent | c3d157c91ecc3a177efc4e089904684511e7710d (diff) | |
parent | 966b74e46c6723093dfb93cce64528d79441e70e (diff) |
Merge branch '8823_cw_tablet_layout' into '0.9.8'
8823 cw tablet layout
See merge request leap/bitmask_android!36
Diffstat (limited to 'app/src/main/res/layout/a_provider_credentials.xml')
-rw-r--r-- | app/src/main/res/layout/a_provider_credentials.xml | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml index 85d9d3cb..4998effa 100644 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -1,54 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="@dimen/stdpadding" style="@style/BitmaskActivity"> <include layout="@layout/loading_screen" /> - <LinearLayout - android:id="@+id/content" + <include + layout="@layout/provider_header" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="wrap_content" /> - <include - layout="@layout/provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <ScrollView + android:layout_height="match_parent" + android:layout_width="match_parent" + android:isScrollContainer="true" + > - <ScrollView - android:layout_height="match_parent" + <LinearLayout android:layout_width="match_parent" - android:isScrollContainer="true" - > - - <LinearLayout + android:layout_height="wrap_content" + android:orientation="vertical"> + <include + layout="@layout/provider_credentials" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <include - layout="@layout/provider_credentials" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <android.support.v7.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:text="@string/login_button" /> + <android.support.v7.widget.AppCompatButton + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:text="@string/login_button" /> - </RelativeLayout> - </LinearLayout> - </ScrollView> - </LinearLayout> + </LinearLayout> + </ScrollView> </LinearLayout> |