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

Commit 3ac82b7a authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Provider Model] The dialog should be scrollable in landscape mode"

parents a11cebd6 7cfaffc5

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+280 −267
Original line number Original line Diff line number Diff line
@@ -56,6 +56,15 @@ 
        android:layout_height="1dp"

        android:layout_height="1dp"

        android:background="?android:attr/listDivider"/>

        android:background="?android:attr/listDivider"/>





    <androidx.core.widget.NestedScrollView

        android:id="@+id/scroll_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <LinearLayout

            android:id="@+id/scroll_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <LinearLayout

            <LinearLayout

                android:id="@+id/internet_list"

                android:id="@+id/internet_list"

                android:layout_width="match_parent"

                android:layout_width="match_parent"
@@ -69,18 +78,18 @@ 
                    android:clickable="true"

                    android:clickable="true"

                    android:focusable="true"

                    android:focusable="true"

                    android:background="?android:attr/selectableItemBackground"

                    android:background="?android:attr/selectableItemBackground"

            android:gravity="center_vertical|center_horizontal"

                    android:layout_gravity="center_vertical|start"

                    android:orientation="horizontal"

                    android:orientation="horizontal"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:layout_marginTop="4dp"

                    android:layout_marginTop="4dp"

                    android:layout_marginBottom="4dp"

                    android:layout_marginBottom="4dp"

            android:paddingStart="@dimen/settingslib_switchbar_padding_left"

                    android:paddingStart="19dp"

                    android:paddingEnd="@dimen/settingslib_switchbar_padding_right">

                    android:paddingEnd="@dimen/settingslib_switchbar_padding_right">





                    <FrameLayout

                    <FrameLayout

                android:layout_width="36dp"

                        android:layout_width="24dp"

                android:layout_height="36dp"

                        android:layout_height="24dp"

                        android:clickable="false"

                        android:clickable="false"

                        android:layout_gravity="center_vertical|start">

                        android:layout_gravity="center_vertical|start">

                        <ImageView

                        <ImageView
@@ -95,12 +104,12 @@ 
                        android:id="@+id/mobile_network_list"

                        android:id="@+id/mobile_network_list"

                        android:orientation="vertical"

                        android:orientation="vertical"

                        android:clickable="false"

                        android:clickable="false"

                android:layout_marginLeft="3dp"

                        android:layout_width="wrap_content"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:layout_height="match_parent"

                        android:gravity="start|center_vertical">

                        android:gravity="start|center_vertical">

                        <TextView

                        <TextView

                            android:id="@+id/mobile_title"

                            android:id="@+id/mobile_title"

                            android:layout_marginLeft="17dp"

                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical"

                            android:layout_gravity="center_vertical"
@@ -111,6 +120,7 @@ 
                            android:fontFamily="google-sans"/>

                            android:fontFamily="google-sans"/>

                        <TextView

                        <TextView

                            android:id="@+id/mobile_summary"

                            android:id="@+id/mobile_summary"

                            android:layout_marginLeft="17dp"

                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical"

                            android:layout_gravity="center_vertical"
@@ -123,7 +133,8 @@ 




                    <FrameLayout

                    <FrameLayout

                        android:layout_width="48dp"

                        android:layout_width="48dp"

                android:layout_height="48dp">

                        android:layout_height="48dp"

                        android:layout_gravity="end|center_vertical">

                        <Switch

                        <Switch

                            android:id="@+id/mobile_toggle"

                            android:id="@+id/mobile_toggle"

                            android:layout_gravity="center"

                            android:layout_gravity="center"
@@ -155,6 +166,7 @@ 
                    android:gravity="center"

                    android:gravity="center"

                    android:orientation="horizontal"

                    android:orientation="horizontal"

                    android:layout_marginTop="8dp"

                    android:layout_marginTop="8dp"

                    android:layout_marginBottom="8dp"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:paddingStart="@dimen/settingslib_switchbar_padding_left"

                    android:paddingStart="@dimen/settingslib_switchbar_padding_left"
@@ -203,7 +215,6 @@ 
                    android:visibility="gone"

                    android:visibility="gone"

                    android:background="?android:attr/selectableItemBackground"

                    android:background="?android:attr/selectableItemBackground"

                    android:orientation="horizontal"

                    android:orientation="horizontal"

            android:layout_marginTop="8dp"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:paddingStart="@dimen/settingslib_switchbar_padding_left"

                    android:paddingStart="@dimen/settingslib_switchbar_padding_left"
@@ -349,3 +360,5 @@ 
                    android:fontFamily="google-sans"/>

                    android:fontFamily="google-sans"/>

            </LinearLayout>

            </LinearLayout>

        </LinearLayout>

        </LinearLayout>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>