Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Fix the overlap when changing the font/display size" into sc-v2-dev

Browse Source
This commit is contained in:
Zoey Chen
2022-01-19 01:50:43 +00:00
committed by Android (Google) Code Review
parent d589e78bfc 4b28a9a63c
commit f2d1f344bd
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/res/layout/internet_connectivity_dialog.xml
View File

@@ -378,7 +378,8 @@
android:clickable="true"/> android:clickable="true"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<FrameLayout
<LinearLayout
android:id="@+id/button_layout" android:id="@+id/button_layout"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -390,9 +391,10 @@
android:clickable="false" android:clickable="false"
android:focusable="false"> android:focusable="false">
<FrameLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@@ -401,12 +403,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/turn_off_airplane_mode" android:text="@string/turn_off_airplane_mode"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
style="@style/Widget.Dialog.Button.BorderButton" style="@style/Widget.Dialog.Button.BorderButton"
android:clickable="true" android:clickable="true"
android:focusable="true"/> android:focusable="true"/>
</FrameLayout> </LinearLayout>
<FrameLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@@ -417,10 +420,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/inline_done_button" android:text="@string/inline_done_button"
style="@style/Widget.Dialog.Button" style="@style/Widget.Dialog.Button"
android:maxLines="1"
android:ellipsize="end"
android:clickable="true" android:clickable="true"
android:focusable="true"/> android:focusable="true"/>
</FrameLayout> </LinearLayout>
</FrameLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

3
packages/SystemUI/res/values/styles.xml
View File

@@ -942,8 +942,9 @@
</style> </style>
<style name="InternetDialog.NetworkSummary"> <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:ellipsize">end</item>
<item name="android:maxLines">2</item>
<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary</item> <item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary</item>
</style> </style>