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

Commit 5811ac6b authored by Robert Horvath's avatar Robert Horvath Committed by Android (Google) Code Review
Browse files

Merge "Move buttons out of LogAccessDialog ScrollView" into main

parents 86b6e303 1ac053a0

packages/SystemUI/res/layout/log_access_user_consent_dialog_permission.xml

+49 −47
Original line number Diff line number Diff line
@@ -16,20 +16,27 @@ 
** limitations under the License.

*/

-->

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="380dp"

    android:layout_height="match_parent"

        android:clipToPadding="false">

    android:clipToPadding="false"

    android:orientation="vertical">



    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:gravity="center"

            android:paddingLeft="24dp"

            android:paddingRight="24dp"

            android:paddingTop="24dp"

            android:paddingBottom="24dp">

            android:paddingBottom="24dp"

            android:gravity="center">



            <ImageView

                android:id="@+id/log_access_image_view"
@@ -60,16 +67,18 @@ 
                android:textAppearance="@style/PrimaryAllowLogAccess"

                android:textColor="?android:attr/textColorPrimary"

                android:gravity="center" />



        <Space

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1" />

        </LinearLayout>

    </ScrollView>



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

                android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:paddingLeft="24dp"

        android:paddingRight="24dp"

        android:paddingTop="24dp"

        android:paddingBottom="24dp">



        <Button

            android:id="@+id/log_access_dialog_allow_button"

            android:layout_width="match_parent"
@@ -78,9 +87,6 @@ 
            style="?permissionGrantButtonTopStyle"

            android:textAppearance="@style/PermissionGrantButtonTextAppearance"

            android:layout_marginBottom="5dp"

                    android:layout_centerHorizontal="true"

                    android:layout_alignParentTop="true"

                    android:layout_alignParentBottom="true"

            android:clipToOutline="true"

            android:gravity="center" />
@@ -91,11 +97,7 @@ 
            android:text="@string/log_access_confirmation_deny"

            style="?permissionGrantButtonBottomStyle"

            android:textAppearance="@style/PermissionGrantButtonTextAppearance"

                    android:layout_centerHorizontal="true"

                    android:layout_alignParentTop="true"

                    android:layout_alignParentBottom="true"

            android:clipToOutline="true"

            android:gravity="center" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file
 
</ScrollView>