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

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

Merge "Don't use a scrollable dialog for CastDialog" into tm-dev am: ea9f1bc8 am: 656aca00 

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



Change-Id: I9e7a0b9ead0f077b06093b227be99cc096c78e90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbb4e34f 656aca00

packages/SystemUI/res/layout/alert_dialog_systemui.xml

+59 −65
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.
@@ -15,12 +14,9 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<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

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -98,5 +94,3 @@ 
            layout="@layout/alert_dialog_button_bar_systemui" />

    </FrameLayout>

</com.android.internal.widget.AlertDialogLayout>
 
 No newline at end of file
 


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

packages/SystemUI/res/layout/scrollable_alert_dialog_systemui.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <include layout="@layout/alert_dialog_systemui" />



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

packages/SystemUI/res/values/styles.xml

+6 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ 
        <item name="android:buttonBarNegativeButtonStyle">@style/Widget.Dialog.Button.BorderButton</item>

        <item name="android:buttonBarNeutralButtonStyle">@style/Widget.Dialog.Button.BorderButton</item>

        <item name="android:colorBackground">?androidprv:attr/colorSurface</item>

        <item name="android:alertDialogStyle">@style/AlertDialogStyle</item>

        <item name="android:alertDialogStyle">@style/ScrollableAlertDialogStyle</item>

        <item name="android:buttonBarStyle">@style/ButtonBarStyle</item>

        <item name="android:buttonBarButtonStyle">@style/Widget.Dialog.Button.Large</item>

    </style>
@@ -389,6 +389,10 @@ 
        <item name="android:layout">@layout/alert_dialog_systemui</item>

    </style>



    <style name="ScrollableAlertDialogStyle" parent="@androidprv:style/AlertDialog.DeviceDefault">

        <item name="android:layout">@layout/scrollable_alert_dialog_systemui</item>

    </style>



    <style name="ButtonBarStyle" parent="@androidprv:style/DeviceDefault.ButtonBar.AlertDialog">

        <item name="android:paddingTop">@dimen/dialog_button_bar_top_padding</item>

        <item name="android:paddingBottom">@dimen/dialog_bottom_padding</item>
@@ -994,6 +998,7 @@ 


    <style name="Theme.SystemUI.Dialog.Cast">

        <item name="android:textAppearanceMedium">@style/TextAppearance.CastItem</item>

        <item name="android:alertDialogStyle">@style/AlertDialogStyle</item>

    </style>

    <!-- ************************************************************************************* -->