diff options
| author | Zoey Chen <zoeychen@google.com> | 2022-01-14 15:27:40 +0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-03-02 18:17:45 -0800 |
| commit | 941c4a4af0da3fbd6aca0ad43a4f4f3740268a32 (patch) | |
| tree | 6f2a9196823efead7b7066c537cb0975b5d72dad | |
| parent | 99f9addc90ac669a363f2f10462d264287c25caa (diff) | |
| download | base-941c4a4af0da3fbd6aca0ad43a4f4f3740268a32.tar.gz | |
[Provider Model] Fix the overlap when changing the font/display size
Bug: 211540142
Test: manual
(cherry picked from commit 4b28a9a63cc807226de48cc4e33f79f438e3d367)
(cherry picked from commit 10925e6bf5ef9d4ba54102c5b915f0ab99f809eb)
Merged-In: I10032a866ee05030070b40076fa946c3e73e0d56
Change-Id: I10032a866ee05030070b40076fa946c3e73e0d56
| -rw-r--r-- | packages/SystemUI/res/layout/internet_connectivity_dialog.xml | 18 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 3 |
2 files changed, 14 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml index e69582f52ebf..f72a8dc08c9c 100644 --- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -378,7 +378,8 @@ android:clickable="true"/> </LinearLayout> </LinearLayout> - <FrameLayout + + <LinearLayout android:id="@+id/button_layout" android:orientation="horizontal" android:layout_width="match_parent" @@ -390,9 +391,10 @@ android:clickable="false" android:focusable="false"> - <FrameLayout + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" android:layout_gravity="start|center_vertical" android:orientation="vertical"> <Button @@ -401,12 +403,13 @@ android:layout_height="wrap_content" android:text="@string/turn_off_airplane_mode" android:ellipsize="end" + android:maxLines="1" style="@style/Widget.Dialog.Button.BorderButton" android:clickable="true" android:focusable="true"/> - </FrameLayout> + </LinearLayout> - <FrameLayout + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -417,10 +420,13 @@ 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"/> - </FrameLayout> - </FrameLayout> + </LinearLayout> + </LinearLayout> + </LinearLayout> </androidx.core.widget.NestedScrollView> </LinearLayout> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 051a30ccb524..f26159f5176a 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -942,8 +942,9 @@ </style> <style name="InternetDialog.NetworkSummary"> - <item name="android:layout_marginEnd">34dp</item> + <item name="android:layout_marginEnd">7dp</item> <item name="android:ellipsize">end</item> + <item name="android:maxLines">2</item> <item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary</item> </style> |