am 0d70ee2c
: Merge "Fix layout of standalone credential activity" into ub-mail-algol
* commit '0d70ee2cb9bc4bc1c515e69b00825972b2ced9d3': Fix layout of standalone credential activity
This commit is contained in:
commit
abf887ff22
@ -13,23 +13,20 @@
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
<LinearLayout
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
style="@style/account_setup_fragment_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical" >
|
android:layout_width="match_parent" >
|
||||||
|
<LinearLayout
|
||||||
<include
|
style="@style/account_setup_fragment_container"
|
||||||
layout="@layout/account_setup_credentials_fragment"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
|
||||||
|
<include
|
||||||
|
layout="@layout/account_setup_credentials_fragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
<FrameLayout android:id="@+id/button_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
<include layout="@layout/account_settings_buttons" />
|
<include layout="@layout/account_settings_buttons" />
|
||||||
</FrameLayout>
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
</LinearLayout>
|
|
||||||
|
Loading…
Reference in New Issue
Block a user