Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011 Change-Id: I796a2b706fbce2331ace9388e63244135ddefc60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -67,12 +67,15 @@
|
||||
android:maxLines="10"
|
||||
style="@style/PreferenceSummaryTextStyle"/>
|
||||
|
||||
<RelativeLayout
|
||||
<LinearLayout
|
||||
android:id="@+id/card_preference_buttons"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_below="@android:id/summary"
|
||||
android:gravity="center_vertical|end"
|
||||
android:orientation="horizontal"
|
||||
android:paddingEnd="20dp"
|
||||
android:visibility="gone">
|
||||
<Button
|
||||
android:id="@android:id/button1"
|
||||
@@ -80,17 +83,15 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_toStartOf="@android:id/button2"
|
||||
android:visibility="gone"/>
|
||||
<Button
|
||||
android:id="@android:id/button2"
|
||||
style="@style/CardPreferenceBorderlessButton"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginHorizontal="20dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginStart="20dp"
|
||||
android:visibility="gone"/>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
<!-- Preference should place its actual preference widget here. -->
|
||||
|
Reference in New Issue
Block a user