Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a46f466 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tweak preference layout padding" into sc-dev am: 907fbba2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609922

Change-Id: I6a106731465853bf4b1f70afda8f5f2b8bfd8f7c
parents 72b829eb 907fbba2

packages/SettingsLib/AppPreference/res/layout/preference_app.xml

+3 −3
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/TwoTargetPreference/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ android_library { 
    static_libs: [

        "androidx.annotation_annotation",

        "androidx.preference_preference",

        "SettingsLibSettingsTheme",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml

+23 −50
Original line number Diff line number Diff line
@@ -18,41 +18,16 @@ 
<!-- 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: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:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:clipToPadding="false">



        <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>

    <include layout="@layout/settingslib_icon_frame"/>



    <RelativeLayout

        android:layout_width="wrap_content"
@@ -81,8 +56,6 @@ 


    </RelativeLayout>



    </LinearLayout>



    <include layout="@layout/preference_two_target_divider" />



    <!-- Preference should place its actual preference widget here. -->

packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/res/layout/preference_access_point.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"