Merge "Nest SystemUI alert dialogs in NestedScrollLayout" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ea91f5bb91
@@ -15,8 +15,12 @@
|
|||||||
~ See the License for the specific language governing permissions and
|
~ See the License for the specific language governing permissions and
|
||||||
~ limitations under the License.
|
~ limitations under the License.
|
||||||
-->
|
-->
|
||||||
<com.android.internal.widget.AlertDialogLayout
|
<androidx.core.widget.NestedScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
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:id="@*android:id/parentPanel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -93,5 +97,6 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
layout="@layout/alert_dialog_button_bar_systemui" />
|
layout="@layout/alert_dialog_button_bar_systemui" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
</com.android.internal.widget.AlertDialogLayout>
|
</com.android.internal.widget.AlertDialogLayout>
|
||||||
|
|
||||||
|
</androidx.core.widget.NestedScrollView>
|
||||||
Reference in New Issue
Block a user