diff options
| author | 2017-07-13 20:59:39 +0000 | |
|---|---|---|
| committer | 2017-07-13 20:59:39 +0000 | |
| commit | 9f675cee281b831c7a84e4b482baecedb1e3c09b (patch) | |
| tree | 4ce7c4275306f85531b61cbf348234ba2d537731 | |
| parent | be1577ae599a4bd63bf8646a1f318dd9aabd4ae6 (diff) | |
| parent | a9fbf3817acc3fba683b9b40d027c5b207df90e5 (diff) | |
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
| -rw-r--r-- | packages/SettingsLib/res/layout/preference_two_target.xml | 5 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/attrs.xml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/SettingsLib/res/layout/preference_two_target.xml b/packages/SettingsLib/res/layout/preference_two_target.xml index 7000940d3720..2309ec6f1f8d 100644 --- a/packages/SettingsLib/res/layout/preference_two_target.xml +++ b/packages/SettingsLib/res/layout/preference_two_target.xml @@ -18,6 +18,7 @@ <!-- 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" @@ -50,8 +51,8 @@ android:id="@android:id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxWidth="48dp" - android:maxHeight="48dp" /> + settings:maxWidth="48dp" + settings:maxHeight="48dp" /> </LinearLayout> <RelativeLayout diff --git a/packages/SettingsLib/res/values/attrs.xml b/packages/SettingsLib/res/values/attrs.xml index a8a179358744..6d852df2f907 100644 --- a/packages/SettingsLib/res/values/attrs.xml +++ b/packages/SettingsLib/res/values/attrs.xml @@ -48,4 +48,9 @@ <attr name="footerPreferenceStyle" format="reference" /> + <declare-styleable name="PreferenceImageView"> + <attr name="maxWidth" format="dimension" /> + <attr name="maxHeight" format="dimension" /> + </declare-styleable> + </resources> |