diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2014-03-17 00:22:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-03-17 00:22:13 +0000 |
commit | 73b515c20c081b981cabacea3580b38146e7d476 (patch) | |
tree | 0238243aa3e6e924ac9a55758ae035150ff87e7c /res/layout | |
parent | 92a6d7c343363131cbd812d93b9a96edd4e0daa7 (diff) | |
parent | 8003d52970e90593476d7b9677ebcd846b13ae96 (diff) | |
download | android_packages_apps_CMFileManager-73b515c20c081b981cabacea3580b38146e7d476.tar.gz android_packages_apps_CMFileManager-73b515c20c081b981cabacea3580b38146e7d476.tar.bz2 android_packages_apps_CMFileManager-73b515c20c081b981cabacea3580b38146e7d476.zip |
Merge "CMFM: Fix association dialog layout" into cm-11.0
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/associations_dialog.xml | 2 | ||||
-rw-r--r-- | res/layout/associations_item.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/associations_dialog.xml b/res/layout/associations_dialog.xml index 11cf0ed8..210301a9 100644 --- a/res/layout/associations_dialog.xml +++ b/res/layout/associations_dialog.xml @@ -26,7 +26,7 @@ android:stretchMode="columnWidth" android:scrollbars="vertical" android:horizontalSpacing="@dimen/default_margin" - android:numColumns="3" /> + android:numColumns="@integer/associations_items_per_row" /> <CheckBox android:id="@+id/associations_remember" android:layout_width="match_parent" diff --git a/res/layout/associations_item.xml b/res/layout/associations_item.xml index 8299b437..9ead243d 100644 --- a/res/layout/associations_item.xml +++ b/res/layout/associations_item.xml @@ -18,7 +18,7 @@ android:layout_width="@dimen/grid_width" android:layout_height="wrap_content" android:background="@drawable/holo_selection" - android:orientation="vertical" > + android:orientation="vertical"> <ImageView android:id="@+id/associations_item_icon" android:width="@dimen/grid_image_width" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:textAppearance="@style/secondary_text_appearance" - android:paddingBottom="@dimen/default_margin" + android:layout_margin="@dimen/default_margin" android:gravity="center" android:textStyle="bold" android:singleLine="true" |