Merge "Migrate summary text in wifi QR scan page to DescriptionMixin" into sc-dev
This commit is contained in:
@@ -17,9 +17,11 @@
|
||||
|
||||
<com.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:icon="@drawable/ic_scan_32dp">
|
||||
android:icon="@drawable/ic_scan_32dp"
|
||||
app:sudDescriptionText="@string/wifi_dpp_scan_qr_code_join_unknown_network">
|
||||
|
||||
<LinearLayout
|
||||
style="@style/SudContentFrame"
|
||||
@@ -28,16 +30,6 @@
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/summary"
|
||||
style="@style/TextAppearance.SudGlifBody"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="?attr/sudMarginStart"
|
||||
android:layout_marginEnd="?attr/sudMarginEnd"
|
||||
android:textAlignment="center"
|
||||
android:accessibilityLiveRegion="polite"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
Reference in New Issue
Block a user