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

Commit d348fce3 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge \"Use packageinstaller-buttonbar in reviewactivity.\" into nyc-mr1-dev 

am: efd0688b

Change-Id: I5cbb18407c9f2dcbc2e62deb5785e70700d2128a
parents 552c454f efd0688b

res/layout/grant_permissions.xml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
                </TextView>



                <Space

                    android:id="@*android:id/spacer"

                    android:id="@+id/spacer"

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1"

res/layout/review_permissions.xml

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
        android:layout_weight="1">

    </FrameLayout>



    <com.android.internal.widget.ButtonBarLayout

    <com.android.packageinstaller.permission.ui.ButtonBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"
@@ -64,7 +64,7 @@ 
        android:paddingTop="16dip">



        <Space

            android:id="@*android:id/spacer"

            android:id="@+id/spacer"

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"
@@ -85,6 +85,6 @@ 
            android:layout_marginStart="8dip"

            android:text="@string/review_button_continue" />



    </com.android.internal.widget.ButtonBarLayout>

    </com.android.packageinstaller.permission.ui.ButtonBarLayout>



</LinearLayout>