Merge "Fix missing open button under preferred service in credman settings screen" into main

This commit is contained in:
Joy Babafemi
2024-10-17 19:19:12 +00:00
committed by Android (Google) Code Review

View File

@@ -18,6 +18,7 @@
<!-- Based off preference_single_target.xml with buttons added below text. --> <!-- Based off preference_single_target.xml with buttons added below text. -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -95,18 +96,29 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical" /> android:orientation="vertical" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/credman_button_frame" android:id="@+id/credman_button_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:minWidth="56dp" android:minWidth="56dp"
android:orientation="horizontal"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingLeft="76dp" android:paddingLeft="76dp"
android:paddingBottom="4dp"> android:paddingBottom="4dp">
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/button_flow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:constraint_referenced_ids="change_button, open_button"
app:flow_horizontalStyle="spread_inside"
app:flow_wrapMode="chain"
app:flow_verticalGap = "16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/change_button" android:id="@+id/change_button"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -122,6 +134,6 @@
android:visibility="gone" android:visibility="gone"
android:text="@string/credman_button_open"/> android:text="@string/credman_button_open"/>
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>