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

Commit db0ec7d6 authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev 

am: 9f675cee

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
parents efe90f8d 9f675cee

packages/SettingsLib/res/layout/preference_two_target.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
<!-- 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"
@@ -50,8 +51,8 @@ 
                android:id="@android:id/icon"

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:maxWidth="48dp"

                settings:maxWidth="48dp"

                android:maxHeight="48dp" />

                settings:maxHeight="48dp" />

        </LinearLayout>

        </LinearLayout>





        <RelativeLayout

        <RelativeLayout

packages/SettingsLib/res/values/attrs.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -48,4 +48,9 @@ 




    <attr name="footerPreferenceStyle" format="reference" />

    <attr name="footerPreferenceStyle" format="reference" />





    <declare-styleable name="PreferenceImageView">

        <attr name="maxWidth" format="dimension" />

        <attr name="maxHeight" format="dimension" />

    </declare-styleable>



</resources>
 
</resources>