diff options
6 files changed, 30 insertions, 56 deletions
diff --git a/packages/SettingsLib/AppPreference/res/layout/preference_app.xml b/packages/SettingsLib/AppPreference/res/layout/preference_app.xml index 4907c6f34a49..657a12cd13de 100644 --- a/packages/SettingsLib/AppPreference/res/layout/preference_app.xml +++ b/packages/SettingsLib/AppPreference/res/layout/preference_app.xml @@ -21,7 +21,7 @@ android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical" android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:paddingStart="@dimen/app_preference_padding_start" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> <LinearLayout @@ -29,9 +29,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start|center_vertical" - android:minWidth="@dimen/app_icon_min_width" + android:minWidth="@dimen/secondary_app_icon_size" android:orientation="horizontal" - android:paddingEnd="8dp" + android:paddingEnd="16dp" android:paddingTop="4dp" android:paddingBottom="4dp"> <ImageView diff --git a/packages/SettingsLib/TwoTargetPreference/Android.bp b/packages/SettingsLib/TwoTargetPreference/Android.bp index b32d5b40a13a..3baef4b9f11b 100644 --- a/packages/SettingsLib/TwoTargetPreference/Android.bp +++ b/packages/SettingsLib/TwoTargetPreference/Android.bp @@ -16,6 +16,7 @@ android_library { static_libs: [ "androidx.annotation_annotation", "androidx.preference_preference", + "SettingsLibSettingsTheme", ], sdk_version: "system_current", min_sdk_version: "21", diff --git a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml index 21fcedcc01b6..7978e73b9b37 100644 --- a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml +++ b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml @@ -18,70 +18,43 @@ <!-- Based off preference_material_settings.xml except that ripple on only on the left side. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:settings="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" 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:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:clipToPadding="false"> - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" + <include layout="@layout/settingslib_icon_frame"/> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_weight="1" - android:background="?android:attr/selectableItemBackground" - android:gravity="start|center_vertical" - android:clipToPadding="false" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> + android:paddingTop="16dp" + android:paddingBottom="16dp"> - <LinearLayout - android:id="@+id/icon_frame" + <TextView + android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="start|center_vertical" - android:minWidth="56dp" - android:orientation="horizontal" - android:clipToPadding="false" - 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" - settings:maxWidth="48dp" - settings:maxHeight="48dp" /> - </LinearLayout> + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceListItem" + android:ellipsize="marquee"/> - <RelativeLayout + <TextView + android:id="@android:id/summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="16dp" - android:paddingBottom="16dp"> - - <TextView - android:id="@android:id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceListItem" - android:ellipsize="marquee" /> - - <TextView - android:id="@android:id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@android:id/title" - android:layout_alignStart="@android:id/title" - android:textAppearance="?android:attr/textAppearanceListItemSecondary" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="10" /> - - </RelativeLayout> + android:layout_below="@android:id/title" + android:layout_alignStart="@android:id/title" + android:textAppearance="?android:attr/textAppearanceListItemSecondary" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="10"/> - </LinearLayout> + </RelativeLayout> <include layout="@layout/preference_two_target_divider" /> 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..f21e51cf847a 100644 --- a/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml +++ b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml @@ -26,6 +26,6 @@ android:paddingBottom="16dp"> <View android:layout_width="1dp" - android:layout_height="match_parent" + android:layout_height="32dp" android:background="?android:attr/listDivider" /> </LinearLayout>
\ No newline at end of file diff --git a/packages/SettingsLib/res/layout/preference_access_point.xml b/packages/SettingsLib/res/layout/preference_access_point.xml index fecafa89aeb0..9dc87de38ec2 100644 --- a/packages/SettingsLib/res/layout/preference_access_point.xml +++ b/packages/SettingsLib/res/layout/preference_access_point.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start|center_vertical" - android:minWidth="56dp" + android:minWidth="48dp" android:orientation="horizontal" android:clipToPadding="false" android:paddingTop="4dp" diff --git a/packages/SettingsLib/res/layout/preference_checkable_two_target.xml b/packages/SettingsLib/res/layout/preference_checkable_two_target.xml index f532caa98203..1ae1c8967679 100644 --- a/packages/SettingsLib/res/layout/preference_checkable_two_target.xml +++ b/packages/SettingsLib/res/layout/preference_checkable_two_target.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start|center_vertical" - android:minWidth="56dp" + android:minWidth="48dp" android:minHeight="48dp" android:orientation="horizontal" android:clipToPadding="false" |