PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b am: 06e92f5e45

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6bf829b5f72796eb136bc2e6745008e56032cfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2022-09-02 16:22:41 +00:00
committed by Automerger Merge Worker
parent adbd13eb05 06e92f5e45
commit b637d56d09
8 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/layout/card_preference.xml
View File

@@ -27,8 +27,6 @@
android:clipToPadding="false"
android:baselineAligned="false">
<include layout="@layout/card_preference_icon_frame"/>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -36,10 +34,22 @@
android:paddingTop="16dp"
android:paddingBottom="16dp">
<LinearLayout
android:id="@+id/card_preference_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@android:id/title"
android:layout_alignBottom="@android:id/summary"
android:gravity="center_vertical">
<include layout="@layout/card_preference_icon_frame"/>
</LinearLayout>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/card_preference_parent"
android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee"/>
@@ -61,7 +71,7 @@
android:id="@+id/card_preference_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="24dp"
android:layout_below="@android:id/summary"
android:visibility="gone">
<Button
@@ -69,7 +79,7 @@
style="@style/CardPreferencePrimaryButton"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginHorizontal="4dp"
android:layout_marginStart="20dp"
android:layout_toStartOf="@android:id/button2"
android:visibility="gone"/>
<Button
@@ -77,7 +87,7 @@
style="@style/CardPreferenceBorderlessButton"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginHorizontal="4dp"
android:layout_marginHorizontal="20dp"
android:layout_alignParentEnd="true"
android:visibility="gone"/>
</RelativeLayout>

4
res/layout/card_preference_layout.xml
View File

@@ -20,7 +20,9 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_marginVertical="8dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="16dp"
android:foreground="@drawable/contextual_card_background"
android:clickable="true"
style="@style/ContextualCardStyle">