diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2014-03-17 01:18:54 +0100 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2014-03-17 01:18:54 +0100 |
commit | 8003d52970e90593476d7b9677ebcd846b13ae96 (patch) | |
tree | c99ee8684906b12bd99480e4399491f7f2e95a2b | |
parent | 46f148309d811462ae07d117110084501e0a53e0 (diff) | |
download | android_packages_apps_CMFileManager-8003d52970e90593476d7b9677ebcd846b13ae96.tar.gz android_packages_apps_CMFileManager-8003d52970e90593476d7b9677ebcd846b13ae96.tar.bz2 android_packages_apps_CMFileManager-8003d52970e90593476d7b9677ebcd846b13ae96.zip |
CMFM: Fix association dialog layout
Change-Id: Ib2af1ce3f8ad394134fd4a52d896c4f46898e234
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r-- | res/layout/associations_dialog.xml | 2 | ||||
-rw-r--r-- | res/layout/associations_item.xml | 4 | ||||
-rw-r--r-- | res/values-sw600dp/integers.xml | 21 | ||||
-rw-r--r-- | res/values-sw720dp/integers.xml | 21 | ||||
-rw-r--r-- | res/values/integers.xml | 3 |
5 files changed, 48 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" diff --git a/res/values-sw600dp/integers.xml b/res/values-sw600dp/integers.xml new file mode 100644 index 00000000..7babd0e5 --- /dev/null +++ b/res/values-sw600dp/integers.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012-2013 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Association items per row --> + <integer name="associations_items_per_row">5</integer> +</resources> diff --git a/res/values-sw720dp/integers.xml b/res/values-sw720dp/integers.xml new file mode 100644 index 00000000..b5321b78 --- /dev/null +++ b/res/values-sw720dp/integers.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012-2013 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Association items per row --> + <integer name="associations_items_per_row">6</integer> +</resources> diff --git a/res/values/integers.xml b/res/values/integers.xml index b7696d28..bf5cb5e0 100644 --- a/res/values/integers.xml +++ b/res/values/integers.xml @@ -27,4 +27,7 @@ <!-- Normal edit text sise --> <integer name="default_edit_text_ems">8</integer> + + <!-- Association items per row --> + <integer name="associations_items_per_row">3</integer> </resources> |