Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155c427e authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Bug 5126088 - update layout for activate device policy activity"

parents 2d53e1a5 a70e1468

res/layout/device_admin_add.xml

+7 −10
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1.0"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        android:scrollbarStyle="outsideOverlay"

        android:gravity="top">

        <LinearLayout

            android:layout_width="match_parent"
@@ -36,12 +37,12 @@ 
            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal">

                android:orientation="horizontal"

                android:layout_marginTop="16dip">

                <ImageView android:id="@+id/admin_icon"

                    android:layout_width="@android:dimen/app_icon_size"

                    android:layout_height="@android:dimen/app_icon_size"

                    android:layout_marginLeft="5dip"

                    android:layout_marginRight="11dip"

                    android:layout_marginRight="16dip"

                    android:layout_gravity="center_vertical"

                    android:scaleType="fitCenter"/>

                <TextView android:id="@+id/admin_name"
@@ -101,18 +102,14 @@ 
    <LinearLayout android:id="@+id/buttonPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="54dip"

        android:orientation="vertical"

        android:divider="?android:attr/dividerHorizontal"

        android:showDividers="beginning"

        android:dividerPadding="16dip">

        android:showDividers="beginning">

        <LinearLayout

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingLeft="2dip"

            android:paddingRight="2dip"

            android:measureWithLargestChild="true">

            <LinearLayout android:id="@+id/leftSpacer"

                android:layout_weight="0.25"