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

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

Browse Source 
am: 9f675cee28

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
This commit is contained in:
Doris Ling
2017-07-13 21:15:21 +00:00
committed by android-build-merger
parent efe90f8df1 9f675cee28
commit db0ec7d60f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/res/layout/preference_two_target.xml
View File

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

5
packages/SettingsLib/res/values/attrs.xml
View File

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