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

Commit b1b78ca2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Nest SystemUI alert dialogs in NestedScrollLayout" into tm-dev am: ea91f5bb am: fdf53ba0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17756832



Change-Id: I2082ccee285314fc246a10cd07e77e3ce25f561d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22689375 fdf53ba0

packages/SystemUI/res/layout/alert_dialog_systemui.xml

+61 −56
Original line number Diff line number Diff line
@@ -15,8 +15,12 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.internal.widget.AlertDialogLayout

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <com.android.internal.widget.AlertDialogLayout

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -93,5 +97,6 @@ 
                android:layout_height="wrap_content"

                layout="@layout/alert_dialog_button_bar_systemui" />

        </FrameLayout>



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



</androidx.core.widget.NestedScrollView>
 
 No newline at end of file