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

Commit 41461b75 authored by chelseahao's avatar chelseahao Committed by Chelsea Hao
Browse files

Fix padding when APM and share wifi button both shown. 

Test: atest -c InternetDialogTest InternetDialogControllerTest
Bug: b/317889924
Change-Id: I985529959ab9034db251ff9bf30abbbcf1fb0ba6
parent 27aeef3c

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+50 −45
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<LinearLayout

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

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

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

    android:id="@+id/internet_connectivity_dialog"

    android:layout_width="@dimen/large_dialog_width"
@@ -386,9 +387,8 @@ 
                </LinearLayout>

            </LinearLayout>



            <LinearLayout

            <androidx.constraintlayout.widget.ConstraintLayout

                android:id="@+id/button_layout"

                android:orientation="horizontal"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="8dp"
@@ -398,53 +398,58 @@ 
                android:clickable="false"

                android:focusable="false">



                <LinearLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:layout_gravity="start|center_vertical"

                    android:orientation="horizontal">

                <Button

                    android:id="@+id/apm_button"

                    style="@style/Widget.Dialog.Button.BorderButton"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                        android:text="@string/turn_off_airplane_mode"

                    android:layout_marginEnd="10dp"

                    android:clickable="true"

                    android:ellipsize="end"

                    android:focusable="true"

                    android:maxLines="1"

                        style="@style/Widget.Dialog.Button.BorderButton"

                        android:clickable="true"

                        android:focusable="true"/>

                    android:text="@string/turn_off_airplane_mode"

                    app:layout_constrainedWidth="true"

                    app:layout_constraintHorizontal_bias="0"

                    app:layout_constraintBottom_toBottomOf="parent"

                    app:layout_constraintEnd_toStartOf="@id/share_wifi_button"

                    app:layout_constraintStart_toStartOf="parent"

                    app:layout_constraintTop_toTopOf="parent" />



                <Button

                    android:id="@+id/share_wifi_button"

                    style="?android:attr/buttonBarNeutralButtonStyle"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                        android:text="@string/share_wifi_button_text"

                        style="?android:attr/buttonBarNeutralButtonStyle"

                        android:maxLines="1"

                        android:ellipsize="end"

                    android:layout_marginEnd="10dp"

                    android:clickable="true"

                    android:ellipsize="end"

                    android:focusable="true"

                        android:visibility="gone"/>

                </LinearLayout>

                    android:maxLines="1"

                    android:visibility="gone"

                    app:layout_constraintHorizontal_bias="0"

                    android:text="@string/share_wifi_button_text"

                    app:layout_constrainedWidth="true"

                    app:layout_constraintBottom_toBottomOf="parent"

                    app:layout_constraintEnd_toStartOf="@id/done_button"

                    app:layout_constraintStart_toEndOf="@id/apm_button"

                    app:layout_constraintTop_toTopOf="parent" />



                <LinearLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="16dp"

                    android:layout_gravity="end|center_vertical">

                <Button

                    android:id="@+id/done_button"

                    style="@style/Widget.Dialog.Button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                        android:text="@string/inline_done_button"

                        style="@style/Widget.Dialog.Button"

                        android:maxLines="1"

                        android:ellipsize="end"

                    android:clickable="true"

                        android:focusable="true"/>

                </LinearLayout>

            </LinearLayout>

                    android:ellipsize="end"

                    android:focusable="true"

                    android:maxLines="1"

                    android:text="@string/inline_done_button"

                    app:layout_constrainedWidth="true"

                    app:layout_constraintBottom_toBottomOf="parent"

                    app:layout_constraintEnd_toEndOf="parent"

                    app:layout_constraintTop_toTopOf="parent" />

            </androidx.constraintlayout.widget.ConstraintLayout>



        </LinearLayout>

    </androidx.core.widget.NestedScrollView>