diff options
| author | Tony Mantler <nicoya@google.com> | 2018-05-24 15:41:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-24 15:41:23 +0000 |
| commit | a578b4cd4bc71da52f54093ffcc8e02008ec22b5 (patch) | |
| tree | 99bdc45ebff7e2868fba64af5df664a8a966b6ba | |
| parent | fff63dc2249e13269a2f2297216d77046665905b (diff) | |
| parent | efccba3f81a73d209b3ba582c05755b96f94df10 (diff) | |
| download | TvSettings-a578b4cd4bc71da52f54093ffcc8e02008ec22b5.tar.gz | |
Merge "Fix wifi item layout" into pi-dev
| -rw-r--r-- | Settings/res/layout/preference_access_point.xml | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/Settings/res/layout/preference_access_point.xml b/Settings/res/layout/preference_access_point.xml index 9e0827974..e2eac1a29 100644 --- a/Settings/res/layout/preference_access_point.xml +++ b/Settings/res/layout/preference_access_point.xml @@ -25,7 +25,9 @@ android:minHeight="?android:attr/listPreferredItemHeightSmall" android:gravity="center_vertical" android:background="?android:attr/selectableItemBackground" - android:clipToPadding="false"> + android:clipToPadding="false" + android:paddingStart="@dimen/lb_preference_item_padding_start" + android:paddingEnd="@dimen/lb_preference_item_padding_end"> <LinearLayout android:layout_width="0dp" @@ -33,27 +35,20 @@ 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: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"> - <android.support.v7.internal.widget.PreferenceImageView - android:id="@android:id/icon" + <FrameLayout + android:id="@+id/icon_frame" android:layout_width="wrap_content" android:layout_height="wrap_content" - settings:maxWidth="48dp" - settings:maxHeight="48dp" /> - </LinearLayout> + android:layout_gravity="center_vertical" > + <ImageView + android:id="@android:id/icon" + android:layout_width="@dimen/lb_preference_item_icon_size" + android:layout_height="@dimen/lb_preference_item_icon_size" + android:layout_marginEnd="@dimen/lb_preference_item_icon_margin_end" + /> + </FrameLayout> <RelativeLayout android:layout_width="wrap_content" |