Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak preference layout padding" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-21 08:30:46 +00:00
committed by Android (Google) Code Review
parent ec84515c4c 2d233feba8
commit 907fbba22d
6 changed files with 30 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/AppPreference/res/layout/preference_app.xml
View File

@@ -21,7 +21,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="@dimen/app_preference_padding_start" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<LinearLayout <LinearLayout
@@ -29,9 +29,9 @@
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="@dimen/app_icon_min_width" android:minWidth="@dimen/secondary_app_icon_size"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="8dp" android:paddingEnd="16dp"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp"> android:paddingBottom="4dp">
<ImageView <ImageView

1
packages/SettingsLib/TwoTargetPreference/Android.bp
View File

@@ -16,6 +16,7 @@ android_library {
static_libs: [ static_libs: [
"androidx.annotation_annotation", "androidx.annotation_annotation",
"androidx.preference_preference", "androidx.preference_preference",
"SettingsLibSettingsTheme",
], ],
sdk_version: "system_current", sdk_version: "system_current",
min_sdk_version: "21", min_sdk_version: "21",

35
packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml
View File

@@ -18,41 +18,16 @@
<!-- Based off preference_material_settings.xml except that ripple on only on the left side. --> <!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical" 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"> android:clipToPadding="false">
<LinearLayout <include layout="@layout/settingslib_icon_frame"/>
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:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<LinearLayout
android:id="@+id/icon_frame"
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>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -81,8 +56,6 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout>
<include layout="@layout/preference_two_target_divider" /> <include layout="@layout/preference_two_target_divider" />
<!-- Preference should place its actual preference widget here. --> <!-- Preference should place its actual preference widget here. -->

2
packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml
View File

@@ -26,6 +26,6 @@
android:paddingBottom="16dp"> android:paddingBottom="16dp">
<View <View
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="32dp"
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider" />
</LinearLayout> </LinearLayout>

2
packages/SettingsLib/res/layout/preference_access_point.xml
View File

@@ -40,7 +40,7 @@
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="48dp"
android:orientation="horizontal" android:orientation="horizontal"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingTop="4dp" android:paddingTop="4dp"

2
packages/SettingsLib/res/layout/preference_checkable_two_target.xml
View File

@@ -41,7 +41,7 @@
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="48dp"
android:minHeight="48dp" android:minHeight="48dp"
android:orientation="horizontal" android:orientation="horizontal"
android:clipToPadding="false" android:clipToPadding="false"