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

Merge "Create icon layout style so custom preferences can reuse"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-01 08:41:02 +00:00
committed by Android (Google) Code Review
parent a530169277 0ae9f40a18
commit 1d997487cc
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,18 +31,21 @@
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="start|center_vertical"
android:clipToPadding="false"
android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<LinearLayout
android:id="@+id/icon_container"
android:id="@+id/icon_frame"
style="@style/preference_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="56dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:clipToPadding="false"
android:paddingEnd="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<com.android.internal.widget.PreferenceImageView
<android.support.v7.internal.widget.PreferenceImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -21,4 +21,9 @@
<style name="TextAppearanceMedium">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
</style>
<style name="preference_icon_frame">
<item name="android:layout_marginStart">-4dp</item>
<item name="android:minWidth">60dp</item>
</style>
</resources>