summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml10
-rw-r--r--packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml2
2 files changed, 10 insertions, 2 deletions
diff --git a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml
index 21fcedcc01b6..f6a64c6e76ca 100644
--- a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml
+++ b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml
@@ -23,16 +23,16 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
- android:background="@android:color/transparent"
+ android:background="?android:attr/selectableItemBackground"
android:clipToPadding="false">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="?android:attr/selectableItemBackground"
android:gravity="start|center_vertical"
android:clipToPadding="false"
+ android:duplicateParentState="true"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
@@ -44,12 +44,14 @@
android:minWidth="56dp"
android:orientation="horizontal"
android:clipToPadding="false"
+ android:duplicateParentState="true"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<androidx.preference.internal.PreferenceImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:duplicateParentState="true"
settings:maxWidth="48dp"
settings:maxHeight="48dp" />
</LinearLayout>
@@ -58,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:duplicateParentState="true"
android:paddingTop="16dp"
android:paddingBottom="16dp">
@@ -66,6 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
+ android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee" />
@@ -75,6 +79,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" />
@@ -90,6 +95,7 @@
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:duplicateParentState="true"
android:minWidth="64dp"
android:gravity="center"
android:orientation="vertical" />
diff --git a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml
index bd477f8068ff..44732e58c7b2 100644
--- a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml
+++ b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml
@@ -22,10 +22,12 @@
android:layout_height="match_parent"
android:gravity="start|center_vertical"
android:orientation="horizontal"
+ android:duplicateParentState="true"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<View
android:layout_width="1dp"
android:layout_height="match_parent"
+ android:duplicateParentState="true"
android:background="?android:attr/listDivider" />
</LinearLayout> \ No newline at end of file